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

name removed from scope

Browse Source
This commit is contained in:
David Halter
2012-03-01 12:05:34 +01:00
parent e8889ae420
commit 4ea3c5fa35
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pyfuzzyparser.py
View File

@@ -60,8 +60,6 @@ class Scope(object):
well as variables and imports. It is used to access the structure of python well as variables and imports. It is used to access the structure of python
files. files.
:param name: The name of the current Scope, which could be a class name.
:type name: string
:param indent: The indent level of the flow statement. :param indent: The indent level of the flow statement.
:type indent: int :type indent: int
:param line_nr: Line number of the flow statement. :param line_nr: Line number of the flow statement.
@@ -75,12 +73,11 @@ class Scope(object):
self.statements = [] self.statements = []
self.docstr = docstr self.docstr = docstr
self.parent = None self.parent = None
self.name = name
self.indent = indent self.indent = indent
self.line_nr = line_nr self.line_nr = line_nr
def add_scope(self, sub): def add_scope(self, sub):
# print 'push scope: [%s@%s]' % (sub.name, sub.indent) # print 'push scope: [%s@%s]' % (sub.line_nr, sub.indent)
sub.parent = self sub.parent = self
self.subscopes.append(sub) self.subscopes.append(sub)
return sub return sub
@@ -90,8 +87,7 @@ class Scope(object):
Used to add a Statement or a Scope. Used to add a Statement or a Scope.
A statement would be a normal command (Statement) or a Scope (Flow). A statement would be a normal command (Statement) or a Scope (Flow).
""" """
if isinstance(stmt, Scope): stmt.parent = self
stmt.parent = self
self.statements.append(stmt) self.statements.append(stmt)
return stmt return stmt
@@ -179,7 +175,8 @@ class Class(Scope):
:type docstr: str :type docstr: str
""" """
def __init__(self, name, supers, indent, line_nr, docstr=''): def __init__(self, name, supers, indent, line_nr, docstr=''):
super(Class, self).__init__(name, indent, line_nr, docstr) super(Class, self).__init__(indent, line_nr, docstr)
self.name = name
self.supers = supers self.supers = supers
def get_code(self, first_indent=False, indention=" "): def get_code(self, first_indent=False, indention=" "):
@@ -220,7 +217,7 @@ class Flow(Scope):
""" """
def __init__(self, command, statement, indent, line_nr, set_args=None): def __init__(self, command, statement, indent, line_nr, set_args=None):
name = "%s@%s" % (command, line_nr) name = "%s@%s" % (command, line_nr)
super(Flow, self).__init__(name, indent, line_nr, '') super(Flow, self).__init__(indent, line_nr, '')
self.command = command self.command = command
self.statement = statement self.statement = statement
if set_args == None: if set_args == None:
@@ -283,7 +280,8 @@ class Function(Scope):
:type docstr: str :type docstr: str
""" """
def __init__(self, name, params, indent, line_nr, docstr=''): def __init__(self, name, params, indent, line_nr, docstr=''):
Scope.__init__(self, name, indent, line_nr, docstr) Scope.__init__(self, indent, line_nr, docstr)
self.name = name
self.params = params self.params = params
def get_code(self, first_indent=False, indention=" "): def get_code(self, first_indent=False, indention=" "):
@@ -293,6 +291,17 @@ class Function(Scope):
str += "pass\n" str += "pass\n"
return str return str
def get_names(self):
"""
Get the names for the flow. This includes also a call to the super
class.
"""
n = self.set_args
if self.next:
n += self.next.get_names()
n += super(Flow, self).get_names()
return n
class Import(object): class Import(object):
""" """
@@ -365,6 +374,7 @@ class Statement(object):
self.indent = indent self.indent = indent
self.line_nr = line_nr self.line_nr = line_nr
self.parent = None
def get_code(self, new_line=True): def get_code(self, new_line=True):
if new_line: if new_line:
@@ -389,6 +399,7 @@ class Name(object):
self.names = names self.names = names
self.indent = indent self.indent = indent
self.line_nr = line_nr self.line_nr = line_nr
self.parent = None
def get_code(self): def get_code(self):
""" Returns the names in a full string format """ """ Returns the names in a full string format """
@@ -720,7 +731,7 @@ class PyFuzzyParser(object):
% (tok, token_type, indent)) % (tok, token_type, indent))
if token_type == tokenize.DEDENT: if token_type == tokenize.DEDENT:
print 'dedent', self.scope.name print 'dedent'
self.scope = self.scope.parent self.scope = self.scope.parent
elif tok == 'def': elif tok == 'def':
func = self._parsefunction(indent) func = self._parsefunction(indent)
@@ -762,7 +773,7 @@ class PyFuzzyParser(object):
if tok == ':': if tok == ':':
f = Flow('for', statement, indent, self.line_nr, \ f = Flow('for', statement, indent, self.line_nr, \
value_list) value_list)
dbg("new scope: flow %s" % (f.name)) dbg("new scope: flow for@%s" % (f.line_nr))
self.scope = self.scope.add_statement(f) self.scope = self.scope.add_statement(f)
elif tok in ['if', 'while', 'try', 'with'] + extended_flow: elif tok in ['if', 'while', 'try', 'with'] + extended_flow:
@@ -771,7 +782,7 @@ class PyFuzzyParser(object):
statement, tok = self._parse_statement() statement, tok = self._parse_statement()
if tok == ':': if tok == ':':
f = Flow(command, statement, indent, self.line_nr) f = Flow(command, statement, indent, self.line_nr)
dbg("new scope: flow %s" % (f.name)) dbg("new scope: flow %s@%s" % (command, self.line_nr))
if command in extended_flow: if command in extended_flow:
# the last statement has to be another part of # the last statement has to be another part of
# the flow statement # the flow statement