Fixed syntax for Issues #1,#2

Author: mikecentola

syntaxes/gcode.tmLanguage.json

@@ -5,9 +5,6 @@
         {
             "include": "#comments"
         },
-        {
-            "include": "#keywords"
-        },
         {
             "include": "#speedsfeeds"
         },
@@ -25,6 +22,12 @@
         },
         {
             "include": "#macrovars"
+        },
+        {
+            "include": "#keywords"
+        },
+        {
+            "include": "#operators"
         }
     ],
     "repository": {
@@ -60,16 +63,28 @@
                     "name": "string.gcode"
                 },
                 {
-                    "match": "(GOTO)|(IF)|(EQ)|(NE)|(LT)|(GT)",
+                    "match": "(GOTO)|(IF)|(EQ)|(NE)|(LT)|(GT)|(LE)|(GE)|(DO)|(WHILE)|(END)|(AND)|(OR)|(XOR)",
                     "name": "keyword.control.gcode"
                 }
             ]
         },
         "operators": {
             "patterns": [
                 {
-                    "match": "(SIN)|(COS)|(TAN)",
+                    "match": "(SIN)|(COS)|(TAN)|(ASIN)|(ACOS)|(ATAN)|(LN)|(SQRT)|(MOD)|(EXP)",
                     "name": "support.constant.math.gcode"
+                },
+                {
+                    "match": "(FIX)|(FUP)|(ROUND)|(ABS)",
+                    "name": "support.constant.math.gcode"
+                },
+                {
+                    "match": "(\\+)|(\\*)|(\\/)|(\\*\\*)",
+                    "name": "support.constant.math.gcode"
+                },
+                {
+                    "match": "(\\-)",
+                    "name": "invalid.gcode"
                 }
             ]
         },