Merge pull request #447 from samdmarshall/objective-c-syntax

[micro.git] / runtime / syntax / json.micro

diff --git a/runtime/syntax/json.micro b/runtime/syntax/json.micro
index 6515870a82f29082c288371616d83a8824e75fdc..3ef298e08c0972639c5e03a986b491e199036a7b 100644 (file)
--- a/runtime/syntax/json.micro
+++ b/runtime/syntax/json.micro
@@ -1,11 +1,13 @@
-syntax "JSON" "\.json$"
+syntax "json" "\.json$"
 header "^\{$"
 
-color blue   "\b[-]?[1-9][0-9]*([Ee][+-]?[0-9]+)?\b"  "\b[-]?[0](\.[0-9]+)?\b"
-color cyan  "\bnull\b"
-color brightcyan "\b(true|false)\b"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightyellow "\"(\\"|[^"])*\"[[:space:]]*:"  "'(\'|[^'])*'[[:space:]]*:"
-color magenta   "\\u[0-9a-fA-F]{4}|\\[bfnrt'"/\\]"
+color constant.number   "\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\b"
+color constant.number   "\b[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
+color constant.number   "\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
+color constant  "\b(null)\b"
+color constant "\b(true|false)\b"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color statement "\"(\\"|[^"])*\"[[:space:]]*:"  "'(\'|[^'])*'[[:space:]]*:"
+color constant   "\\u[0-9a-fA-F]{4}|\\[bfnrt'"/\\]"
 color ,green "[[:space:]]+$"
 color ,red "   + +| +  +"