diff options
| author | Andy Li <andy@onthewings.net> | 2013-02-21 02:13:48 +0800 |
|---|---|---|
| committer | Andy Li <andy@onthewings.net> | 2013-02-21 02:13:48 +0800 |
| commit | 9f55ab87e7f817e902c18ef08d06744f3ff59482 (patch) | |
| tree | cd4787e1c534f58893c19999357cb1af70de993e | |
| parent | 868ecb305a89cbcc53c8462f0b559699e952981e (diff) | |
| download | pygments-9f55ab87e7f817e902c18ef08d06744f3ff59482.tar.gz | |
Remove keyword "callback", added optional type, improved regex, binop, and switch.
| -rw-r--r-- | pygments/lexers/web.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py index 435b4810..88f15af7 100644 --- a/pygments/lexers/web.py +++ b/pygments/lexers/web.py @@ -1142,7 +1142,7 @@ class HaxeLexer(ExtendedRegexLexer): r'break|return|continue|extends|implements|import|' r'switch|case|default|public|private|try|untyped|' r'catch|new|this|throw|extern|enum|in|interface|' - r'cast|override|dynamic|typedef|package|callback|' + r'cast|override|dynamic|typedef|package|' r'inline|using|null|true|false|abstract)\b') # idtype in lexer.mll @@ -1500,7 +1500,7 @@ class HaxeLexer(ExtendedRegexLexer): (r'"', String.Double, ('#pop', 'expr-chain', 'string-double')), # EReg - (r'~/(\\\\|\\/|[^/\n])*/[gim]*', String.Regex, ('#pop', 'expr-chain')), + (r'~/(\\\\|\\/|[^/\n])*/[gimsu]*', String.Regex, ('#pop', 'expr-chain')), # Array (r'\[', Punctuation, ('#pop', 'expr-chain', 'array-decl')), @@ -1509,7 +1509,7 @@ class HaxeLexer(ExtendedRegexLexer): 'expr-chain': [ include('spaces'), (r'(?:\+\+|\-\-)', Operator), - (r'(?:%=|&=|\|=|\^=|\+=|\-=|\*=|/=|<<=|>>=|>>>=|==|!=|<=|>=|&&|\|\||<<|>>>|>>|\.\.\.|<|>|%|&|\||\^|\+|\*|/|\-|=>|=)', Operator, ('#pop', 'expr')), + (r'(?:%=|&=|\|=|\^=|\+=|\-=|\*=|/=|<<=|>\s*>\s*=|>\s*>\s*>\s*=|==|!=|<=|>\s*=|&&|\|\||<<|>>>|>\s*>|\.\.\.|<|>|%|&|\||\^|\+|\*|/|\-|=>|=)', Operator, ('#pop', 'expr')), (r'(?:in)\b', Keyword, ('#pop', 'expr')), (r'\?', Operator, ('#pop', 'expr', 'ternary', 'expr')), (r'(\.)(' + ident_no_keyword + ')', bygroups(Punctuation, Name)), @@ -1610,7 +1610,7 @@ class HaxeLexer(ExtendedRegexLexer): # optional multiple expr under a case 'case-block': [ include('spaces'), - (r'(?!(case|default|\}))', Keyword, 'expr-statement'), + (r'(?!(?:case|default)\b|\})', Keyword, 'expr-statement'), (r'', Text, '#pop'), ], @@ -1687,6 +1687,7 @@ class HaxeLexer(ExtendedRegexLexer): 'type': [ include('spaces'), + (r'\?', Punctuation), (ident, Name, ('#pop', 'type-check', 'type-full-name')), (r'\{', Punctuation, ('#pop', 'type-check', 'type-struct')), (r'\(', Punctuation, ('#pop', 'type-check', 'type-parenthesis')), |