Remove the position_modifier from the parser.

This commit is contained in:
Dave Halter
2016-09-18 00:50:31 +02:00
parent ed71d05ed7
commit 885cf62a12
11 changed files with 62 additions and 67 deletions
+2 -2
View File
@@ -10,7 +10,7 @@ from functools import partial
from jedi._compatibility import builtins as _builtins, unicode
from jedi import debug
from jedi.cache import underscore_memoization, memoize_method
from jedi.parser.tree import Param, Base, Operator, zero_position_modifier
from jedi.parser.tree import Param, Base, Operator
from jedi.evaluate.helpers import FakeName
from . import fake
@@ -89,7 +89,7 @@ class CompiledObject(Base):
for p in tokens:
parts = [FakeName(part) for part in p.strip().split('=')]
if len(parts) > 1:
parts.insert(1, Operator(zero_position_modifier, '=', (0, 0)))
parts.insert(1, Operator('=', (0, 0)))
params.append(Param(parts, self))
return params
+2 -2
View File
@@ -180,8 +180,8 @@ def _get_faked(module, obj, name=None):
# contain it).
doc = '"""%s"""' % obj.__doc__ # TODO need escapes.
suite = result.children[-1]
string = pt.String(pt.zero_position_modifier, doc, (0, 0), '')
new_line = pt.Newline(pt.zero_position_modifier, '\n', (0, 0))
string = pt.String(doc, (0, 0), '')
new_line = pt.Newline('\n', (0, 0))
docstr_node = pt.Node('simple_stmt', [string, new_line])
suite.children.insert(1, docstr_node)
return result
+5
View File
@@ -80,6 +80,11 @@ class MixedName(compiled.CompiledName):
# This means a start_pos that doesn't exist (compiled objects).
return (0, 0)
@start_pos.setter
def start_pos(self, value):
# Ignore the __init__'s start_pos setter call.
pass
class LazyMixedNamesDict(compiled.LazyNamesDict):
name_class = MixedName
+1 -1
View File
@@ -172,7 +172,7 @@ class FakeName(tree.Name):
In case is_definition is defined (not None), that bool value will be
returned.
"""
super(FakeName, self).__init__(tree.zero_position_modifier, name_str, start_pos)
super(FakeName, self).__init__(name_str, start_pos)
self.parent = parent
self._is_definition = is_definition
+4 -5
View File
@@ -64,15 +64,15 @@ def _fix_forward_reference(evaluator, node):
try:
p = Parser(load_grammar(), _compatibility.unicode(evaled_node.obj),
start_symbol='eval_input')
newnode = p.get_parsed_node()
new_node = p.get_parsed_node()
except ParseError:
debug.warning('Annotation not parsed: %s' % evaled_node.obj)
return node
else:
module = node.get_parent_until()
p.position_modifier.line = module.end_pos[0]
newnode.parent = module
return newnode
new_node.move(module.end_pos[0])
new_node.parent = module
return new_node
else:
return node
@@ -188,7 +188,6 @@ def _find_type_from_comment_hint(evaluator, node, varlist, name):
if not match:
return []
annotation = tree.String(
tree.zero_position_modifier,
repr(str(match.group(1).strip())),
node.start_pos)
annotation.parent = node.parent
+1 -2
View File
@@ -273,8 +273,7 @@ class LazyInstanceDict(object):
class InstanceName(tree.Name):
def __init__(self, origin_name, parent):
super(InstanceName, self).__init__(tree.zero_position_modifier,
origin_name.value,
super(InstanceName, self).__init__(origin_name.value,
origin_name.start_pos)
self._origin_name = origin_name
self.parent = parent