Fix bugs from latest compliance tests

Author: jamesls

jmespath/parser.py

@@ -221,6 +221,13 @@ def _parse_slice_expression(self):
         while not current_token == 'rbracket' and index < 3:
             if current_token == 'colon':
                 index += 1
+                if index == 3:
+                    t = self._lookahead_token(0)
+                    lex_position = t['start']
+                    actual_value = t['value']
+                    actual_type = t['type']
+                    raise exceptions.ParseError(lex_position, actual_value,
+                                                actual_type, 'syntax error')
                 self._advance()
             elif current_token == 'number':
                 parts[index] = self._lookahead_token(0)['value']
@@ -271,6 +278,14 @@ def _token_led_and(self, left):
         return ast.and_expression(left, right)
 
     def _token_led_lparen(self, left):
+        if left['type'] != 'field':
+            #  0 - first func arg or closing paren.
+            # -1 - '(' token
+            # -2 - invalid function "name".
+            prev_t = self._lookahead_token(-2)
+            raise exceptions.ParseError(
+                prev_t['start'], prev_t['value'], prev_t['type'],
+                "Invalid function name '%s'" % prev_t['value'])
         name = left['value']
         args = []
         while not self._current_token() == 'rparen':

tests/compliance/syntax.json

@@ -14,14 +14,6 @@
       "expression": "foo.-11",
       "error": "syntax"
     },
-    {
-      "expression": "foo",
-      "result": null
-    },
-    {
-      "expression": "foo.",
-      "error": "syntax"
-    },
     {
       "expression": "foo.",
       "error": "syntax"
@@ -116,6 +108,33 @@
       }
     ]
   },
+  {
+    "comment": "Paren syntax errors",
+    "given": {},
+    "cases": [
+      {
+        "comment": "missing closing paren",
+        "expression": "(@",
+        "error": "syntax"
+      }
+    ]
+  },
+  {
+    "comment": "Function syntax errors",
+    "given": {},
+    "cases": [
+      {
+        "comment": "invalid start of function",
+        "expression": "@(foo)",
+        "error": "syntax"
+      },
+      {
+        "comment": "function names cannot be quoted",
+        "expression": "\"foo\"(bar)",
+        "error": "syntax"
+      }
+    ]
+  },
   {
     "comment": "Wildcard syntax",
     "given": {"type": "object"},
@@ -199,6 +218,37 @@
       {
         "expression": "foo[#]",
         "error": "syntax"
+      },
+      {
+        "comment": "missing rbracket for led wildcard index",
+        "expression": "led[*",
+        "error": "syntax"
+      }
+    ]
+  },
+  {
+    "comment": "slice syntax",
+    "given": {},
+    "cases": [
+      {
+        "comment": "slice expected colon or rbracket",
+        "expression": "[:@]",
+        "error": "syntax"
+      },
+      {
+        "comment": "slice has too many colons",
+        "expression": "[:::]",
+        "error": "syntax"
+      },
+      {
+        "comment": "slice expected number",
+        "expression": "[:@:]",
+        "error": "syntax"
+      },
+      {
+        "comment": "slice expected number of colon",
+        "expression": "[:1@]",
+        "error": "syntax"
       }
     ]
   },
@@ -358,16 +408,6 @@
         "expression": "a.{foo}",
         "error": "syntax"
       },
-      {
-        "comment": "Missing value",
-        "expression": "a.{foo:}",
-        "error": "syntax"
-      },
-      {
-        "comment": "Missing value with trailing comma",
-        "expression": "a.{foo: ,}",
-        "error": "syntax"
-      },
       {
         "comment": "Valid multi-select hash extraction",
         "expression": "a.{foo: bar}",
@@ -402,6 +442,11 @@
         "comment": "Nested multi select",
         "expression": "{\"\\\\\":{\" \":*}}",
         "result": {"\\": {" ": ["object"]}}
+      },
+      {
+        "comment": "Missing closing } after a valid nud",
+        "expression": "{a: @",
+        "error": "syntax"
       }
     ]
   },
@@ -574,6 +619,11 @@
         "comment": "Two level flattened projection of a literal",
         "expression": "twolen[].threelen[].`\"bar\"`",
         "error": "syntax"
+      },
+      {
+        "comment": "expects closing ]",
+        "expression": "foo[? @ | @",
+        "error": "syntax"
       }
     ]
   },
@@ -592,6 +642,10 @@
       {
         "expression": "\"\\\\\"",
         "result": null
+      },
+      {
+        "expression": "\"\\u\"",
+        "error": "syntax"
       }
     ]
   },

tests/test_compliance.py

@@ -94,6 +94,13 @@ def _test_error_expression(given, expression, error, filename):
     except ValueError:
         # Test passes, it raised a parse error as expected.
         pass
+    except Exception as e:
+        # Failure because an unexpected exception was raised.
+        error_msg = ("\n\n  (%s) The expression '%s' was suppose to be a "
+                     "syntax error, but it raised an unexpected error:\n\n%s" % (
+                         filename, expression, e))
+        error_msg = error_msg.replace(r'\n', '\n')
+        raise AssertionError(error_msg)
     else:
         error_msg = ("\n\n  (%s) The expression '%s' was suppose to be a "
                      "syntax error, but it successfully parsed as:\n\n%s" % (