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

removed used_vars and set_vars parameters, because they are unused

Browse Source
This commit is contained in:
David Halter
2013-09-03 01:17:35 +04:30
parent ba228d2ca0
commit 4c6a58644e
5 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/evaluate_representation.py
View File

@@ -534,8 +534,7 @@ class Execution(Executable):
arr.values = values arr.values = values
key_stmts = [] key_stmts = []
for key in keys: for key in keys:
stmt = pr.Statement(self._sub_module, [], [], [], stmt = pr.Statement(self._sub_module, [], start_pos, None)
start_pos, None)
stmt._commands = [key] stmt._commands = [key]
key_stmts.append(stmt) key_stmts.append(stmt)
arr.keys = key_stmts arr.keys = key_stmts
@@ -650,7 +649,7 @@ class Execution(Executable):
old = stmt old = stmt
# generate a statement if it's not already one. # generate a statement if it's not already one.
module = builtin.Builtin.scope module = builtin.Builtin.scope
stmt = pr.Statement(module, [], [], [], (0, 0), None) stmt = pr.Statement(module, [], (0, 0), None)
stmt._commands = [old] stmt._commands = [old]
# *args # *args

2
jedi/helpers.py
View File

@@ -134,4 +134,4 @@ class FakeStatement(pr.Statement):
def __init__(self, content): def __init__(self, content):
cls = type(self) cls = type(self)
p = 0, 0 p = 0, 0
super(cls, self).__init__(cls.SubModule, [], [], [content], p, p) super(cls, self).__init__(cls.SubModule, [content], p, p)

2
jedi/interpret.py
View File

@@ -164,8 +164,6 @@ class ObjectImporter(object):
]) ])
return pr.Statement( return pr.Statement(
module=submodule, module=submodule,
set_vars=[lhsname],
used_vars=[rhsname],
token_list=token_list, token_list=token_list,
start_pos=(0, 0), start_pos=(0, 0),
end_pos=(None, None)) end_pos=(None, None))

11
jedi/parsing.py
View File

@@ -315,7 +315,6 @@ class Parser(object):
:rtype: (Statement, str) :rtype: (Statement, str)
""" """
set_vars = [] set_vars = []
used_vars = []
level = 0 # The level of parentheses level = 0 # The level of parentheses
if pre_used_token: if pre_used_token:
@@ -370,13 +369,7 @@ class Parser(object):
tok_list.pop() tok_list.pop()
if n: if n:
tok_list.append(n) tok_list.append(n)
used_vars.append(n)
continue continue
elif tok.endswith('=') and tok not in ['>=', '<=', '==', '!=']:
# there has been an assignement -> change vars
if level == 0:
set_vars += used_vars
used_vars = []
elif tok in opening_brackets: elif tok in opening_brackets:
level += 1 level += 1
elif tok in closing_brackets: elif tok in closing_brackets:
@@ -408,8 +401,8 @@ class Parser(object):
return None, tok return None, tok
stmt = stmt_class(self.module, set_vars, used_vars, tok_list, stmt = stmt_class(self.module, tok_list, first_pos, self.end_pos,
first_pos, self.end_pos, as_names=as_names, as_names=as_names,
names_are_set_vars=names_are_set_vars) names_are_set_vars=names_are_set_vars)
stmt.parent = self.top_module stmt.parent = self.top_module

19
jedi/parsing_representation.py
View File

@@ -740,10 +740,6 @@ class Statement(Simple):
stores pretty much all the Python code, except functions, classes, imports, stores pretty much all the Python code, except functions, classes, imports,
and flow functions like if, for, etc. and flow functions like if, for, etc.
:type set_vars: list of :class:`Name`
:param set_vars: The variables which are defined by the statement.
:type used_vars: list of :class:`Name`
:param used_vars: The variables which are used by the statement.
:type token_list: list :type token_list: list
:param token_list: :param token_list:
List of tokens or names. Each element is either an instance List of tokens or names. Each element is either an instance
@@ -756,9 +752,11 @@ class Statement(Simple):
__slots__ = ('token_list', '_set_vars', 'as_names', '_commands', __slots__ = ('token_list', '_set_vars', 'as_names', '_commands',
'_assignment_details', 'docstr', '_names_are_set_vars') '_assignment_details', 'docstr', '_names_are_set_vars')
def __init__(self, module, set_vars, used_vars, token_list, start_pos, end_pos, parent=None, def __init__(self, module, token_list, start_pos, end_pos, parent=None,
as_names=(), names_are_set_vars=False, set_name_parents=True): as_names=(), names_are_set_vars=False, set_name_parents=True):
super(Statement, self).__init__(module, start_pos, end_pos) super(Statement, self).__init__(module, start_pos, end_pos)
if isinstance(start_pos, list):
raise NotImplementedError()
self.token_list = token_list self.token_list = token_list
self._names_are_set_vars = names_are_set_vars self._names_are_set_vars = names_are_set_vars
if set_name_parents: if set_name_parents:
@@ -897,7 +895,6 @@ class Statement(Simple):
def parse_stmt(token_iterator, maybe_dict=False, added_breaks=(), def parse_stmt(token_iterator, maybe_dict=False, added_breaks=(),
break_on_assignment=False, stmt_class=Statement): break_on_assignment=False, stmt_class=Statement):
token_list = [] token_list = []
used_vars = []
level = 1 level = 1
tok = None tok = None
first = True first = True
@@ -913,8 +910,6 @@ class Statement(Simple):
if isinstance(tok, ListComprehension): if isinstance(tok, ListComprehension):
# it's not possible to set it earlier # it's not possible to set it earlier
tok.parent = self tok.parent = self
if isinstance(tok, Name):
used_vars.append(tok)
else: else:
token_type, tok, start_tok_pos = tok_temp token_type, tok, start_tok_pos = tok_temp
last_end_pos = end_pos last_end_pos = end_pos
@@ -950,7 +945,7 @@ class Statement(Simple):
if not token_list: if not token_list:
return None, tok return None, tok
statement = stmt_class(self._sub_module, [], used_vars, token_list, statement = stmt_class(self._sub_module, token_list,
start_pos, end_pos, self.parent, set_name_parents=False) start_pos, end_pos, self.parent, set_name_parents=False)
return statement, tok return statement, tok
@@ -994,7 +989,7 @@ class Statement(Simple):
for stmt in arr: for stmt in arr:
token_list += stmt.token_list token_list += stmt.token_list
start_pos = arr.start_pos[0], arr.start_pos[1] - 1 start_pos = arr.start_pos[0], arr.start_pos[1] - 1
stmt = Statement(self._sub_module, [], token_list, token_list, stmt = Statement(self._sub_module, token_list,
start_pos, arr.end_pos) start_pos, arr.end_pos)
arr.parent = stmt arr.parent = stmt
stmt.token_list = stmt._commands = [arr] stmt.token_list = stmt._commands = [arr]
@@ -1005,7 +1000,7 @@ class Statement(Simple):
stmt._names_are_set_vars = names_are_set_vars stmt._names_are_set_vars = names_are_set_vars
return stmt, tok return stmt, tok
st = Statement(self._sub_module, [], [], token_list, start_pos, st = Statement(self._sub_module, token_list, start_pos,
end_pos, set_name_parents=False) end_pos, set_name_parents=False)
middle, tok = parse_stmt_or_arr(token_iterator, ['in'], True) middle, tok = parse_stmt_or_arr(token_iterator, ['in'], True)
@@ -1098,7 +1093,7 @@ class Statement(Simple):
e = (t[2][0], t[2][1] + len(t[1])) \ e = (t[2][0], t[2][1] + len(t[1])) \
if isinstance(t, tuple) else t.start_pos if isinstance(t, tuple) else t.start_pos
stmt = Statement(self._sub_module, [], [], result, stmt = Statement(self._sub_module, result,
start_pos, e, self.parent, set_name_parents=False) start_pos, e, self.parent, set_name_parents=False)
stmt._commands = result stmt._commands = result
arr, break_tok = parse_array(token_iterator, Array.TUPLE, arr, break_tok = parse_array(token_iterator, Array.TUPLE,