diff options
| author | Tim Hatch <tim@timhatch.com> | 2012-02-27 18:55:15 -0800 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2012-02-27 18:55:15 -0800 |
| commit | 9d519e510f887c337c7a715d80e07b15357d33dc (patch) | |
| tree | 5d847cc5a55354f5494d67c1e5034891f3b244c2 /pygments/lexers/functional.py | |
| parent | 5558d3ba11cc7b2d1e16228ce3c5402b7d48072c (diff) | |
| parent | e6abbe90c96cb77c0a775c8ae4427eb2f49c1f98 (diff) | |
| download | pygments-9d519e510f887c337c7a715d80e07b15357d33dc.tar.gz | |
Merge pygments-main with pygments-tim
Diffstat (limited to 'pygments/lexers/functional.py')
| -rw-r--r-- | pygments/lexers/functional.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pygments/lexers/functional.py b/pygments/lexers/functional.py index 5f710837..044f66c7 100644 --- a/pygments/lexers/functional.py +++ b/pygments/lexers/functional.py @@ -886,7 +886,7 @@ class OcamlLexer(RegexLexer): (r'\b([A-Z][A-Za-z0-9_\']*)', Name.Class), (r'\(\*', Comment, 'comment'), (r'\b(%s)\b' % '|'.join(keywords), Keyword), - (r'(%s)' % '|'.join(keyopts), Operator), + (r'(%s)' % '|'.join(keyopts[::-1]), Operator), (r'(%s|%s)?%s' % (infix_syms, prefix_syms, operators), Operator), (r'\b(%s)\b' % '|'.join(word_operators), Operator.Word), (r'\b(%s)\b' % '|'.join(primitives), Keyword.Type), @@ -979,7 +979,7 @@ class ErlangLexer(RegexLexer): 'universaltime_to_localtime', 'unlink', 'unregister', 'whereis' ] - operators = r'(\+|-|\*|/|<|>|=|==|/=|=:=|=/=|=<|>=|\+\+|--|<-|!|\?)' + operators = r'(\+\+?|--?|\*|/|<|>|/=|=:=|=/=|=<|>=|==?|<-|!|\?)' word_operators = [ 'and', 'andalso', 'band', 'bnot', 'bor', 'bsl', 'bsr', 'bxor', 'div', 'not', 'or', 'orelse', 'rem', 'xor' |