summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2017-01-17 08:05:16 +0100
committerGeorg Brandl <georg@python.org>2017-01-17 08:05:16 +0100
commiteb4b3ea0d83b9b8e6dc2e1a642eac393c45181af (patch)
tree6b7bfceee2290595b21742f6b65ab94173a29af4
parent346229c9c36d45086db283f1c5612355e55d6efe (diff)
parent56e75b33d66738b072f9f5525f3af4a8ba863d8b (diff)
downloadpygments-eb4b3ea0d83b9b8e6dc2e1a642eac393c45181af.tar.gz
Merged in takluyver/pygments-main/py3-float-e (pull request #618)
Add '1e6' as float token for Python3Lexer
-rw-r--r--pygments/lexers/fortran.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pygments/lexers/fortran.py b/pygments/lexers/fortran.py
index e2f95b11..6cc8f2c8 100644
--- a/pygments/lexers/fortran.py
+++ b/pygments/lexers/fortran.py
@@ -156,8 +156,8 @@ class FortranLexer(RegexLexer):
'nums': [
(r'\d+(?![.e])(_[a-z]\w+)?', Number.Integer),
- (r'[+-]?\d*\.\d+(e[-+]?\d+)?(_[a-z]\w+)?', Number.Float),
- (r'[+-]?\d+\.\d*(e[-+]?\d+)?(_[a-z]\w+)?', Number.Float),
+ (r'[+-]?\d*\.\d+([ed][-+]?\d+)?(_[a-z]\w+)?', Number.Float),
+ (r'[+-]?\d+\.\d*([ed][-+]?\d+)?(_[a-z]\w+)?', Number.Float),
],
}