Changeset 11781

Timestamp:

2019-10-23T21:02:18+02:00 (5 years ago)

Author:

nicolasmartin

Message:

Improve Fortran lexer by creating distinct states for comment, boolean, operator and punctuation
Respectively cmt, bool, opr & punc.

The regexps were from the 'core' state which was reduced to statements, data types and builtins
The punctuation state has evolved to handle & character more wisely:
highlight only if followed by whitespace (continuation line), if not

Tested with tracers.rst which includes routine, namelist and code-block.
Still a small issue with on a specific namelist.

File:

• utils/developer/fortran.py (modified) (3 diffs)

utils/developer/fortran.py

@@ -40 +40 @@
     tokens = {
         'root': [
-            (r'^#.*\n', Comment.Preproc),
-            (r'^&[a-z]\w*', Name.Namespace, 'namelist'),
-            (r'!.*\n', Comment),
-            include('strings'),
+            include('cmt' ),
+            include('nlst'),
+            include('str' ),
+            include('bool'),
+            include('opr' ),
+            include('punc'),
             include('core'),
             (r'[a-z][\w$]*', Name),
-            include('nums'),
+            include('num'),
             (r'[\s]+', Text),
+        ],
+        'cmt': [
+            (r'^#.*\n', Comment.Preproc),
+            (r'!.*\n', Comment),
         ],
         'core': [
@@ -85 +91 @@
              Keyword.Type),
 
-            # Operators
-            (r'(\*\*|\*|\+|-|\/|<|>|<=|>=|==|\/=|=)', Operator),
-
-            # 
+            #
             (r'(::)', Keyword.Declaration),
 
@@ -144 +147 @@
                 'ZLog', 'ZSin', 'ZSqRt'), prefix=r'\b', suffix=r'\s*\b'),
              Name.Builtin),
-
+        ],
+        'bool': [
             # Booleans
-            (r'\.(true|false)\.', Name.Builtin),
+            (r'\.(true|false)\.', Keyword.Constant),
+        ],
+        'opr': [
+            # Operators
+            (r'(\*\*|\*|\+|-|\/|<|>|<=|>=|==|\/=|=)', Operator),
 
             # Comparing Operators
             (r'\.(eq|ne|lt|le|gt|ge|not|and|or|eqv|neqv)\.', Operator.Word),
-
+        ],
+        'punc': [
             # Punctuation
-            (r'[()\[\],:&%;.]', Punctuation),
-        ],
-        'namelist': [
-            (r'!.*\n', Comment),
-            (r'([a-z]\w*)(\()?(\s*)?(\d*)?(\s*)?(\))?(%[a-z]\w*)?(\s*)(=)', bygroups(
-               Name.Variable, Punctuation, Text, Number.Integer, Text, Punctuation, 
-               Name.Variable, Text, Operator)),
-            (r'(\*\*|\*|\+|-|\/|<|>|<=|>=|==|\/=|=)', Operator),
-            (r'\.(true|false)\.', Name.Builtin),
-            include('strings'),
-            include('nums'),
-            (r'[()\[\],:&%;.]', Punctuation),
-            (r'[\s]+', Text),
+            (r'[()\[\],:%;.]', Punctuation),
+            (r'&(?=\s)'      , Punctuation),
+        ],
+        'nlst': [
+            (r'^&[a-z]\w*', Name.Namespace),
+#            include('cmt'),
+            (r'^(\s*)([a-z]\w*)(\()?(\s*)?(\d*)?(\s*)?(\))?(%[a-z]\w*)?(\s*)(=)',
+             bygroups(Text, Name.Variable,
+                      Punctuation  , Text, Number.Integer, Text, Punctuation,
+                      Name.Variable,
+                      Text, Operator                                         )),
+            (r'([+-])', Operator),
             (r'^\/$', Name.Namespace),
         ],
-        'strings': [
+        'str': [
             (r'(?s)"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double),
             (r"(?s)'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single),
         ],
-        'nums': [
+        'num': [
             (r'\d+(?![.e])(_[a-z]\w+)?', Number.Integer),
             (r'[+-]?\d*\.\d+([ed][-+]?\d+)?(_[a-z]\w+)?', Number.Float),