d6
/
pmacs3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

--HG-- 

branch : pmacs2
This commit is contained in:
moculus 2009-04-05 17:05:42 +00:00
parent 75a31bd921
commit 0084721108
3 changed files with 80 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application.py
View File

@ -29,7 +29,10 @@ class Application(object):
self.input = keyinput.Handler() self.input = keyinput.Handler()
# let's prepopulate some default token colors # let's prepopulate some default token colors
self.cached_colors = {}
self.token_colors = { self.token_colors = {
'spaces': ('default', 'default'),
'eol': ('default', 'default'),
'comment': ('red', 'default', 'bold'), 'comment': ('red', 'default', 'bold'),
'comment.start': ('red', 'default', 'bold'), 'comment.start': ('red', 'default', 'bold'),
'comment.data': ('red', 'default', 'bold'), 'comment.data': ('red', 'default', 'bold'),

66
lex.py
View File

@ -7,16 +7,20 @@ def escape(s):
class Token(object): class Token(object):
def __init__(self, name, rule, y, x, s, color=None, parent=None, matchd={}, link=None): def __init__(self, name, rule, y, x, s, color=None, parent=None, matchd={}, link=None):
self.name = name self.name = name
self.rule = rule self.rule = rule
self.y = y self.y = y
self.x = x self.x = x
self.string = s self.string = s
self.color = color self.color = color
self.parent = parent self.parent = parent
self.matchd = matchd self.matchd = matchd
self.link = link self.link = link
self._debug = False self._debug = False
#self._fqlist = None
#self._fqname = None
#self._fqlist = self.mkfqlist()
#self._fqname = self.mkfqname()
assert parent is None or hasattr(parent, 'name'), 'oh no %r' % parent assert parent is None or hasattr(parent, 'name'), 'oh no %r' % parent
def match(self, name, string): def match(self, name, string):
@ -54,6 +58,11 @@ class Token(object):
if self.link and not self.link.startswith('middle'): if self.link and not self.link.startswith('middle'):
names.append(self.rule.name) names.append(self.rule.name)
return names return names
#def fqlist(self):
# if self._fqlist is None:
# self._fqlist = self.mkfqlist()
# return self._fqlist
#def mkfqlist(self):
def fqlist(self): def fqlist(self):
if self.parent is not None: if self.parent is not None:
names = self.parent.domain() names = self.parent.domain()
@ -63,6 +72,11 @@ class Token(object):
names.append(self.rule.name) names.append(self.rule.name)
names.append(self.name) names.append(self.name)
return names return names
#def fqname(self):
# if self._fqname is None:
# self._fqname = self.mkfqname()
# return self._fqname
#def mkfqname(self):
def fqname(self): def fqname(self):
names = self.fqlist() names = self.fqlist()
return '.'.join(names) return '.'.join(names)
@ -540,15 +554,25 @@ class Lexer(object):
raise StopIteration raise StopIteration
def get_color(self, token): def get_color(self, token):
fqlist = token.fqlist() app = self.mode.window.application
if self.mstack: name = '.'.join(token.fqlist())
mode = self.mstack[-1]
else: if name in app.token_colors:
mode = self.mode return app.token_colors[name]
app = mode.window.application elif name in app.cached_colors:
for j in range(0, len(fqlist)): return app.cached_colors[name]
name = '.'.join(fqlist[j:])
if name in app.token_colors: name2 = name
assert type(app.token_colors[name]) == type(()), repr(mode) while name2:
return app.token_colors[name] try:
i = name2.index('.')
name2 = name2[i + 1:]
except ValueError:
break
if name2 in app.token_colors:
c = app.token_colors[name2]
app.cached_colors[name] = c
return c
app.cached_colors[name] = app.config['default_color']
return app.config['default_color'] return app.config['default_color']

64
mode/c.py
View File

@ -36,55 +36,55 @@ class MacroGrammar(Grammar):
class CGrammar(Grammar): class CGrammar(Grammar):
rules = [ rules = [
PatternRule('spaces', r' +'), PatternRule('c.spaces', r' +'),
PatternMatchRule('x', r'(\()( *)(' + word + r')(\**)( *)(\))( *)(?=[a-zA-Z0-9_\(])', PatternMatchRule('x', r'(\()( *)(' + word + r')(\**)( *)(\))( *)(?=[a-zA-Z0-9_\(])',
'delimiter', 'spaces', 'type', 'operator', 'spaces', 'delimiter', 'c.delimiter', 'c.spaces', 'c.type', 'c.operator',
'spaces'), 'c.spaces', 'c.delimiter', 'c.spaces'),
#PatternMatchRule('x', r'(\()(' + word + r')(\))',
# 'delimiter', 'type', 'delimiter'),
PatternRule(r"delimiter", r"\.|\(|\)|\[|\]|{|}|@|,|:|`|;|=(?!=)|\?|->"), PatternRule(r"c.delimiter", r"\.|\(|\)|\[|\]|{|}|@|,|:|`|;|=(?!=)|\?|->"),
PatternRule('eol', r"\n$"), PatternRule('c.eol', r"\n$"),
PatternMatchRule('x', r'(struct|enum|union)( +)(' + word + ')', PatternMatchRule('x', r'(struct|enum|union)( +)(' + word + ')',
'builtin', 'spaces', 'type'), 'c.builtin', 'c.spaces', 'c.type'),
PatternRule('builtin', r"(?:break|case|continue|default|do|else|for|goto|if|return|sizeof|switch|while)(?!" + chr2 + ")"), PatternRule('c.builtin', r"(?:break|case|continue|default|do|else|for|goto|if|return|sizeof|switch|while)(?!" + chr2 + ")"),
PatternRule('builtin', r"(?:signed|register|extern|const|static|enum|struct|typedef|union|unsigned|volatile)(?!" + chr2 + ")"), PatternRule('c.builtin', r"(?:signed|register|extern|const|static|enum|struct|typedef|union|unsigned|volatile)(?!" + chr2 + ")"),
PatternRule('type', r"(?:auto|char|double|float|int|long|short|void|volatile)(?!" + chr2 + ")"), PatternRule('c.type', r"(?:auto|char|double|float|int|long|short|void|volatile)(?!" + chr2 + ")"),
PatternMatchRule('x', '(' + word + ')( +)(\**)(' + word + ')( *)(\()', PatternMatchRule('x', '(' + word + ')( +)(\**)(' + word + ')( *)(\()',
'type', 'spaces', 'operator', 'function', 'spaces', 'delimiter'), 'c.type', 'c.spaces', 'c.operator', 'c.function',
'c.spaces', 'c.delimiter'),
PatternMatchRule('x', '(' + word + ')(\*+)( +)(' + word + ')( *)(\()', PatternMatchRule('x', '(' + word + ')(\*+)( +)(' + word + ')( *)(\()',
'type', 'operator', 'spaces', 'function', 'spaces', 'delimiter'), 'c.type', 'c.operator', 'c.spaces', 'c.function',
'c.spaces', 'c.delimiter'),
PatternMatchRule('x', '(' + word + ')( +)(\**)(' + word + ')', PatternMatchRule('x', '(' + word + ')( +)(\**)(' + word + ')',
'type', 'spaces', 'operator', 'c.identifier'), 'c.type', 'c.spaces', 'c.operator', 'c.identifier'),
PatternMatchRule('x', '(' + word + ')(\*+)( +)(' + word + ')', PatternMatchRule('x', '(' + word + ')(\*+)( +)(' + word + ')',
'type', 'operator', 'spaces', 'c.identifier'), 'c.type', 'c.operator', 'c.spaces', 'c.identifier'),
PatternRule('function', word + r'(?= *\()'), PatternRule('c.function', word + r'(?= *\()'),
PatternRule('constant', "[A-Z_][A-Z0-9_]+(?!" + chr2 + ")"), PatternRule('c.constant', "[A-Z_][A-Z0-9_]+(?!" + chr2 + ")"),
PatternRule('label', word + '(?=:)'), PatternRule('c.label', word + '(?=:)'),
RegionRule('error', '# *error', ErrorGrammar, r'\n$'), RegionRule('c.error', '# *error', ErrorGrammar, r'\n$'),
RegionRule('macro', '# *(?:assert|cpu|define|elif|else|endif|error|ident|ifdef|ifndef|if|import|include_next|line|machine|pragma_once|pragma|system|unassert|undef|warning)(?!=' + chr2 + ')', MacroGrammar, r'\n$'), RegionRule('c.macro', '# *(?:assert|cpu|define|elif|else|endif|error|ident|ifdef|ifndef|if|import|include_next|line|machine|pragma_once|pragma|system|unassert|undef|warning)(?!=' + chr2 + ')', MacroGrammar, r'\n$'),
RegionRule('comment', r'/\*', CommentGrammar, r'\*/'), RegionRule('c.comment', r'/\*', CommentGrammar, r'\*/'),
PatternRule('comment', '//.*$'), PatternRule('c.comment', '//.*$'),
RegionRule('string', '"', StringGrammar2, '"'), RegionRule('c.string', '"', StringGrammar2, '"'),
PatternRule(r"float", r"-?[0-9]+\.[0-9]*|-?\.[0-9]+|-?(?:[0-9]|[0-9]+\.[0-9]*|-?\.[0-9]+)[eE][\+-]?[0-9]+"), PatternRule("c.float", r"-?[0-9]+\.[0-9]*|-?\.[0-9]+|-?(?:[0-9]|[0-9]+\.[0-9]*|-?\.[0-9]+)[eE][\+-]?[0-9]+"),
PatternRule(r"integer", r"(?:0(?![x0-9])|-?[1-9][0-9]*|0[0-7]+|0[xX][0-9a-fA-F]+)[lL]?"), PatternRule("c.integer", r"(?:0(?![x0-9])|-?[1-9][0-9]*|0[0-7]+|0[xX][0-9a-fA-F]+)[lL]?"),
PatternRule(r"operator", r"!(?!=)|\+=|-=|\*=|/=|//=|%=|&=\|\^=|>>=|<<=|\*\*="), PatternRule("c.operator", r"!(?!=)|\+=|-=|\*=|/=|//=|%=|&=\|\^=|>>=|<<=|\*\*="),
PatternRule('operator', r"\+|<>|<<|<=|<|-|>>|>=|>|\*\*|&|\*|\||/|\^|==|//|~|!=|%"), PatternRule('c.operator', r"\+|<>|<<|<=|<|-|>>|>=|>|\*\*|&|\*|\||/|\^|==|//|~|!=|%"),
RegionRule('macrocomment', '#if +(?:0|NULL|FALSE)', Grammar, '#endif'), RegionRule('c.macrocomment', '#if +(?:0|NULL|FALSE)', Grammar, '#endif'),
PatternRule('char', r"'.'|'\\.'|'\\[0-7]{3}'"), PatternRule('c.char', r"'.'|'\\.'|'\\[0-7]{3}'"),
PatternMatchRule('x', r'(# *include)( +)(.+)(\n|$)', PatternMatchRule('x', r'(# *include)( +)(.+)(\n|$)',
'macro.start', 'spaces', 'header', 'macro.end'), 'c.macro.start', 'c.spaces', 'c.header', 'c.macro.end'),
PatternRule('c.identifier', word), PatternRule('c.identifier', word),
OverridePatternRule('comment', r'/\* *@@:(?P<token>[.a-zA-Z0-9_]+):(?P<mode>[.a-zA-Z0-9_]+) *\*/$'), OverridePatternRule('c.comment', r'/\* *@@:(?P<token>[.a-zA-Z0-9_]+):(?P<mode>[.a-zA-Z0-9_]+) *\*/$'),
OverridePatternRule('comment', r'// *@@:(?P<token>[.a-zA-Z0-9_]+):(?P<mode>[.a-zA-Z0-9_]+) *$'), OverridePatternRule('c.comment', r'// *@@:(?P<token>[.a-zA-Z0-9_]+):(?P<mode>[.a-zA-Z0-9_]+) *$'),
] ]
MacroGrammar.rules.extend(CGrammar.rules) MacroGrammar.rules.extend(CGrammar.rules)