From 1c98199b06c059434b7b16c85b6568b6e6d6c9a7 Mon Sep 17 00:00:00 2001 From: Marshall Ward Date: Sat, 6 Jan 2018 11:39:40 +1100 Subject: Fortran E-notation float without decimal Added a regex to parse Fortran floating points which identify floating point values with exponents but without decimals (e.g. 1e4 vs 1.e4 or 1.0e4) --- pygments/lexers/fortran.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pygments/lexers/fortran.py b/pygments/lexers/fortran.py index 1a611c9d..61b8aaeb 100644 --- a/pygments/lexers/fortran.py +++ b/pygments/lexers/fortran.py @@ -158,6 +158,7 @@ class FortranLexer(RegexLexer): (r'\d+(?![.e])(_[a-z]\w+)?', Number.Integer), (r'[+-]?\d*\.\d+([ed][-+]?\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), ], } -- cgit v1.2.1 From c5629b93b8128c9a4925c1d118b6cb9b1d468f7a Mon Sep 17 00:00:00 2001 From: Marshall Ward Date: Sat, 6 Jan 2018 11:45:30 +1100 Subject: Safer Fortran E-notation without decimal Fortran e-notation values without decimal now require the presence of e (or d) and at least one exponent value. --- pygments/lexers/fortran.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygments/lexers/fortran.py b/pygments/lexers/fortran.py index 61b8aaeb..5165bac0 100644 --- a/pygments/lexers/fortran.py +++ b/pygments/lexers/fortran.py @@ -158,7 +158,7 @@ class FortranLexer(RegexLexer): (r'\d+(?![.e])(_[a-z]\w+)?', Number.Integer), (r'[+-]?\d*\.\d+([ed][-+]?\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), + (r'[+-]?\d+(\.\d*)?[ed][-+]?\d+(_[a-z]\w+)?', Number.Float), ], } -- cgit v1.2.1