improve parser for jq compatibility

itchyny · Jul 5, 2020 · 6cdc968 · 6cdc968
1 parent 2346a5b
commit 6cdc968
Show file tree

Hide file tree

Showing 6 changed files with 538 additions and 498 deletions.
diff --git a/builtin.go b/builtin.go
diff --git a/cli/test.yaml b/cli/test.yaml
@@ -2086,6 +2086,23 @@
   expected: |
     7
 
+- name: condition with optional operator
+  args:
+    - 'if . then tonumber end ?'
+  input: '1'
+  expected: |
+    1
+
+- name: condition with suffix
+  args:
+    - 'if . then 1 end []'
+  input: '1'
+  error: |
+    invalid query: if . then 1 end []
+        if . then 1 end []
+                        ^  unexpected token "["
+  exit_code: 3
+
 - name: not function
   args:
     - 'map(not)'

diff --git a/compiler.go b/compiler.go
@@ -662,7 +662,7 @@ func (c *compiler) compileTry(e *Try) error {
 	setforktrybegin()
 	if e.Catch != nil {
 		defer c.newScopeDepth()()
-		return c.compileTerm(e.Catch)
+		return c.compileQuery(e.Catch)
 	}
 	c.append(&code{op: opbacktrack})
 	return nil