VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-08 14:54:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

The parser tests should also give the parser a grammar.

Browse Source
This commit is contained in:
Dave Halter
2014-12-08 00:22:33 +01:00
parent f0c430e20c
commit 34c9422749
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/test_parser/test_parser.py
View File

@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from jedi._compatibility import u, is_py3 from jedi._compatibility import u, is_py3
from jedi.parser import Parser from jedi.parser import Parser, load_grammar
from jedi.parser.user_context import UserContextParser from jedi.parser.user_context import UserContextParser
from jedi.parser import representation as pr from jedi.parser import tree as pt
from textwrap import dedent from textwrap import dedent
@@ -13,15 +13,15 @@ def test_user_statement_on_import():
" time)") " time)")
for pos in [(2, 1), (2, 4)]: for pos in [(2, 1), (2, 4)]:
p = UserContextParser(s, None, pos, None).user_stmt() p = UserContextParser(load_grammar(), s, None, pos, None).user_stmt()
assert isinstance(p, pr.Import) assert isinstance(p, pt.Import)
assert p.defunct is False assert p.defunct is False
assert [str(n) for n in p.get_defined_names()] == ['time'] assert [str(n) for n in p.get_defined_names()] == ['time']
class TestCallAndName(): class TestCallAndName():
def get_call(self, source): def get_call(self, source):
stmt = Parser(u(source), no_docstr=True).module.statements[0] stmt = Parser(load_grammar(), u(source)).module.statements[0]
return stmt.expression_list()[0] return stmt.expression_list()[0]
def test_name_and_call_positions(self): def test_name_and_call_positions(self):
@@ -37,26 +37,26 @@ class TestCallAndName():
def test_call_type(self): def test_call_type(self):
call = self.get_call('hello') call = self.get_call('hello')
assert isinstance(call, pr.Call) assert isinstance(call, pt.Call)
assert type(call.name) == pr.Name assert type(call.name) == pt.Name
def test_literal_type(self): def test_literal_type(self):
literal = self.get_call('1.0') literal = self.get_call('1.0')
assert isinstance(literal, pr.Literal) assert isinstance(literal, pt.Literal)
assert type(literal.value) == float assert type(literal.value) == float
literal = self.get_call('1') literal = self.get_call('1')
assert isinstance(literal, pr.Literal) assert isinstance(literal, pt.Literal)
assert type(literal.value) == int assert type(literal.value) == int
literal = self.get_call('"hello"') literal = self.get_call('"hello"')
assert isinstance(literal, pr.Literal) assert isinstance(literal, pt.Literal)
assert literal.value == 'hello' assert literal.value == 'hello'
class TestSubscopes(): class TestSubscopes():
def get_sub(self, source): def get_sub(self, source):
return Parser(u(source)).module.subscopes[0] return Parser(load_grammar(), u(source)).module.subscopes[0]
def test_subscope_names(self): def test_subscope_names(self):
name = self.get_sub('class Foo: pass').name name = self.get_sub('class Foo: pass').name
@@ -72,7 +72,7 @@ class TestSubscopes():
class TestImports(): class TestImports():
def get_import(self, source): def get_import(self, source):
return Parser(source).module.imports[0] return Parser(load_grammar(), source).module.imports[0]
def test_import_names(self): def test_import_names(self):
imp = self.get_import(u('import math\n')) imp = self.get_import(u('import math\n'))
@@ -87,13 +87,13 @@ class TestImports():
def test_module(): def test_module():
module = Parser(u('asdf'), 'example.py', no_docstr=True).module module = Parser(load_grammar(), u('asdf'), 'example.py').module
name = module.name name = module.name
assert str(name) == 'example' assert str(name) == 'example'
assert name.start_pos == (1, 0) assert name.start_pos == (1, 0)
assert name.end_pos == (1, 7) assert name.end_pos == (1, 7)
module = Parser(u('asdf'), no_docstr=True).module module = Parser(load_grammar(), u('asdf')).module
name = module.name name = module.name
assert str(name) == '' assert str(name) == ''
assert name.start_pos == (1, 0) assert name.start_pos == (1, 0)
@@ -106,7 +106,7 @@ def test_end_pos():
def func(): def func():
y = None y = None
''')) '''))
parser = Parser(s) parser = Parser(load_grammar(), s)
scope = parser.module.subscopes[0] scope = parser.module.subscopes[0]
assert scope.start_pos == (3, 0) assert scope.start_pos == (3, 0)
assert scope.end_pos == (5, 0) assert scope.end_pos == (5, 0)
@@ -119,13 +119,13 @@ def test_carriage_return_statements():
# this is a namespace package # this is a namespace package
''')) '''))
source = source.replace('\n', '\r\n') source = source.replace('\n', '\r\n')
stmt = Parser(source).module.statements[0] stmt = Parser(load_grammar(), source).module.statements[0]
assert '#' not in stmt.get_code() assert '#' not in stmt.get_code()
def test_incomplete_list_comprehension(): def test_incomplete_list_comprehension():
""" Shouldn't raise an error, same bug as #418. """ """ Shouldn't raise an error, same bug as #418. """
s = Parser(u('(1 for def')).module.statements[0] s = Parser(load_grammar(), u('(1 for def')).module.statements[0]
assert s.expression_list() assert s.expression_list()
@@ -138,7 +138,7 @@ def test_hex_values_in_docstring():
return 1 return 1
''' '''
doc = Parser(dedent(u(source))).module.subscopes[0].raw_doc doc = Parser(load_grammar(), dedent(u(source))).module.subscopes[0].raw_doc
if is_py3: if is_py3:
assert doc == '\xff' assert doc == '\xff'
else: else: