1
0
forked from VimPlug/jedi

Remove the module attribute from the parser.

This commit is contained in:
Dave Halter
2017-03-18 03:53:34 +01:00
parent d0b6d41e99
commit 0f66a3c7a8
11 changed files with 21 additions and 20 deletions

View File

@@ -45,7 +45,7 @@ class Differ(object):
debug.dbg('differ: initialize', color='YELLOW')
grammar = load_grammar()
self.parser = ParserWithRecovery(grammar, source)
return self.parser.module
return self.parser.get_root_node()
def parse(self, source, copies=0, parsers=0, expect_error_leaves=False):
debug.dbg('differ: parse copies=%s parsers=%s', copies, parsers, color='YELLOW')

View File

@@ -27,7 +27,8 @@ def test_carriage_return_splitting():
'''))
source = source.replace('\n', '\r\n')
p = FastParser(load_grammar(), source)
assert [n.value for lst in p.module.used_names.values() for n in lst] == ['Foo']
module = p.get_root_node()
assert [n.value for lst in module.used_names.values() for n in lst] == ['Foo']
def test_class_in_docstr():
@@ -48,8 +49,8 @@ def check_p(src, number_parsers_used, number_of_splits=None, number_of_misses=0)
p = FastParser(load_grammar(), u(src))
save_parser(None, p, pickling=False)
assert src == p.module.get_code()
return p.module
assert src == p.get_root_node().get_code()
return p.get_root_node()
def test_if():

View File

@@ -90,13 +90,13 @@ class TestImports():
def test_module():
module = ParserWithRecovery(load_grammar(), u('asdf'), 'example.py').module
module = ParserWithRecovery(load_grammar(), u('asdf'), 'example.py').get_root_node()
name = module.name
assert str(name) == 'example'
assert name.start_pos == (1, 0)
assert name.end_pos == (1, 7)
module = ParserWithRecovery(load_grammar(), u('asdf')).module
module = ParserWithRecovery(load_grammar(), u('asdf')).get_root_node()
name = module.name
assert str(name) == ''
assert name.start_pos == (1, 0)
@@ -190,7 +190,7 @@ def test_param_splitting():
def check(src, result):
# Python 2 tuple params should be ignored for now.
grammar = load_grammar('%s.%s' % sys.version_info[:2])
m = ParserWithRecovery(grammar, u(src)).module
m = ParserWithRecovery(grammar, u(src)).get_root_node()
if is_py3:
assert not m.subscopes
else: