Upgrading APDL lexer (#2314)

Co-authored-by: Jean Abou Samra <jean@abou-samra.fr>

3 files changed, 44 insertions, 66 deletions

diff --git a/tests/examplefiles/apdl/example1apdl.ans.output b/tests/examplefiles/apdl/example1apdl.ans.output
index 2a1c3fe9..73d55fa3 100644
--- a/tests/examplefiles/apdl/example1apdl.ans.output
+++ b/tests/examplefiles/apdl/example1apdl.ans.output
@@ -1,12 +1,10 @@
 'finish'      Keyword
 '\n'          Text.Whitespace
 
-'/'           Operator
-'clear'       Name.Variable
+'/clear'      Keyword
 '\n\n'        Text.Whitespace
 
-'/'           Operator
-'title'       Name.Variable
+'/title'      Keyword
 ','           Punctuation
 ' '           Text.Whitespace
 'Thermal'     Name.Variable
@@ -16,13 +14,11 @@
 'Example'     Name.Variable
 '\n'          Text.Whitespace
 
-'/'           Operator
-'prep7'       Name.Variable
+'/prep7'      Keyword
 '\t\t\t\t\t'  Text.Whitespace
 '! Enter preprocessor\n' Comment
 
-'*'           Operator
-'VOPER'       Name.Variable
+'*VOPER'      Keyword
 ','           Punctuation
 'test'        Name.Variable
 '\n\n'        Text.Whitespace
@@ -60,7 +56,7 @@
 ','           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-'link33'      Name.Variable
+'link33'      Name.Property
 '\t\t\t\t'    Text.Whitespace
 '! Element type\n' Comment
 
@@ -79,8 +75,7 @@
 ','           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-'6'           Literal.Number.Integer
-'0.5'         Literal.Number.Float
+'60.5'        Literal.Number.Float
 '\t\t\t\t'    Text.Whitespace
 '! Thermal conductivity\n' Comment
 
@@ -100,7 +95,7 @@
 
 'physics'     Keyword
 ','           Punctuation
-'write'       Keyword
+'write'       Name.Variable
 ','           Punctuation
 'thermal'     Name.Variable
 '\t\t\t'      Text.Whitespace
@@ -126,8 +121,7 @@
 ','           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-'20'          Literal.Number.Integer
-'0e9'         Literal.Number.Float
+'200e9'       Literal.Number.Float
 '\t\t\t\t'    Text.Whitespace
 "! Young's modulus\n" Comment
 
@@ -147,14 +141,13 @@
 ','           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-'1'           Literal.Number.Integer
-'2e-6'        Literal.Number.Float
+'12e-6'       Literal.Number.Float
 '\t\t\t\t'    Text.Whitespace
 '! Expansion coefficient\n' Comment
 
 'physics'     Keyword
 ','           Punctuation
-'write'       Keyword
+'write'       Name.Variable
 ','           Punctuation
 'struct'      Name.Variable
 '\t\t\t'      Text.Whitespace
@@ -168,8 +161,7 @@
 'finish'      Keyword
 '\n\n'        Text.Whitespace
 
-'/'           Operator
-'solu'        Keyword
+'/solu'       Keyword
 '\t\t\t\t\t'  Text.Whitespace
 '! Enter the solution phase\n' Comment
 
@@ -181,7 +173,7 @@
 
 'physics'     Keyword
 ','           Punctuation
-'read'        Keyword
+'read'        Name.Variable
 ','           Punctuation
 'thermal'     Name.Variable
 '\t\t\t'      Text.Whitespace
@@ -205,14 +197,13 @@
 'finish'      Keyword
 '\n\n'        Text.Whitespace
 
-'/'           Operator
-'solu'        Keyword
+'/solu'       Keyword
 '\t\t\t\t\t'  Text.Whitespace
 '! Re-enter the solution phase\n' Comment
 
 'physics'     Keyword
 ','           Punctuation
-'read'        Keyword
+'read'        Name.Variable
 ','           Punctuation
 'struct'      Name.Variable
 '\t\t\t'      Text.Whitespace
@@ -263,8 +254,7 @@
 'finish'      Keyword
 '\n\n'        Text.Whitespace
 
-'/'           Operator
-'post1'       Name.Variable
+'/post1'      Keyword
 '\t\t\t\t\t'  Text.Whitespace
 '! Enter postprocessor\n' Comment
 
diff --git a/tests/examplefiles/apdl/example2apdl.ans b/tests/examplefiles/apdl/example2apdl.ans
index 238b62e7..a49039fe 100644
--- a/tests/examplefiles/apdl/example2apdl.ans
+++ b/tests/examplefiles/apdl/example2apdl.ans
@@ -1,19 +1,19 @@
 ! ANSYS command file to perform 2D Truss Tutorial (Chandrupatla p.123)
 !
-/title, Bridge Truss Tutorial
+ /title, Bridge Truss Tutorial
 /PREP7                  ! preprocessor phase
 !
 ! define parameters (mm)
 height = 3118
 width = 3600
 !
-! define keypoints 
+! define keypoints
 !
 K,1,    0,   0               ! keypoint, #, x, y
-K,2,   width/2,height 
+K,2,   width/2,height
 K,3,     width,  0
 K,4, 3*width/2,  height
-K,5,   2*width,   0 
+K,5,   2*width,   0
 K,6, 5*width/2,  height
 K,7,   3*width,  0
 !
@@ -30,7 +30,7 @@ L,4,6
 L,5,6
 L,5,7
 L,6,7
- 
+
 !
 ! element definition
 !
@@ -47,14 +47,14 @@ FINISH                  ! finish pre-processor
 !
 ! apply some constraints
 DK,1,ALL,0        ! define a DOF constraint at a keypoint
-DK,7,UY,0 
+DK,7,UY,0
 !
 ! apply loads
 !
 FK,1,FY,-280e3          ! define a force load to a keypoint
-FK,3,FY,-210e3          
-FK,5,FY,-280e3          
-FK,7,FY,-360e3          
+FK,3,FY,-210e3
+FK,5,FY,-280e3
+FK,7,FY,-360e3
 !
 SOLVE                   ! solve the resulting system of equations
 FINISH                  ! finish solution
diff --git a/tests/examplefiles/apdl/example2apdl.ans.output b/tests/examplefiles/apdl/example2apdl.ans.output
index f964f25b..aa07e58c 100644
--- a/tests/examplefiles/apdl/example2apdl.ans.output
+++ b/tests/examplefiles/apdl/example2apdl.ans.output
@@ -2,8 +2,8 @@
 
 '!\n'         Comment
 
-'/'           Operator
-'title'       Name.Variable
+' '           Text.Whitespace
+'/title'      Keyword
 ','           Punctuation
 ' '           Text.Whitespace
 'Bridge'      Name.Variable
@@ -13,8 +13,7 @@
 'Tutorial'    Name.Variable
 '\n'          Text.Whitespace
 
-'/'           Operator
-'PREP7'       Name.Variable
+'/PREP7'      Keyword
 '                  ' Text.Whitespace
 '! preprocessor phase\n' Comment
 
@@ -38,7 +37,7 @@
 
 '!\n'         Comment
 
-'! define keypoints \n' Comment
+'! define keypoints\n' Comment
 
 '!\n'         Comment
 
@@ -64,7 +63,7 @@
 '2'           Literal.Number.Integer
 ','           Punctuation
 'height'      Name.Variable
-' \n'         Text.Whitespace
+'\n'          Text.Whitespace
 
 'K'           Keyword
 ','           Punctuation
@@ -103,7 +102,7 @@
 ','           Punctuation
 '   '         Text.Whitespace
 '0'           Literal.Number.Integer
-' \n'         Text.Whitespace
+'\n'          Text.Whitespace
 
 'K'           Keyword
 ','           Punctuation
@@ -215,7 +214,7 @@
 '6'           Literal.Number.Integer
 ','           Punctuation
 '7'           Literal.Number.Integer
-'\n \n'       Text.Whitespace
+'\n\n'        Text.Whitespace
 
 '!\n'         Comment
 
@@ -227,7 +226,7 @@
 ','           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-'LINK1'       Keyword
+'LINK1'       Name.Variable
 '              ' Text.Whitespace
 '! element type      #1; spring element\n' Comment
 
@@ -245,8 +244,7 @@
 ','           Punctuation
 '1'           Literal.Number.Integer
 ','           Punctuation
-'20'          Literal.Number.Integer
-'0e3'         Literal.Number.Float
+'200e3'       Literal.Number.Float
 '          '  Text.Whitespace
 "! material property #1; Young's modulus: 200 GPa\n" Comment
 
@@ -282,8 +280,7 @@
 
 '!\n'         Comment
 
-'/'           Operator
-'SOLU'        Keyword
+'/SOLU'       Keyword
 '                   ' Text.Whitespace
 '! enter solution phase\n' Comment
 
@@ -308,7 +305,7 @@
 'UY'          Name.Variable
 ','           Punctuation
 '0'           Literal.Number.Integer
-' \n'         Text.Whitespace
+'\n'          Text.Whitespace
 
 '!\n'         Comment
 
@@ -322,9 +319,7 @@
 ','           Punctuation
 'FY'          Name.Variable
 ','           Punctuation
-'-'           Operator
-'28'          Literal.Number.Integer
-'0e3'         Literal.Number.Float
+'-280e3'      Literal.Number.Float
 '          '  Text.Whitespace
 '! define a force load to a keypoint\n' Comment
 
@@ -334,10 +329,8 @@
 ','           Punctuation
 'FY'          Name.Variable
 ','           Punctuation
-'-'           Operator
-'21'          Literal.Number.Integer
-'0e3'         Literal.Number.Float
-'          \n' Text.Whitespace
+'-210e3'      Literal.Number.Float
+'\n'          Text.Whitespace
 
 'FK'          Keyword
 ','           Punctuation
@@ -345,10 +338,8 @@
 ','           Punctuation
 'FY'          Name.Variable
 ','           Punctuation
-'-'           Operator
-'28'          Literal.Number.Integer
-'0e3'         Literal.Number.Float
-'          \n' Text.Whitespace
+'-280e3'      Literal.Number.Float
+'\n'          Text.Whitespace
 
 'FK'          Keyword
 ','           Punctuation
@@ -356,10 +347,8 @@
 ','           Punctuation
 'FY'          Name.Variable
 ','           Punctuation
-'-'           Operator
-'36'          Literal.Number.Integer
-'0e3'         Literal.Number.Float
-'          \n' Text.Whitespace
+'-360e3'      Literal.Number.Float
+'\n'          Text.Whitespace
 
 '!\n'         Comment
 
@@ -373,13 +362,12 @@
 
 '\n'          Text.Whitespace
 
-'/'           Operator
-'POST1'       Name.Variable
+'/POST1'      Keyword
 '\n'          Text.Whitespace
 
 'PRRSOL'      Keyword
 ','           Punctuation
-'F'           Keyword
+'F'           Name.Variable
 '                ' Text.Whitespace
 '! List Reaction Forces\n' Comment