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

merge 

--HG--
branch : pmacs2
This commit is contained in:
Erik Osheim 2010-06-01 14:38:01 -04:00
parent 02da5d5d3c fc62fd9c5e
commit c7070c2d01
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mode/lua.py
View File

@ -14,16 +14,18 @@ word = chr1 + chr2 + '*'
class LuaGrammar(Grammar): class LuaGrammar(Grammar):
rules = [ rules = [
PatternRule('comment', r'--.*$'), RegionRule('comment', r'--\[(?P<level>=*)\[', Grammar, r'\]%(level)s\]'),
PatternRule('spaces', r' +'), #RegionRule('comment', r'--\[\[', Grammar, r'\]\]'),
PatternRule('comment', '--.*$'),
PatternRule('spaces', ' +'),
PatternRule('eol', r'\n'), PatternRule('eol', r'\n'),
RegionRule('lua.string', r"'", StringGrammar1, r"'"), RegionRule('lua.string', "'", StringGrammar1, "'"),
RegionRule('lua.string', r'"', StringGrammar2, r'"'), RegionRule('lua.string', '"', StringGrammar2, '"'),
PatternMatchRule('x', '(function)( +)('+word+')', PatternMatchRule('x', '(function)( +)(' + word + ')',
'lua.keyword', 'spaces', 'lua.function'), 'lua.keyword', 'spaces', 'lua.function'),
PatternRule('lua.keyword', '(?:while|until|true|then|return|repeat|or|not|nil|local|in|if|function|for|false|end|elseif|else|done|do|break|and)(?!'+chr2+')'), PatternRule('lua.keyword', '(?:while|until|true|then|return|repeat|or|not|nil|local|in|if|function|for|false|end|elseif|else|done|do|break|and)(?!' + chr2 + ')'),
PatternRule('lua.internal', '_[A-Z]+'), PatternRule('lua.internal', '_[A-Z]+'),
PatternRule('lua.identifier', word), PatternRule('lua.identifier', word),