Fix parsing for type literals (#4996)

The currently parsing rules for type literals allow a type literal to be specified inside of a type literal (e.g., <(int64, <string>)>). This pr fixes this undesired behavior.
brimdata · Jan 18, 2024 · b58a6d7 · b58a6d7
1 parent 144cc28
commit b58a6d7
Show file tree

Hide file tree

Showing 5 changed files with 869 additions and 879 deletions.
diff --git a/compiler/parser/invalid.zed b/compiler/parser/invalid.zed
@@ -2,3 +2,4 @@ count() by _path; count() by addr
 sort -r -r,-r,-r
 sort -r a a, b, c
 every 1h count() by _path with -limit 10
+yield cast(1, <(<int64>,string)>)
diff --git a/compiler/parser/parser.es.js b/compiler/parser/parser.es.js
@@ -11563,12 +11563,9 @@ function peg$parse(input, options) {
   function peg$parseType() {
     var s0;
 
-    s0 = peg$parseTypeLiteral();
+    s0 = peg$parseAmbiguousType();
     if (s0 === peg$FAILED) {
-      s0 = peg$parseAmbiguousType();
-      if (s0 === peg$FAILED) {
-        s0 = peg$parseComplexType();
-      }
+      s0 = peg$parseComplexType();
     }
 
     return s0;