compiler: improve handling of ranges

julelang · Jul 30, 2024 · da7515f · da7515f
1 parent b0804eb
commit da7515f
Show file tree

Hide file tree

Showing 8 changed files with 345 additions and 382 deletions.
diff --git a/std/jule/importer/directive_eval.jule b/std/jule/importer/directive_eval.jule
@@ -37,14 +37,12 @@ impl directiveEval {
         let mut last = 0
         for i < len(tokens)-1; i++ {
             let b = tokens[i]
-            if b.Id == TokenId.Range {
-                match b.Kind {
-                | TokenKind.LParent:
-                    rangeN++
-                    continue
-                | TokenKind.RParent:
-                    rangeN--
-                }
+            match b.Id {
+            | TokenId.LParent:
+                rangeN++
+                continue
+            | TokenId.RParent:
+                rangeN--
             }
             if rangeN > 0 || b.Id != op {
                 continue
@@ -117,11 +115,11 @@ impl directiveEval {
 
             for (_, mut andPart) in logicalAndParts {
                 let first = andPart[0]
-                if first.Id == TokenId.Range && first.Kind == TokenKind.LParent {
+                if first.Id == TokenId.LParent {
                     let end = andPart[len(andPart)-1]
 
                     // Missing close.
-                    if end.Id != TokenId.Range || end.Kind != TokenKind.RParent {
+                    if end.Id != TokenId.RParent {
                         self.pushErr(first, LogMsg.WaitCloseParent)
                         ret false
                     }

diff --git a/std/jule/lex/lex.jule b/std/jule/lex/lex.jule
@@ -91,6 +91,12 @@ static basicOps: [...]kindPair = [
     {TokenKind.Gt, TokenId.Gt},
     {TokenKind.Eq, TokenId.Eq},
     {TokenKind.Hash, TokenId.Hash},
+    {TokenKind.LBrace, TokenId.LBrace},
+    {TokenKind.RBrace, TokenId.RBrace},
+    {TokenKind.LBracket, TokenId.LBracket},
+    {TokenKind.RBracket, TokenId.RBracket},
+    {TokenKind.LParent, TokenId.LParent},
+    {TokenKind.RParent, TokenId.RParent},
 ]
 
 fn makeErr(row: int, col: int, &f: &File, fmt: LogMsg, args: ...any): Log {
@@ -718,7 +724,6 @@ impl lex {
                 ret true
             }
         }
-
         ret false
     }
 
@@ -777,12 +782,6 @@ impl lex {
         | bytesHasPrefix(txt, TokenKind.RangLComment):
             self.lexRangeComment(t)
             ret t
-        | self.isOp(txt, TokenKind.LParent, TokenId.Range, t)
-        | self.isOp(txt, TokenKind.RParent, TokenId.Range, t)
-        | self.isOp(txt, TokenKind.LBrace, TokenId.Range, t)
-        | self.isOp(txt, TokenKind.RBrace, TokenId.Range, t)
-        | self.isOp(txt, TokenKind.LBracket, TokenId.Range, t)
-        | self.isOp(txt, TokenKind.RBracket, TokenId.Range, t)
         | self.lexBasicOps(txt, t):
             // Pass.
             break

diff --git a/std/jule/lex/token.jule b/std/jule/lex/token.jule
@@ -123,7 +123,6 @@ enum Ident: str {
 enum TokenId: uint {
     Na,
     Ident,
-    Range,
     Ret,
     Semicolon,
     Lit,
@@ -194,6 +193,12 @@ enum TokenId: uint {
     Lt,
     Gt,
     Eq,
+    LBrace,
+    RBrace,
+    LParent,
+    RParent,
+    LBracket,
+    RBracket,
 }
 
 // Token kinds.
@@ -474,7 +479,7 @@ fn IsAssign(id: TokenId): bool {
         id == TokenId.Let ||
         id == TokenId.Mut ||
         id == TokenId.Self ||
-        id == TokenId.Range ||
+        id == TokenId.LParent ||
         id == TokenId.Star)
 }
 

diff --git a/std/jule/parser/assign.jule b/std/jule/parser/assign.jule
@@ -19,15 +19,15 @@ fn checkAssignTokens(&tokens: []&Token): bool {
     }
     let mut braceN = 0
     for _, t in tokens {
-        if t.Id == TokenId.Range {
-            match t.Kind {
-            | TokenKind.LBrace
-            | TokenKind.LBracket
-            | TokenKind.LParent:
-                braceN++
-            |:
-                braceN--
-            }
+        match t.Id {
+        | TokenId.LBrace
+        | TokenId.LBracket
+        | TokenId.LParent:
+            braceN++
+        | TokenId.RBrace
+        | TokenId.RBracket
+        | TokenId.RParent:
+            braceN--
         }
         match {
         | braceN < 0: