VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

get the 'not' priorities right for precedences

Browse Source
This commit is contained in:
Dave Halter
2014-03-08 03:14:05 +01:00
parent 3559dba7ea
commit 11346d0901
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/evaluate/precedence.py
View File

@@ -86,7 +86,8 @@ def _get_number(iterator, priority=PythonGrammar.LOWEST_PRIORITY):
if isinstance(el, pr.Operator): if isinstance(el, pr.Operator):
if el in PythonGrammar.FACTOR: if el in PythonGrammar.FACTOR:
right = _get_number(iterator, PythonGrammar.FACTOR_PRIORITY) right = _get_number(iterator, PythonGrammar.FACTOR_PRIORITY)
elif el in PythonGrammar.NOT_TEST and priority <= PythonGrammar.FACTOR_PRIORITY: elif el in PythonGrammar.NOT_TEST \
and priority >= PythonGrammar.NOT_TEST_PRIORITY:
right = _get_number(iterator, PythonGrammar.NOT_TEST_PRIORITY) right = _get_number(iterator, PythonGrammar.NOT_TEST_PRIORITY)
else: else:
_syntax_error(el) _syntax_error(el)

2
test/test_evaluate/test_precedence.py
View File

@@ -24,7 +24,7 @@ def test_simple():
def test_prefixed(): def test_prefixed():
assert parse_tree('--2') == (None, '-', (None, '-', 2)) assert parse_tree('--2') == (None, '-', (None, '-', 2))
assert parse_tree('1 and not - 2') == (1, 'and', (None, '-', 2)) assert parse_tree('1 and not - 2') == (1, 'and', (None, 'not', (None, '-', 2)))
def test_invalid(): def test_invalid():