VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-02-25 08:27:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged some convert stuff.

Browse Source
This commit is contained in:
Dave Halter
2014-11-04 19:11:48 +01:00
parent 3518123afa
commit 73bd576bb2
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
jedi/parser/__init__.py
View File

@@ -96,15 +96,28 @@ class Parser(object):
self.module.set_global_names(self.global_names) self.module.set_global_names(self.global_names)
def convert_node(self, grammar, raw_node): def convert_node(self, grammar, raw_node):
new_node = self._convert(grammar, raw_node) """
Convert raw node information to a Node instance.
This is passed to the parser driver which calls it whenever a reduction of a
grammar rule produces a new complete node, so that the tree is build
strictly bottom-up.
"""
type, value, context, children = raw_node
#print(raw_node, pytree.type_repr(type))
try:
new_node = self._ast_mapping[type](children)
except KeyError:
new_node = pr.Node(type, children)
# We need to check raw_node always, because the same node can be # We need to check raw_node always, because the same node can be
# returned by convert multiple times. # returned by convert multiple times.
if raw_node[0] == pytree.python_symbols.global_stmt: if type == pytree.python_symbols.global_stmt:
self.global_names += new_node.names() self.global_names += new_node.names()
elif isinstance(new_node, (pr.ClassOrFunc, pr.Module)) \ elif isinstance(new_node, (pr.ClassOrFunc, pr.Module)) \
and raw_node[0] in (pytree.python_symbols.funcdef, and type in (pytree.python_symbols.funcdef,
pytree.python_symbols.classdef, pytree.python_symbols.classdef,
pytree.python_symbols.file_input): pytree.python_symbols.file_input):
# scope_name_stack handling # scope_name_stack handling
scope_names = self.scope_names_stack.pop() scope_names = self.scope_names_stack.pop()
if isinstance(new_node, pr.ClassOrFunc): if isinstance(new_node, pr.ClassOrFunc):
@@ -116,21 +129,6 @@ class Parser(object):
new_node.names_dict = scope_names new_node.names_dict = scope_names
return new_node return new_node
def _convert(self, grammar, raw_node):
"""
Convert raw node information to a Node or Leaf instance.
This is passed to the parser driver which calls it whenever a reduction of a
grammar rule produces a new complete node, so that the tree is build
strictly bottom-up.
"""
type, value, context, children = raw_node
#print(raw_node, pytree.type_repr(type))
try:
return self._ast_mapping[type](children)
except KeyError:
return pr.Node(type, children)
def convert_leaf(self, grammar, raw_node): def convert_leaf(self, grammar, raw_node):
type, value, context, children = raw_node type, value, context, children = raw_node
#print('leaf', raw_node, pytree.type_repr(type)) #print('leaf', raw_node, pytree.type_repr(type))