Skip to content

Require comma separators between function arguments #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
srijan2607 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Require comma separators between function arguments #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions jmespath/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,12 @@ def _token_led_lparen(self, left):
"Invalid function name '%s'" % prev_t['value'])
name = left['value']
args = []
while not self._current_token() == 'rparen':
expression = self._expression()
if self._current_token() == 'comma':
if self._current_token() != 'rparen':
while True:
args.append(self._expression())
if self._current_token() == 'rparen':
break
self._match('comma')
args.append(expression)
self._match('rparen')
function_node = ast.function_expression(name, args)
return function_node
Expand Down
32 changes: 32 additions & 0 deletions tests/test_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,38 @@ def test_multiselect_with_all_quoted_keys(self):
result = parsed.search({'foo': {'bar': {'baz': 'CORRECT'}, 'qux': 'qux'}})
self.assertEqual(result, {"bar": "CORRECT", "qux": "qux"})

def test_function_arguments_require_comma_separators(self):
expressions = [
'contains(@ @)',
"join('' 'abc')",
'sort_by(@ &foo)',
'not_null(foo bar)',
'not_null(foo, bar baz)',
'not_null(length(foo) length(bar))',
]
for expression in expressions:
with self.subTest(expression=expression):
with self.assertRaises(exceptions.ParseError):
self.parser.parse(expression)

def test_function_arguments_reject_trailing_comma(self):
for expression in ['length(@,)', 'not_null(foo, bar,)']:
with self.subTest(expression=expression):
with self.assertRaises(exceptions.ParseError):
self.parser.parse(expression)

def test_function_arguments_with_comma_separators(self):
self.assert_parsed_ast('f()', ast.function_expression('f', []))
self.assert_parsed_ast(
'f(foo, bar, baz)',
ast.function_expression('f', [ast.field('foo'), ast.field('bar'),
ast.field('baz')]))
parsed = self.parser.parse('not_null(length(foo), length(bar))')
self.assertEqual(parsed.search({'foo': [1, 2], 'bar': []}), 2)
parsed = self.parser.parse('sort_by(@, &foo)')
self.assertEqual(parsed.search([{'foo': 2}, {'foo': 1}]),
[{'foo': 1}, {'foo': 2}])

def test_function_call_with_and_statement(self):
self.assert_parsed_ast(
'f(@ && @)',
Expand Down