diff options
| author | Georg Brandl <georg@python.org> | 2012-12-03 10:16:00 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-12-03 10:16:00 +0100 |
| commit | 91fce0b32ec6629973d6b0dffcf9030c901beb11 (patch) | |
| tree | 227904f068f4041679e32174a4e5bd07d02fe80b | |
| parent | c2f2bbea0e6490259150fe85f4332d4adc5fe8ee (diff) | |
| parent | af9fea08b09a8ea0a38271693da692532ac0fd84 (diff) | |
| download | pygments-91fce0b32ec6629973d6b0dffcf9030c901beb11.tar.gz | |
Merged in pekkaklarck/pygments-main (pull request #137)
| -rw-r--r-- | pygments/lexers/asm.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/math.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py index c1d46bcb..340cd136 100644 --- a/pygments/lexers/asm.py +++ b/pygments/lexers/asm.py @@ -240,7 +240,7 @@ class LlvmLexer(RegexLexer): r'|linkonce_odr|weak|weak_odr|appending|dllimport|dllexport' r'|common|default|hidden|protected|extern_weak|external' r'|thread_local|zeroinitializer|undef|null|to|tail|target|triple' - r'|deplibs|datalayout|volatile|nuw|nsw|exact|inbounds|align' + r'|datalayout|volatile|nuw|nsw|exact|inbounds|align' r'|addrspace|section|alias|module|asm|sideeffect|gc|dbg' r'|ccc|fastcc|coldcc|x86_stdcallcc|x86_fastcallcc|arm_apcscc' diff --git a/pygments/lexers/math.py b/pygments/lexers/math.py index 0e78bb49..5e8461da 100644 --- a/pygments/lexers/math.py +++ b/pygments/lexers/math.py @@ -97,8 +97,8 @@ class JuliaLexer(RegexLexer): (r'[a-zA-Z_][a-zA-Z0-9_]*', Name), # numbers - (r'(\d+\.\d*|\d*\.\d+)([eE][+-]?[0-9]+)?', Number.Float), - (r'\d+[eE][+-]?[0-9]+', Number.Float), + (r'(\d+\.\d*|\d*\.\d+)([eEf][+-]?[0-9]+)?', Number.Float), + (r'\d+[eEf][+-]?[0-9]+', Number.Float), (r'0b[01]+', Number.Binary), (r'0o[0-7]+', Number.Oct), (r'0x[a-fA-F0-9]+', Number.Hex), |