highlighting

subroutines now get highlighted correctly

Author: runxel

Syntaxes/GDL.YAML-tmLanguage

@@ -10,21 +10,22 @@ patterns:
 - match: (?i)\b(\!NOCONTOUR|BAS|BOX|CONT|FILLA|FILTER|GDLBIN|HIP_ROOFS|(LIN|NOD)(E)?|ORIGO|PARS|PAUSE|PLOTMAKER|PLOTTER|RECT_|SFLINE|TET(RA)?|TRI|UI_(CANCEL|OK)|VOCA|WALL_)\b
   name: invalid.deprecated.gdl
 
+# COMMENTS
 - begin: '!'
   end: $
   name: comment.line.gdl
 
-- match: ("(?:[^"\\]|\\.)*"|'(?:[^''\\]|\\.)*')
-  name: string.gdl
-
-# Subroutines like 100:
-- match: (?i)(?<=^)([0-9]*:)(?=$|\s)
+# Subroutines like 100:, "whatever":
+- match: (?i)(?<=^)(([0-9]*|("([^"\\]|\\.)*"|'([^''\\]|\\.)*')):)(?=$|\s)
   name: entity.name.function.gdl
 
 # get GOTOs and GOSUBs
-- match: (?i)(?<=GOSUB|GOTO)(\s+)([0-9]*)(?=$|\s|\+|\-|\*{1,2}|\^|\/)
+- match: (?i)(?<=GOSUB|GOTO)(\s+)([0-9]*|("([^"\\]|\\.)*"|'([^''\\]|\\.)*'))(?=$|\s|\+|\-|\*{1,2}|\^|\/)
   name: entity.name.function.gdl.jump
 
+- match: ("(?:[^"\\]|\\.)*"|'(?:[^''\\]|\\.)*')
+  name: string.gdl
+
 - match: (?i)(\+|\-|\^|\*{1,2}|\/|\=|<|>|<\=|>\=|<>|\#)|(?<=^|\s)(MOD|%|AND|&|OR|\||EXOR|\@)(?=$|\s|\()
   name: keyword.operator.gdl
 

Syntaxes/GDL.tmLanguage

@@ -27,21 +27,21 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>("(?:[^"\\]|\\.)*"|'(?:[^''\\]|\\.)*')</string>
+			<string>(?i)(?&lt;=^)(([0-9]*|("([^"\\]|\\.)*"|'([^''\\]|\\.)*')):)(?=$|\s)</string>
 			<key>name</key>
-			<string>string.gdl</string>
+			<string>entity.name.function.gdl</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?i)(?&lt;=^)([0-9]*:)(?=$|\s)</string>
+			<string>(?i)(?&lt;=GOSUB|GOTO)(\s+)([0-9]*|("([^"\\]|\\.)*"|'([^''\\]|\\.)*'))(?=$|\s|\+|\-|\*{1,2}|\^|\/)</string>
 			<key>name</key>
-			<string>entity.name.function.gdl</string>
+			<string>entity.name.function.gdl.jump</string>
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?i)(?&lt;=GOSUB|GOTO)(\s+)([0-9]*)(?=$|\s|\+|\-|\*{1,2}|\^|\/)</string>
+			<string>("(?:[^"\\]|\\.)*"|'(?:[^''\\]|\\.)*')</string>
 			<key>name</key>
-			<string>entity.name.function.gdl.jump</string>
+			<string>string.gdl</string>
 		</dict>
 		<dict>
 			<key>match</key>