diff options
| author | Georg Brandl <georg@python.org> | 2011-06-18 13:49:00 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-06-18 13:49:00 +0200 |
| commit | 1507dac8fd099aad7afca378965ceb508b00dddd (patch) | |
| tree | 7c7a3448b6b7628f8bd33e207c1b68854ad375ae /pygments/lexers/functional.py | |
| parent | 522b59a55921a278a847c573974811417cd9fac6 (diff) | |
| parent | 0bf6072b0e75fa4b6afab5d23477d7aa4aa1c77c (diff) | |
| download | pygments-1507dac8fd099aad7afca378965ceb508b00dddd.tar.gz | |
merge with bgoetzmann/pygments-main
Diffstat (limited to 'pygments/lexers/functional.py')
| -rw-r--r-- | pygments/lexers/functional.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pygments/lexers/functional.py b/pygments/lexers/functional.py index 9115f653..724ee833 100644 --- a/pygments/lexers/functional.py +++ b/pygments/lexers/functional.py @@ -570,11 +570,11 @@ class OcamlLexer(RegexLexer): (r"[^\W\d][\w']*", Name), - (r'\d[\d_]*', Number.Integer), + (r'-?\d[\d_]*(.[\d_]*)?([eE][+\-]?\d[\d_]*)', Number.Float), (r'0[xX][\da-fA-F][\da-fA-F_]*', Number.Hex), (r'0[oO][0-7][0-7_]*', Number.Oct), (r'0[bB][01][01_]*', Number.Binary), - (r'-?\d[\d_]*(.[\d_]*)?([eE][+\-]?\d[\d_]*)', Number.Float), + (r'\d[\d_]*', Number.Integer), (r"'(?:(\\[\\\"'ntbr ])|(\\[0-9]{3})|(\\x[0-9a-fA-F]{2}))'", String.Char), @@ -656,7 +656,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' |