Refactor regex for syntax colorization

Author: mikecentola

syntaxes/gcode.tmLanguage.json

@@ -59,7 +59,7 @@
                     "name": "constant.numeric.gcode"
                 },
                 {
-                    "match": "[gG][0-9]{1,3}\\.?[0-9]?",
+                    "match": "[gG][0-9]{1,3}(\\.[0-9])?",
                     "name": "markup.bold.gcode"
                 },
                 {
@@ -100,83 +100,79 @@
         "speedsfeeds": {
             "patterns": [
                 {
-                    "match": "([sS])(?=-|\\d|\\[|#)-?(?:\\d+(?:\\.\\d*)?)?",
+                    "match": "([sS])(\\d+)?",
                     "name": "constant.language.gcode"
                 },
                 {
-                    "match": "([fF])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
-                    "name": "constant.language.gcode"
-                },
-                {
-                    "match": "([eE])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([eEfF])(\\d*\\.?\\d+\\.?)?",
                     "name": "constant.language.gcode"
                 }
             ]
         },
         "prognumbers": {
             "patterns": [
                 {
-                    "match": "[nN][0-9]+",
+                    "match": "([nN])(\\d+)?",
                     "name": "constant.numeric.gcode"
                 },
                 {
-                    "match": "[oO][0-9]{1,5}",
+                    "match": "([oO])(\\d+)?",
                     "name": "string.regexp.gcode"
                 },
                 {
-                    "match": "[pP][0-9]{0,5}",
+                    "match": "([pP])(\\d+)?",
                     "name": "string.regexp.gcode"
                 }
             ]
         },
         "coords": {
             "patterns": [
                 {
-                    "match": "([xX])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([xX])(\\-?\\d?\\.?\\d+\\.?)?",
                     "name": "string.gcode"
                 },
                 {
-                    "match": "([yY])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([yY])(\\-?\\d?\\.?\\d+\\.?)?",
                     "name": "string.gcode"
                 },
                 {
-                    "match": "([zZ])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([zZ])(\\-?\\d?\\.?\\d+\\.?)?",
                     "name": "invalid.gcode"
                 },
                 {
-                    "match": "([aAbBcC])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([aAbBcC])(\\-?\\d?\\.?\\d+\\.?)?",
                     "name": "constant.character.escape.gcode"
                 }
             ]
         },
         "tools": {
             "patterns": [
                 {
-                    "match": "([dD])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([dD])([0-9])*",
                     "name": "constant.character.gcode"
                 },
                 {
-                    "match": "([hH])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([hH])([0-9]*)",
                     "name": "constant.character.gcode"
                 },
                 {
-                    "match": "([tT])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([tT])([0-9]*)",
                     "name": "constant.character.gcode"
                 }
             ]
         },
         "modifiers": {
             "patterns": [
                 {
-                    "match": "([iIjJkK])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([iIjJkK])(\\-?\\d?\\.?\\d+\\.?)?",
                     "name": "constant.character.escape.gcode"
                 },
                 {
-                    "match": "([qQrR])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([qQrR])(\\-?\\d?\\.?\\d+\\.?)?",
                     "name": "support.constant.math.gcode"
                 },
                 {
-                    "match": "([uUwW])(?=-|\\d|\\[|#|\\.)-?(?:\\d+(?:\\.\\d*)|(?:\\.(?:\\d*))?)?",
+                    "match": "([uUwW])(\\-?\\d?\\.?\\d+\\.?)?",
                     "name": "support.constant.math.gcode"
                 }
             ]