branch : pmacs2
This commit is contained in:
moculus 2009-01-24 17:49:19 +00:00
parent 57deac3c63
commit aaf0f8090a
1 changed files with 9 additions and 13 deletions

View File

@ -610,11 +610,11 @@ class PerlContext(context.Context):
stack.append(t.string) stack.append(t.string)
starting = False starting = False
elif t.name == 'delimiter' and t.string == '}': elif t.name == 'delimiter' and t.string == '}':
if not stack: if stack:
# we are totally hosed. start over. ugh. stack.pop(-1)
self.build_name_map() else:
return # we are totally hosed. ugh.
stack.pop(-1) pass
if curr: if curr:
self.namelines[i] = (curr, tuple(stack)) self.namelines[i] = (curr, tuple(stack))
i += 1 i += 1
@ -734,7 +734,6 @@ class Perl(mode.Fundamental):
'perlfunction': PerlFunctionCompleter(None), 'perlfunction': PerlFunctionCompleter(None),
} }
format = "%(flag)s %(bname)-18s (%(mname)s) %(indent)s %(cursor)s/%(mark)s %(perc)s [%(func)s]" format = "%(flag)s %(bname)-18s (%(mname)s) %(indent)s %(cursor)s/%(mark)s %(perc)s [%(func)s]"
#format = "%(flag)s %(bname)-18s (%(mname)s) %(cursor)s/%(mark)s %(perc)s"
def get_status_names(self): def get_status_names(self):
names = mode.Fundamental.get_status_names(self) names = mode.Fundamental.get_status_names(self)
c = self.window.logical_cursor() c = self.window.logical_cursor()
@ -755,7 +754,7 @@ class Perl(mode.Fundamental):
self.add_bindings('close-paren', (')')) self.add_bindings('close-paren', (')'))
self.add_bindings('close-bracket', (']')) self.add_bindings('close-bracket', (']'))
self.add_bindings('close-brace', ('}')) self.add_bindings('close-brace', ('}'))
#self.context = PerlContext(self) self.context = PerlContext(self)
self.functions = None self.functions = None
self.funclines = None self.funclines = None
self.perlinc = None self.perlinc = None
@ -789,13 +788,10 @@ class Perl(mode.Fundamental):
return self.perlinc return self.perlinc
def get_functions(self): def get_functions(self):
#return self.context.get_names() return self.context.get_names()
return {}
def get_function_names(self): def get_function_names(self):
#return self.context.get_name_list() return self.context.get_name_list()
return {}
def get_line_function(self, y): def get_line_function(self, y):
#return self.context.get_line_name(y) return self.context.get_line_name(y)
return {}
install = Perl.install install = Perl.install