From e72d941ab63ed65c82c5ad8b902f1944f40823a3 Mon Sep 17 00:00:00 2001
From: Crystal Prieb <crystal.prieb@agvantis.com>
Date: Tue, 18 Oct 2022 10:30:29 -0500
Subject: [PATCH 1/2] initial psl code

---
 README.md                    |   2 +-
 lexers/embedded/psl.xml      | 106 +++++++++++++++++++++++++++++++++++
 lexers/testdata/psl.actual   |  10 ++++
 lexers/testdata/psl.expected |  70 +++++++++++++++++++++++
 4 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 lexers/embedded/psl.xml
 create mode 100644 lexers/testdata/psl.actual
 create mode 100644 lexers/testdata/psl.expected

diff --git a/README.md b/README.md
index df7e0f14c..9ddbcfe11 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ L | Lighttpd configuration file, LLVM, Lua
 M | Mako, markdown, Mason, Mathematica, Matlab, MiniZinc, MLIR, Modula-2, MonkeyC, MorrowindScript, Myghty, MySQL
 N | NASM, Newspeak, Nginx configuration file, Nim, Nix
 O | Objective-C, OCaml, Octave, OnesEnterprise, OpenEdge ABL, OpenSCAD, Org Mode
-P | PacmanConf, Perl, PHP, PHTML, Pig, PkgConfig, PL/pgSQL, plaintext, Pony, PostgreSQL SQL dialect, PostScript, POVRay, PowerShell, Prolog, PromQL, Properties, Protocol Buffer, Puppet, Python 2, Python
+P | PacmanConf, Perl, PHP, PHTML, Pig, PkgConfig, PL/pgSQL, plaintext, Pony, PostgreSQL SQL dialect, PostScript, POVRay, PowerShell, Prolog, PromQL, Properties, Protocol Buffer, PSL, Puppet, Python 2, Python
 Q | QBasic
 R | R, Racket, Ragel, Raku, react, ReasonML, reg, reStructuredText, Rexx, Ruby, Rust
 S | SAS, Sass, Scala, Scheme, Scilab, SCSS, Sed, Smalltalk, Smarty, Snobol, Solidity, SPARQL, SQL, SquidConf, Standard ML, Stylus, Svelte, Swift, SYSTEMD, systemverilog
diff --git a/lexers/embedded/psl.xml b/lexers/embedded/psl.xml
new file mode 100644
index 000000000..0cb9750d3
--- /dev/null
+++ b/lexers/embedded/psl.xml
@@ -0,0 +1,106 @@
+<lexer>
+  <config>
+    <name>PSL</name>
+    <alias>psl</alias>
+    <filename>*.psl</filename>
+    <filename>*.BATCH</filename>
+    <filename>*.TRIG</filename>
+    <filename>*.PROC</filename>
+    <mime_type>text/x-psl</mime_type>
+  </config>
+  <rules>
+    <state name="root">
+      <rule pattern="//.*$">
+        <token type="CommentSingle"/>
+      </rule>
+      <rule pattern="/(\\\n)?[*](.|\n)*?[*](\\\n)?/">
+        <token type="CommentMultiline"/>
+      </rule>
+      <rule pattern="\+|-|\*|/|%|'?&lt;|'?&gt;|'?=|and|or|_|:|.">
+        <token type="Operator"/>
+      </rule>
+      <!-- <rule pattern="[?:]">
+        <token type="Operator"/>
+      </rule> -->
+      <rule pattern="\bdefined\b">
+        <token type="Operator"/>
+      </rule>
+      <rule pattern="[{}(),\[\]]">
+        <token type="Punctuation"/>
+      </rule>
+      <rule pattern="[+-]?\d*\.\d+([eE][-+]?\d+)?f?">
+        <token type="LiteralNumberFloat"/>
+      </rule>
+      <rule pattern="[+-]?\d+\.\d*([eE][-+]?\d+)?f?">
+        <token type="LiteralNumberFloat"/>
+      </rule>
+      <rule pattern="0[xX][0-9a-fA-F]*">
+        <token type="LiteralNumberHex"/>
+      </rule>
+      <rule pattern="0[0-7]*">
+        <token type="LiteralNumberOct"/>
+      </rule>
+      <rule pattern="[1-9][0-9]*">
+        <token type="LiteralNumberInteger"/>
+      </rule>
+      <rule pattern="&quot;">
+        <token type="LiteralString"/>
+        <push state="string"/>
+      </rule>
+      <rule pattern="\b(asm|asm_fragment|break|case|cbuffer|centroid|class|column_major|compile|compile_fragment|const|continue|default|discard|do|else|export|extern|for|fxgroup|globallycoherent|groupshared|if|in|inline|inout|interface|line|lineadj|linear|namespace|nointerpolation|noperspective|NULL|out|packoffset|pass|pixelfragment|point|precise|return|register|row_major|sample|sampler|shared|stateblock|stateblock_state|static|struct|switch|tbuffer|technique|technique10|technique11|texture|typedef|triangle|triangleadj|uniform|vertexfragment|volatile|while)\b">
+        <token type="Keyword"/>
+      </rule>
+      <rule pattern="\b(true|false)\b">
+        <token type="KeywordConstant"/>
+      </rule>
+      <rule pattern="\b(auto|catch|char|const_cast|delete|dynamic_cast|enum|explicit|friend|goto|long|mutable|new|operator|private|protected|public|reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try|typename|union|unsigned|using|virtual)\b">
+        <token type="KeywordReserved"/>
+      </rule>
+      <rule pattern="\b(dword|matrix|snorm|string|unorm|unsigned|void|vector|BlendState|Buffer|ByteAddressBuffer|ComputeShader|DepthStencilState|DepthStencilView|DomainShader|GeometryShader|HullShader|InputPatch|LineStream|OutputPatch|PixelShader|PointStream|RasterizerState|RenderTargetView|RasterizerOrderedBuffer|RasterizerOrderedByteAddressBuffer|RasterizerOrderedStructuredBuffer|RasterizerOrderedTexture1D|RasterizerOrderedTexture1DArray|RasterizerOrderedTexture2D|RasterizerOrderedTexture2DArray|RasterizerOrderedTexture3D|RWBuffer|RWByteAddressBuffer|RWStructuredBuffer|RWTexture1D|RWTexture1DArray|RWTexture2D|RWTexture2DArray|RWTexture3D|SamplerState|SamplerComparisonState|StructuredBuffer|Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture2DMS|Texture2DMSArray|Texture3D|TextureCube|TextureCubeArray|TriangleStream|VertexShader)\b">
+        <token type="KeywordType"/>
+      </rule>
+      <rule pattern="\b(bool|double|float|int|half|min16float|min10float|min16int|min12int|min16uint|uint)([1-4](x[1-4])?)?\b">
+        <token type="KeywordType"/>
+      </rule>
+      <rule pattern="\b(abort|abs|acos|all|AllMemoryBarrier|AllMemoryBarrierWithGroupSync|any|AppendStructuredBuffer|asdouble|asfloat|asin|asint|asuint|asuint|atan|atan2|ceil|CheckAccessFullyMapped|clamp|clip|CompileShader|ConsumeStructuredBuffer|cos|cosh|countbits|cross|D3DCOLORtoUBYTE4|ddx|ddx_coarse|ddx_fine|ddy|ddy_coarse|ddy_fine|degrees|determinant|DeviceMemoryBarrier|DeviceMemoryBarrierWithGroupSync|distance|dot|dst|errorf|EvaluateAttributeAtCentroid|EvaluateAttributeAtSample|EvaluateAttributeSnapped|exp|exp2|f16tof32|f32tof16|faceforward|firstbithigh|firstbitlow|floor|fma|fmod|frac|frexp|fwidth|GetRenderTargetSampleCount|GetRenderTargetSamplePosition|GlobalOrderedCountIncrement|GroupMemoryBarrier|GroupMemoryBarrierWithGroupSync|InterlockedAdd|InterlockedAnd|InterlockedCompareExchange|InterlockedCompareStore|InterlockedExchange|InterlockedMax|InterlockedMin|InterlockedOr|InterlockedXor|isfinite|isinf|isnan|ldexp|length|lerp|lit|log|log10|log2|mad|max|min|modf|msad4|mul|noise|normalize|pow|printf|Process2DQuadTessFactorsAvg|Process2DQuadTessFactorsMax|Process2DQuadTessFactorsMin|ProcessIsolineTessFactors|ProcessQuadTessFactorsAvg|ProcessQuadTessFactorsMax|ProcessQuadTessFactorsMin|ProcessTriTessFactorsAvg|ProcessTriTessFactorsMax|ProcessTriTessFactorsMin|QuadReadLaneAt|QuadSwapX|QuadSwapY|radians|rcp|reflect|refract|reversebits|round|rsqrt|saturate|sign|sin|sincos|sinh|smoothstep|sqrt|step|tan|tanh|tex1D|tex1D|tex1Dbias|tex1Dgrad|tex1Dlod|tex1Dproj|tex2D|tex2D|tex2Dbias|tex2Dgrad|tex2Dlod|tex2Dproj|tex3D|tex3D|tex3Dbias|tex3Dgrad|tex3Dlod|tex3Dproj|texCUBE|texCUBE|texCUBEbias|texCUBEgrad|texCUBElod|texCUBEproj|transpose|trunc|WaveAllBitAnd|WaveAllMax|WaveAllMin|WaveAllBitOr|WaveAllBitXor|WaveAllEqual|WaveAllProduct|WaveAllSum|WaveAllTrue|WaveAnyTrue|WaveBallot|WaveGetLaneCount|WaveGetLaneIndex|WaveGetOrderedIndex|WaveIsHelperLane|WaveOnce|WavePrefixProduct|WavePrefixSum|WaveReadFirstLane|WaveReadLaneAt)\b">
+        <token type="NameBuiltin"/>
+      </rule>
+      <rule pattern="\b(SV_ClipDistance|SV_ClipDistance0|SV_ClipDistance1|SV_Culldistance|SV_CullDistance0|SV_CullDistance1|SV_Coverage|SV_Depth|SV_DepthGreaterEqual|SV_DepthLessEqual|SV_DispatchThreadID|SV_DomainLocation|SV_GroupID|SV_GroupIndex|SV_GroupThreadID|SV_GSInstanceID|SV_InnerCoverage|SV_InsideTessFactor|SV_InstanceID|SV_IsFrontFace|SV_OutputControlPointID|SV_Position|SV_PrimitiveID|SV_RenderTargetArrayIndex|SV_SampleIndex|SV_StencilRef|SV_TessFactor|SV_VertexID|SV_ViewportArrayIndex)\b">
+        <token type="NameDecorator"/>
+      </rule>
+      <rule pattern="\bSV_Target[0-7]?\b">
+        <token type="NameDecorator"/>
+      </rule>
+      <rule pattern="\b(allow_uav_condition|branch|call|domain|earlydepthstencil|fastopt|flatten|forcecase|instance|loop|maxtessfactor|numthreads|outputcontrolpoints|outputtopology|partitioning|patchconstantfunc|unroll)\b">
+        <token type="NameDecorator"/>
+      </rule>
+      <rule pattern="[a-zA-Z_]\w*">
+        <token type="Name"/>
+      </rule>
+      <rule pattern="\\$">
+        <token type="CommentPreproc"/>
+      </rule>
+      <rule pattern="\s+">
+        <token type="Text"/>
+      </rule>
+    </state>
+    <state name="string">
+      <rule pattern="&quot;">
+        <token type="LiteralString"/>
+        <pop depth="1"/>
+      </rule>
+      <rule pattern="\\([\\abfnrtv&quot;\&#x27;]|x[a-fA-F0-9]{2,4}|u[a-fA-F0-9]{4}|U[a-fA-F0-9]{8}|[0-7]{1,3})">
+        <token type="LiteralStringEscape"/>
+      </rule>
+      <rule pattern="[^\\&quot;\n]+">
+        <token type="LiteralString"/>
+      </rule>
+      <rule pattern="\\\n">
+        <token type="LiteralString"/>
+      </rule>
+      <rule pattern="\\">
+        <token type="LiteralString"/>
+      </rule>
+    </state>
+  </rules>
+</lexer>
\ No newline at end of file
diff --git a/lexers/testdata/psl.actual b/lexers/testdata/psl.actual
new file mode 100644
index 000000000..e1ae42f7a
--- /dev/null
+++ b/lexers/testdata/psl.actual
@@ -0,0 +1,10 @@
+
+public void SumMethod() {
+
+    type public Number x
+    type String i = ""
+    for  set i = ^UTBL("test",i).order() quit:i.isNull()  {
+        set x = x + i
+    }
+
+    quit
\ No newline at end of file
diff --git a/lexers/testdata/psl.expected b/lexers/testdata/psl.expected
new file mode 100644
index 000000000..3c47f8609
--- /dev/null
+++ b/lexers/testdata/psl.expected
@@ -0,0 +1,70 @@
+[  
+  {"type":"KeywordDeclaration","value":"type"},
+  {"type":"Text","value":" "},
+  {"type":"KeywordDeclaration","value":"public"},
+  {"type":"Text","value":" "},
+  {"type":"NameFunction","value":"SumMethod"},
+  {"type":"Punctuation","value":"()"},
+  {"type":"Text","value":" "},
+  {"type":"Punctuation","value":"{"},
+  {"type":"Text","value":"\n"},
+
+  {"type":"Text","value":"\n    "},
+  {"type":"CommentSingle","value":"// this is a comment\n"},
+
+  {"type":"Text","value":"    "},
+  {"type":"KeywordDeclaration","value":"type"},
+  {"type":"Text","value":" "},
+  {"type":"KeywordDeclaration","value":"public"},
+  {"type":"Text","value":" "},
+  {"type":"TypeName","value":"Number"},
+  {"type":"Text","value":" "},
+  {"type":"VariableName","value":"x"},
+
+  {"type":"Text","value":"\n    "},
+  {"type":"KeywordDeclaration","value":"type"},
+  {"type":"Text","value":" "},
+  {"type":"KeywordDeclaration","value":"String"},
+  {"type":"Text","value":" "},
+  {"type":"Name","value":"i"},
+  {"type":"Text","value":" "},
+  {"type":"Operator","value":"="},
+  {"type":"Text","value":" "},
+  {"type":"LiteralString","value":"\"\""},
+
+  {"type":"Text","value":"\n    "},  
+  {"type":"Keyword","value":"for"},
+  {"type":"Text","value":"  "},
+  {"type":"Keyword","value":"set"},
+  {"type":"Text","value":" "},
+  {"type":"Name","value":"i"},
+  {"type":"Text","value":" "},
+  {"type":"Name","value":"^UTBL"},
+  {"type":"Punctuation","value":"("},
+  {"type":"LiteralString","value":"\"test\""},
+  {"type":"Punctuation","value":","},
+  {"type":"Name","value":"i"},
+  {"type":"Punctuation","value":")"},
+  {"type":"Operator","value":"."},
+  {"type":"NameFunction","value":"order"},
+  {"type":"Punctuation","value":"("},
+  {"type":"Punctuation","value":")"},
+  {"type":"Text","value":" "},
+  {"type":"Keyword","value":"quit"},
+  {"type":"Operator","value":":"},
+  {"type":"Name","value":"i"},
+  {"type":"Operator","value":"."},
+  {"type":"NameFunction","value":"isNull"},
+  {"type":"Punctuation","value":"("},
+  {"type":"Punctuation","value":")"},
+  {"type":"Text","value":"  "},
+  {"type":"Punctuation","value":"}"},
+  
+  {"type":"Text","value":"\n    "},
+  {"type":"Punctuation","value":"}"},
+
+  {"type":"Text","value":"\n"},
+
+  {"type":"Text","value":"\n    "},
+  {"type":"Keyword","value":"quit"}
+]
\ No newline at end of file

From f8f35dc050f5c37b9fd296255bb28bb3b4c2e351 Mon Sep 17 00:00:00 2001
From: Crystal Prieb <cjprieb@gmail.com>
Date: Tue, 18 Oct 2022 16:31:40 -0500
Subject: [PATCH 2/2] added PSL lexer logic

---
 lexers/embedded/psl.xml      | 106 ++++---
 lexers/testdata/psl.actual   |   9 +-
 lexers/testdata/psl.expected | 546 ++++++++++++++++++++++++++++++-----
 3 files changed, 546 insertions(+), 115 deletions(-)

diff --git a/lexers/embedded/psl.xml b/lexers/embedded/psl.xml
index 0cb9750d3..93b24d2e9 100644
--- a/lexers/embedded/psl.xml
+++ b/lexers/embedded/psl.xml
@@ -9,6 +9,7 @@
     <mime_type>text/x-psl</mime_type>
   </config>
   <rules>
+  <!-- NameFunction|TypeName -->
     <state name="root">
       <rule pattern="//.*$">
         <token type="CommentSingle"/>
@@ -16,70 +17,50 @@
       <rule pattern="/(\\\n)?[*](.|\n)*?[*](\\\n)?/">
         <token type="CommentMultiline"/>
       </rule>
-      <rule pattern="\+|-|\*|/|%|'?&lt;|'?&gt;|'?=|and|or|_|:|.">
-        <token type="Operator"/>
-      </rule>
-      <!-- <rule pattern="[?:]">
-        <token type="Operator"/>
-      </rule> -->
-      <rule pattern="\bdefined\b">
+      <rule pattern="\+|-|\*|/|%|'?&lt;|'?&gt;|'?=|\band\b|\bor\b|_|:">
         <token type="Operator"/>
       </rule>
       <rule pattern="[{}(),\[\]]">
         <token type="Punctuation"/>
       </rule>
-      <rule pattern="[+-]?\d*\.\d+([eE][-+]?\d+)?f?">
-        <token type="LiteralNumberFloat"/>
-      </rule>
-      <rule pattern="[+-]?\d+\.\d*([eE][-+]?\d+)?f?">
-        <token type="LiteralNumberFloat"/>
-      </rule>
-      <rule pattern="0[xX][0-9a-fA-F]*">
-        <token type="LiteralNumberHex"/>
-      </rule>
-      <rule pattern="0[0-7]*">
-        <token type="LiteralNumberOct"/>
-      </rule>
-      <rule pattern="[1-9][0-9]*">
-        <token type="LiteralNumberInteger"/>
+      <rule pattern="[+-]?\d*\.\d+">
+        <token type="LiteralNumber"/>
       </rule>
       <rule pattern="&quot;">
         <token type="LiteralString"/>
         <push state="string"/>
       </rule>
-      <rule pattern="\b(asm|asm_fragment|break|case|cbuffer|centroid|class|column_major|compile|compile_fragment|const|continue|default|discard|do|else|export|extern|for|fxgroup|globallycoherent|groupshared|if|in|inline|inout|interface|line|lineadj|linear|namespace|nointerpolation|noperspective|NULL|out|packoffset|pass|pixelfragment|point|precise|return|register|row_major|sample|sampler|shared|stateblock|stateblock_state|static|struct|switch|tbuffer|technique|technique10|technique11|texture|typedef|triangle|triangleadj|uniform|vertexfragment|volatile|while)\b">
-        <token type="Keyword"/>
+      <rule pattern="\.">
+        <token type="Operator"/>
+        <push state="method"/>
       </rule>
-      <rule pattern="\b(true|false)\b">
-        <token type="KeywordConstant"/>
+      <rule pattern="\$\$">
+        <token type="NameFunction"/>
+        <push state="method"/>
       </rule>
-      <rule pattern="\b(auto|catch|char|const_cast|delete|dynamic_cast|enum|explicit|friend|goto|long|mutable|new|operator|private|protected|public|reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try|typename|union|unsigned|using|virtual)\b">
+      <rule pattern="\bdo\b">
         <token type="KeywordReserved"/>
+        <push state="callmethod"/>
       </rule>
-      <rule pattern="\b(dword|matrix|snorm|string|unorm|unsigned|void|vector|BlendState|Buffer|ByteAddressBuffer|ComputeShader|DepthStencilState|DepthStencilView|DomainShader|GeometryShader|HullShader|InputPatch|LineStream|OutputPatch|PixelShader|PointStream|RasterizerState|RenderTargetView|RasterizerOrderedBuffer|RasterizerOrderedByteAddressBuffer|RasterizerOrderedStructuredBuffer|RasterizerOrderedTexture1D|RasterizerOrderedTexture1DArray|RasterizerOrderedTexture2D|RasterizerOrderedTexture2DArray|RasterizerOrderedTexture3D|RWBuffer|RWByteAddressBuffer|RWStructuredBuffer|RWTexture1D|RWTexture1DArray|RWTexture2D|RWTexture2DArray|RWTexture3D|SamplerState|SamplerComparisonState|StructuredBuffer|Texture1D|Texture1DArray|Texture2D|Texture2DArray|Texture2DMS|Texture2DMSArray|Texture3D|TextureCube|TextureCubeArray|TriangleStream|VertexShader)\b">
-        <token type="KeywordType"/>
-      </rule>
-      <rule pattern="\b(bool|double|float|int|half|min16float|min10float|min16int|min12int|min16uint|uint)([1-4](x[1-4])?)?\b">
-        <token type="KeywordType"/>
+      <rule pattern="\b(do|set|if|for|while|quit|catch|return|while)\b">
+        <token type="Keyword"/>
       </rule>
-      <rule pattern="\b(abort|abs|acos|all|AllMemoryBarrier|AllMemoryBarrierWithGroupSync|any|AppendStructuredBuffer|asdouble|asfloat|asin|asint|asuint|asuint|atan|atan2|ceil|CheckAccessFullyMapped|clamp|clip|CompileShader|ConsumeStructuredBuffer|cos|cosh|countbits|cross|D3DCOLORtoUBYTE4|ddx|ddx_coarse|ddx_fine|ddy|ddy_coarse|ddy_fine|degrees|determinant|DeviceMemoryBarrier|DeviceMemoryBarrierWithGroupSync|distance|dot|dst|errorf|EvaluateAttributeAtCentroid|EvaluateAttributeAtSample|EvaluateAttributeSnapped|exp|exp2|f16tof32|f32tof16|faceforward|firstbithigh|firstbitlow|floor|fma|fmod|frac|frexp|fwidth|GetRenderTargetSampleCount|GetRenderTargetSamplePosition|GlobalOrderedCountIncrement|GroupMemoryBarrier|GroupMemoryBarrierWithGroupSync|InterlockedAdd|InterlockedAnd|InterlockedCompareExchange|InterlockedCompareStore|InterlockedExchange|InterlockedMax|InterlockedMin|InterlockedOr|InterlockedXor|isfinite|isinf|isnan|ldexp|length|lerp|lit|log|log10|log2|mad|max|min|modf|msad4|mul|noise|normalize|pow|printf|Process2DQuadTessFactorsAvg|Process2DQuadTessFactorsMax|Process2DQuadTessFactorsMin|ProcessIsolineTessFactors|ProcessQuadTessFactorsAvg|ProcessQuadTessFactorsMax|ProcessQuadTessFactorsMin|ProcessTriTessFactorsAvg|ProcessTriTessFactorsMax|ProcessTriTessFactorsMin|QuadReadLaneAt|QuadSwapX|QuadSwapY|radians|rcp|reflect|refract|reversebits|round|rsqrt|saturate|sign|sin|sincos|sinh|smoothstep|sqrt|step|tan|tanh|tex1D|tex1D|tex1Dbias|tex1Dgrad|tex1Dlod|tex1Dproj|tex2D|tex2D|tex2Dbias|tex2Dgrad|tex2Dlod|tex2Dproj|tex3D|tex3D|tex3Dbias|tex3Dgrad|tex3Dlod|tex3Dproj|texCUBE|texCUBE|texCUBEbias|texCUBEgrad|texCUBElod|texCUBEproj|transpose|trunc|WaveAllBitAnd|WaveAllMax|WaveAllMin|WaveAllBitOr|WaveAllBitXor|WaveAllEqual|WaveAllProduct|WaveAllSum|WaveAllTrue|WaveAnyTrue|WaveBallot|WaveGetLaneCount|WaveGetLaneIndex|WaveGetOrderedIndex|WaveIsHelperLane|WaveOnce|WavePrefixProduct|WavePrefixSum|WaveReadFirstLane|WaveReadLaneAt)\b">
-        <token type="NameBuiltin"/>
+      <rule pattern="\b(true|false)\b">
+        <token type="KeywordConstant"/>
       </rule>
-      <rule pattern="\b(SV_ClipDistance|SV_ClipDistance0|SV_ClipDistance1|SV_Culldistance|SV_CullDistance0|SV_CullDistance1|SV_Coverage|SV_Depth|SV_DepthGreaterEqual|SV_DepthLessEqual|SV_DispatchThreadID|SV_DomainLocation|SV_GroupID|SV_GroupIndex|SV_GroupThreadID|SV_GSInstanceID|SV_InnerCoverage|SV_InsideTessFactor|SV_InstanceID|SV_IsFrontFace|SV_OutputControlPointID|SV_Position|SV_PrimitiveID|SV_RenderTargetArrayIndex|SV_SampleIndex|SV_StencilRef|SV_TessFactor|SV_VertexID|SV_ViewportArrayIndex)\b">
-        <token type="NameDecorator"/>
+      <rule pattern="\btype\b">
+        <token type="KeywordDeclaration"/>
+        <push state="typename"/>
       </rule>
-      <rule pattern="\bSV_Target[0-7]?\b">
-        <token type="NameDecorator"/>
+      <rule pattern="\b(public|req|private|void)\b">
+        <token type="KeywordDeclaration"/>
       </rule>
-      <rule pattern="\b(allow_uav_condition|branch|call|domain|earlydepthstencil|fastopt|flatten|forcecase|instance|loop|maxtessfactor|numthreads|outputcontrolpoints|outputtopology|partitioning|patchconstantfunc|unroll)\b">
-        <token type="NameDecorator"/>
+      <rule pattern="\b(Boolean|String|Number|Date)\b">
+        <token type="KeywordType"/>
       </rule>
-      <rule pattern="[a-zA-Z_]\w*">
+      <rule pattern="\^?[a-zA-Z][a-zA-Z0-9]*">
         <token type="Name"/>
       </rule>
-      <rule pattern="\\$">
-        <token type="CommentPreproc"/>
-      </rule>
       <rule pattern="\s+">
         <token type="Text"/>
       </rule>
@@ -102,5 +83,44 @@
         <token type="LiteralString"/>
       </rule>
     </state>
+    <state name="method">
+      <rule pattern="\(">
+        <token type="Punctuation"/>
+        <pop depth="1"/>
+      </rule>
+      <rule pattern="\^[a-zA-Z][a-zA-Z0-9]*">
+        <token type="NameClass"/>
+      </rule>
+      <rule pattern="[a-zA-Z][a-zA-Z0-9]*">
+        <token type="NameFunction"/>
+      </rule>
+    </state>
+    <state name="callmethod">
+      <rule pattern="\(|{">
+        <token type="Punctuation"/>
+        <pop depth="1"/>
+      </rule>
+      <rule pattern="\^[a-zA-Z][a-zA-Z0-9]*">
+        <token type="NameClass"/>
+      </rule>
+      <rule pattern="[a-zA-Z][a-zA-Z0-9]*">
+        <token type="NameFunction"/>
+      </rule>
+      <rule pattern="\s+">
+        <token type="Text"/>
+      </rule>
+    </state>
+    <state name="typename">
+      <rule pattern="\s+">
+        <token type="Text"/>
+      </rule>
+      <rule pattern="\b(public|req|private|void)\b">
+        <token type="KeywordDeclaration"/>
+      </rule>
+      <rule pattern="[a-zA-Z][a-zA-Z0-9]*">
+        <token type="NameClass"/>
+        <pop depth="1"/>
+      </rule>
+    </state>
   </rules>
 </lexer>
\ No newline at end of file
diff --git a/lexers/testdata/psl.actual b/lexers/testdata/psl.actual
index e1ae42f7a..9d948f735 100644
--- a/lexers/testdata/psl.actual
+++ b/lexers/testdata/psl.actual
@@ -1,10 +1,13 @@
-
-public void SumMethod() {
-
+public Number SumMethod() {
+    // this is a comment
     type public Number x
+    set x = 10.0
+    type String thisIsAString = "this"_x_"conjoined"
     type String i = ""
     for  set i = ^UTBL("test",i).order() quit:i.isNull()  {
         set x = x + i
     }
+    set x = x + $$getMore^ProcedureName("AAA")
+    do finishTask(x, "AAA")
 
     quit
\ No newline at end of file
diff --git a/lexers/testdata/psl.expected b/lexers/testdata/psl.expected
index 3c47f8609..7e84b5c20 100644
--- a/lexers/testdata/psl.expected
+++ b/lexers/testdata/psl.expected
@@ -1,70 +1,478 @@
-[  
-  {"type":"KeywordDeclaration","value":"type"},
-  {"type":"Text","value":" "},
-  {"type":"KeywordDeclaration","value":"public"},
-  {"type":"Text","value":" "},
-  {"type":"NameFunction","value":"SumMethod"},
-  {"type":"Punctuation","value":"()"},
-  {"type":"Text","value":" "},
-  {"type":"Punctuation","value":"{"},
-  {"type":"Text","value":"\n"},
-
-  {"type":"Text","value":"\n    "},
-  {"type":"CommentSingle","value":"// this is a comment\n"},
-
-  {"type":"Text","value":"    "},
-  {"type":"KeywordDeclaration","value":"type"},
-  {"type":"Text","value":" "},
-  {"type":"KeywordDeclaration","value":"public"},
-  {"type":"Text","value":" "},
-  {"type":"TypeName","value":"Number"},
-  {"type":"Text","value":" "},
-  {"type":"VariableName","value":"x"},
-
-  {"type":"Text","value":"\n    "},
-  {"type":"KeywordDeclaration","value":"type"},
-  {"type":"Text","value":" "},
-  {"type":"KeywordDeclaration","value":"String"},
-  {"type":"Text","value":" "},
-  {"type":"Name","value":"i"},
-  {"type":"Text","value":" "},
-  {"type":"Operator","value":"="},
-  {"type":"Text","value":" "},
-  {"type":"LiteralString","value":"\"\""},
-
-  {"type":"Text","value":"\n    "},  
-  {"type":"Keyword","value":"for"},
-  {"type":"Text","value":"  "},
-  {"type":"Keyword","value":"set"},
-  {"type":"Text","value":" "},
-  {"type":"Name","value":"i"},
-  {"type":"Text","value":" "},
-  {"type":"Name","value":"^UTBL"},
-  {"type":"Punctuation","value":"("},
-  {"type":"LiteralString","value":"\"test\""},
-  {"type":"Punctuation","value":","},
-  {"type":"Name","value":"i"},
-  {"type":"Punctuation","value":")"},
-  {"type":"Operator","value":"."},
-  {"type":"NameFunction","value":"order"},
-  {"type":"Punctuation","value":"("},
-  {"type":"Punctuation","value":")"},
-  {"type":"Text","value":" "},
-  {"type":"Keyword","value":"quit"},
-  {"type":"Operator","value":":"},
-  {"type":"Name","value":"i"},
-  {"type":"Operator","value":"."},
-  {"type":"NameFunction","value":"isNull"},
-  {"type":"Punctuation","value":"("},
-  {"type":"Punctuation","value":")"},
-  {"type":"Text","value":"  "},
-  {"type":"Punctuation","value":"}"},
-  
-  {"type":"Text","value":"\n    "},
-  {"type":"Punctuation","value":"}"},
-
-  {"type":"Text","value":"\n"},
-
-  {"type":"Text","value":"\n    "},
-  {"type":"Keyword","value":"quit"}
+[
+  {
+    "type": "KeywordDeclaration",
+    "value": "public"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "KeywordType",
+    "value": "Number"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "SumMethod"
+   },
+   {
+    "type": "Punctuation",
+    "value": "()"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Punctuation",
+    "value": "{"
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "CommentSingle",
+    "value": "// this is a comment"
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "KeywordDeclaration",
+    "value": "type"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "KeywordDeclaration",
+    "value": "public"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "NameClass",
+    "value": "Number"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "x"
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "Keyword",
+    "value": "set"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "x"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Operator",
+    "value": "="
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "LiteralNumber",
+    "value": "10.0"
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "KeywordDeclaration",
+    "value": "type"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "NameClass",
+    "value": "String"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "thisIsAString"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Operator",
+    "value": "="
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "LiteralString",
+    "value": "\"this\""
+   },
+   {
+    "type": "Operator",
+    "value": "_"
+   },
+   {
+    "type": "Name",
+    "value": "x"
+   },
+   {
+    "type": "Operator",
+    "value": "_"
+   },
+   {
+    "type": "LiteralString",
+    "value": "\"conjoined\""
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "KeywordDeclaration",
+    "value": "type"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "NameClass",
+    "value": "String"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "i"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Operator",
+    "value": "="
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "LiteralString",
+    "value": "\"\""
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "Keyword",
+    "value": "for"
+   },
+   {
+    "type": "Text",
+    "value": "  "
+   },
+   {
+    "type": "Keyword",
+    "value": "set"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "i"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Operator",
+    "value": "="
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "^UTBL"
+   },
+   {
+    "type": "Punctuation",
+    "value": "("
+   },
+   {
+    "type": "LiteralString",
+    "value": "\"test\""
+   },
+   {
+    "type": "Punctuation",
+    "value": ","
+   },
+   {
+    "type": "Name",
+    "value": "i"
+   },
+   {
+    "type": "Punctuation",
+    "value": ")"
+   },
+   {
+    "type": "Operator",
+    "value": "."
+   },
+   {
+    "type": "NameFunction",
+    "value": "order"
+   },
+   {
+    "type": "Punctuation",
+    "value": "()"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Keyword",
+    "value": "quit"
+   },
+   {
+    "type": "Operator",
+    "value": ":"
+   },
+   {
+    "type": "Name",
+    "value": "i"
+   },
+   {
+    "type": "Operator",
+    "value": "."
+   },
+   {
+    "type": "NameFunction",
+    "value": "isNull"
+   },
+   {
+    "type": "Punctuation",
+    "value": "()"
+   },
+   {
+    "type": "Text",
+    "value": "  "
+   },
+   {
+    "type": "Punctuation",
+    "value": "{"
+   },
+   {
+    "type": "Text",
+    "value": "\n        "
+   },
+   {
+    "type": "Keyword",
+    "value": "set"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "x"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Operator",
+    "value": "="
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "x"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Operator",
+    "value": "+"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "i"
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "Punctuation",
+    "value": "}"
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "Keyword",
+    "value": "set"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "x"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Operator",
+    "value": "="
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Name",
+    "value": "x"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "Operator",
+    "value": "+"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "NameFunction",
+    "value": "$$getMore"
+   },
+   {
+    "type": "NameClass",
+    "value": "^ProcedureName"
+   },
+   {
+    "type": "Punctuation",
+    "value": "("
+   },
+   {
+    "type": "LiteralString",
+    "value": "\"AAA\""
+   },
+   {
+    "type": "Punctuation",
+    "value": ")"
+   },
+   {
+    "type": "Text",
+    "value": "\n    "
+   },
+   {
+    "type": "KeywordReserved",
+    "value": "do"
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "NameFunction",
+    "value": "finishTask"
+   },
+   {
+    "type": "Punctuation",
+    "value": "("
+   },
+   {
+    "type": "Name",
+    "value": "x"
+   },
+   {
+    "type": "Punctuation",
+    "value": ","
+   },
+   {
+    "type": "Text",
+    "value": " "
+   },
+   {
+    "type": "LiteralString",
+    "value": "\"AAA\""
+   },
+   {
+    "type": "Punctuation",
+    "value": ")"
+   },
+   {
+    "type": "Text",
+    "value": "\n\n    "
+   },
+   {
+    "type": "Keyword",
+    "value": "quit"
+   }
 ]
\ No newline at end of file