Changeset 11779

Timestamp:

2019-10-23T18:03:10+02:00 (4 years ago)

Author:

nicolasmartin

Message:

Create 'namelist' state to handle highlighting of this particular statement
Probably not optimized but it works.

The line have to start with the expecting syntax for declaring a namelist &[a-z][\w$]*
The token type that seems appropriate is the namespace (Name.Namespace).
The declaration of variables, arrays and data structures are taken into account in the same regexp
with bygroups
The slash terminator to end the namelist will also be colorized to make some kind of an envelope
surrounding the variables and arrays.

File:

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

utils/developer/fortran.py

@@ -41 +41 @@
         'root': [
             (r'^#.*\n', Comment.Preproc),
+            (r'^&[a-z]\w*', Name.Namespace, 'namelist'),
             (r'!.*\n', Comment),
             include('strings'),
@@ -87 +88 @@
             (r'(\*\*|\*|\+|-|\/|<|>|<=|>=|==|\/=|=)', Operator),
 
+            # 
             (r'(::)', Keyword.Declaration),
 
@@ -145 +147 @@
             # Booleans
             (r'\.(true|false)\.', Name.Builtin),
+
             # Comparing Operators
             (r'\.(eq|ne|lt|le|gt|ge|not|and|or|eqv|neqv)\.', Operator.Word),
@@ -150 +153 @@
             # 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'^\/$', Name.Namespace),
         ],
         'strings': [
@@ -155 +171 @@
             (r"(?s)'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single),
         ],
-
         'nums': [
             (r'\d+(?![.e])(_[a-z]\w+)?', Number.Integer),