Changeset ec71a50 for tools/cfa.nanorc

Timestamp:

Sep 21, 2018, 11:26:31 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

3b1825b, fcc57ba

Parents:

031a88a9 (diff), 371ef1d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicit

File:

• tools/cfa.nanorc (modified) (3 diffs)

tools/cfa.nanorc

@@ -2 +2 @@
 ## WIP
 
-syntax "cfa" "\.cfa"
+syntax "cfa" "\.(c|h)fa"
 
 # Macros
@@ -9 +9 @@
 # Types
 color green "\<(forall|trait|(o|d|f|t)type|mutex|_Bool|volatile|virtual)\>"
-color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto)\>"
-color green "\<(static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<(float|double|bool|char|int|short|long|enum|void|auto)\>"
+color green "\<(static|const|extern|(un)?signed|inline)\>" "\<(sizeof)\>"
 color green "\<((s?size)|one|zero|((u_?)?int(8|16|32|64|ptr)))_t\>"
 
@@ -19 +19 @@
 # Control Flow Structures
 color brightyellow "\<(if|else|while|do|for|switch|choose|case|default)\>"
+color brightyellow "\<(disable|enable|waitfor|when|timeout)\>"
 color brightyellow "\<(try|catch(Resume)?|finally)\>"
 
 # Control Flow Statements
 color magenta "\<(goto|return|break|continue|fallthr(u|ough)|throw(Resume)?)\>"
+
+# Escaped Keywords, now Identifiers.
+color white "`\w+`"
 
 # Operator Names