Fix parsing (1+2)-3

brendan-duncan · Aug 29, 2024 · 1ae7719 · 1ae7719
1 parent 793f8a0
commit 1ae7719
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/src/wgsl_scanner.ts b/src/wgsl_scanner.ts
@@ -745,7 +745,7 @@ export class WgslScanner {
         }
         const ti = this._tokens.length - 1;
         const isIdentOrLiteral = TokenTypes.literal_or_ident.indexOf(this._tokens[ti].type) != -1;
-        if (isIdentOrLiteral && nextLexeme != ">") {
+        if ((isIdentOrLiteral || this._tokens[ti].type == TokenTypes.tokens.paren_right) && nextLexeme != ">") {
           this._addToken(matchedType);
           return true;
         }

diff --git a/test/tests/test_scanner.js b/test/tests/test_scanner.js
@@ -2,6 +2,12 @@ import { test, group } from "../test.js";
 import { WgslScanner, TokenTypes } from "../../../wgsl_reflect.module.js";
 
 group("Scanner", function () {
+  test("(1+2)-3;", function (test) {
+    const scanner = new WgslScanner("(1+2)-3;");
+    const tokens = scanner.scanTokens();
+    test.equals(tokens.length, 9);
+    test.equals(tokens[5].type, TokenTypes.tokens.minus);
+  });
   test("bar--;", function (test) {
     const scanner = new WgslScanner("bar--;");
     const tokens = scanner.scanTokens();

diff --git a/wgsl_reflect.module.js b/wgsl_reflect.module.js
diff --git a/wgsl_reflect.module.js.map b/wgsl_reflect.module.js.map
diff --git a/wgsl_reflect.node.js b/wgsl_reflect.node.js
diff --git a/wgsl_reflect.node.js.map b/wgsl_reflect.node.js.map