fix: four lexers push onto states that do not exist

Author: VXNCXNX

lexers/embedded/psl.xml

@@ -164,6 +164,11 @@
         <token type="CommentSingle"/>
       </rule>
     </state>
+    <state name="warn-directive">
+      <rule pattern=".+$">
+        <token type="CommentSingle"/>
+      </rule>
+    </state>
     <state name="classdef-directive">
       <rule pattern="\s+">
         <token type="Text"/>

lexers/embedded/sourcepawn.xml

@@ -31,8 +31,6 @@
       <rule pattern="(bool|float|void|int|char)\b"><token type="KeywordType"/></rule>
       <rule pattern="(true|false)\b"><token type="KeywordConstant"/></rule>
       <rule pattern="[a-zA-Z_]\w*"><token type="Name"/></rule>
-      <rule pattern="((?:[\w*\s])+?(?:\s|[*]))([a-zA-Z_]\w*)(\s*\([^;]*?\))([^;{]*)(\{)"><bygroups><usingself state="root"/><token type="NameFunction"/><usingself state="root"/><usingself state="root"/><token type="Punctuation"/></bygroups><push state="function"/></rule>
-      <rule pattern="((?:[\w*\s])+?(?:\s|[*]))([a-zA-Z_]\w*)(\s*\([^;]*?\))([^;]*)(;)"><bygroups><usingself state="root"/><token type="NameFunction"/><usingself state="root"/><usingself state="root"/><token type="Punctuation"/></bygroups></rule>
     </state>
     <state name="string">
       <rule pattern="&quot;"><token type="LiteralString"/><pop depth="1"/></rule>

lexers/embedded/spade.xml

@@ -20,6 +20,14 @@
         <pop depth="1"/>
       </rule>
     </state>
+    <state name="lifetime">
+      <rule pattern="[a-zA-Z_]+\w*">
+        <token type="NameAttribute"/>
+      </rule>
+      <rule>
+        <pop depth="1"/>
+      </rule>
+    </state>
     <state name="number_lit">
       <rule pattern="[ui]\d*">
         <token type="Keyword"/>

lexers/embedded/yang.xml

@@ -85,7 +85,7 @@
       </rule>
       <rule pattern="/\*">
         <token type="CommentMultiline"/>
-        <push state="comment"/>
+        <push/>
       </rule>
       <rule pattern="\*/">
         <token type="CommentMultiline"/>

lexers/testdata/psl.actual

@@ -16,4 +16,6 @@ public Number SumMethod() {
     set x = x + $$getMore^ProcedureName("AAA")
     do finishTask(x, "AAA")
 
-    quit
+    quit
+    #WARN unused variable
+    #INFO informational

lexers/testdata/psl.expected

@@ -148,5 +148,12 @@
   {"type":"LiteralString","value":"\"AAA\""},
   {"type":"Punctuation","value":")"},
   {"type":"Text","value":"\n\n    "},
-  {"type":"Keyword","value":"quit"}
+  {"type":"Keyword","value":"quit"},
+  {"type":"Text","value":"\n    "},
+  {"type":"KeywordPseudo","value":"#WARN"},
+  {"type":"CommentSingle","value":" unused variable"},
+  {"type":"Text","value":"\n    "},
+  {"type":"KeywordPseudo","value":"#INFO"},
+  {"type":"CommentSingle","value":" informational"},
+  {"type":"Text","value":"\n"}
 ]

lexers/testdata/spade.actual

@@ -184,3 +184,7 @@ fn named_args() {
 	call$(a, b: true)
 }
 
+
+type T {
+    x: 'a int,
+}

lexers/testdata/spade.expected

@@ -1085,5 +1085,20 @@
   {"type":"Punctuation","value":")"},
   {"type":"TextWhitespace","value":"\n"},
   {"type":"Punctuation","value":"}"},
-  {"type":"TextWhitespace","value":"\n\n"}
+  {"type":"TextWhitespace","value":"\n\n\n"},
+  {"type":"Name","value":"type"},
+  {"type":"TextWhitespace","value":" "},
+  {"type":"Name","value":"T"},
+  {"type":"TextWhitespace","value":" "},
+  {"type":"Punctuation","value":"{"},
+  {"type":"TextWhitespace","value":"\n    "},
+  {"type":"Name","value":"x"},
+  {"type":"Text","value":": "},
+  {"type":"NameAttribute","value":"'a"},
+  {"type":"Text","value":" "},
+  {"type":"KeywordType","value":"int"},
+  {"type":"Punctuation","value":","},
+  {"type":"TextWhitespace","value":"\n"},
+  {"type":"Punctuation","value":"}"},
+  {"type":"TextWhitespace","value":"\n"}
 ]

lexers/testdata/yang.actual

@@ -62,3 +62,5 @@ module server-system {
         }
     }
 }
+
+/* nested /* comment */ still comment */

lexers/testdata/yang.expected

@@ -216,5 +216,7 @@
   {"type":"Punctuation","value":"}"},
   {"type":"TextWhitespace","value":"\n"},
   {"type":"Punctuation","value":"}"},
+  {"type":"TextWhitespace","value":"\n\n"},
+  {"type":"CommentMultiline","value":"/* nested /* comment */ still comment */"},
   {"type":"TextWhitespace","value":"\n"}
 ]