Fix negative literal edge cases

NotNite · Nov 8, 2024 · cfd13b4 · cfd13b4
1 parent af160ba
commit cfd13b4
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/GDWeave/Script/ScriptTokenizer.cs b/GDWeave/Script/ScriptTokenizer.cs
@@ -100,7 +100,7 @@ public static class ScriptTokenizer {
         {"|=", TokenType.OpAssignBitOr},
         {"^=", TokenType.OpAssignBitXor},
 
-        {"+", TokenType.OpAnd},
+        {"+", TokenType.OpAdd},
         {"-", TokenType.OpSub},
         {"*", TokenType.OpMul},
         {"/", TokenType.OpDiv},
@@ -252,7 +252,10 @@ public static IEnumerable<Token> Tokenize(string gdScript, uint baseIndent = 0)
         var toFlush = new List<Token>(2);
         finalTokens.Add(new Token(TokenType.Newline, baseIndent));
         var enumerator = tokens.GetEnumerator();
-        while (enumerator.MoveNext()) {
+        var reparse = false;
+        while (reparse ? true : enumerator.MoveNext()) {
+            reparse = false;
+
             if (enumerator.Current == "\n") {
                 InsertNewLine(enumerator, baseIndent, toFlush);
                 endAndFlushId();
@@ -274,10 +277,9 @@ public static IEnumerable<Token> Tokenize(string gdScript, uint baseIndent = 0)
 
             if (enumerator.Current == "-" || char.IsDigit(enumerator.Current[0])) {
                 BuildNumber(enumerator, toFlush, out bool foundFull);
+                reparse = !foundFull;
                 endAndFlushId();
-                if (foundFull) {
-                    continue;
-                }
+                continue;
             }
 
             if (BuiltinFunctions.Contains(enumerator.Current)) {