Move guards to be support names.

Makes them *much* better-looking.
monte-language · Jun 18, 2016 · c4b5f97 · c4b5f97
1 parent 9275f98
commit c4b5f97
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/grammars/monte.cson b/grammars/monte.cson
@@ -60,20 +60,6 @@
     'match': '\\b(var)\\b'
     'name': 'storage.type.mutable.monte'
   }
-  # Guards. All guards have name storage.type.guard, since they are part of the
-  # type system.
-  {
-    'match': '\\b(Any|Bool|Bytes|Char|Double|Int|Str|Void)\\b'
-    'name': 'storage.type.guard.monte'
-  }
-  {
-    'match': '\\b(List|Map|NullOk|Pair|Same|Set|Vow)\\b'
-    'name': 'storage.type.guard.generic.monte'
-  }
-  {
-    'match': '\\b(DeepFrozen|Selfless|SubrangeGuard|Transparent)\\b'
-    'name': 'storage.type.guard.auditor.monte'
-  }
   # Identifiers.
   {
     'match': '::"[^"]+"'
@@ -206,6 +192,18 @@
     'match': 'trace(ln)?'
     'name': 'support.function.python'
   }
+  {
+    'match': '\\b(Any|Bool|Bytes|Char|Double|Int|Str|Void)\\b'
+    'name': 'support.type.guard.monte'
+  }
+  {
+    'match': '\\b(List|Map|NullOk|Pair|Same|Set|Vow)\\b'
+    'name': 'support.type.guard.generic.monte'
+  }
+  {
+    'match': '\\b(DeepFrozen|Selfless|SubrangeGuard|Transparent)\\b'
+    'name': 'support.type.guard.auditor.monte'
+  }
   # Magic names.
   {
     'match': '\\b(meta|super)\\b'