Changeset b1e63ac5 for tools/cfa.nanorc

Timestamp:

Jul 4, 2017, 9:40:16 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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:

Merge branch 'master' into references

File:

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

tools/cfa.nanorc

@@ -2 +2 @@
 ## WIP
 
-syntax "cfa" "\.cfa$"
-## No magic
+syntax "cfa" "\.cfa"
 
 # Macros
@@ -12 +11 @@
 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 "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
+color green "\<((s?size)|one|zero|((u_?)?int(8|16|32|64|ptr)))_t\>"
 
 # Declarations
@@ -19 +18 @@
 # Control Flow Structures
 color brightyellow "\<(if|else|while|do|for|switch|choose|case|default)\>"
-##color brightyellow "\<(try|catch|catchResume|finally)\>"
+color brightyellow "\<(try|catch|catchResume|finally)\>"
 
 # Control Flow Statements
-color magenta "\<(return|break|continue|fallthru|throw)\>"
+color magenta "\<(return|break|continue|fallthru|throw|throwResume)\>"
 
 # Operator Names
@@ -33 +32 @@
 ## Update/Redistribute
 # GCC builtins
-##color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+color cyan "__attribute__[[:space:]]*\(\([^()]*(\([^()]*\)[^()]*)*\)\)"
+##color cyan "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
 
 # Preprocesser Directives
@@ -39 +39 @@
 
 # Values
+# Booleans
+color blue "\<(true|false)\>"
 # Characters
 color brightmagenta "'([^'\]|(\\")|(\\['abfnrtv\\]))'"
 color brightmagenta "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 # Strings and Angle Strings
-color brightyellow ""([^"]|\\")*"" "<[^[:blank:]=]*>"
+color yellow ""([^"]|\\")*"" "<[^[:blank:]=]*>"
 # Multiline Strings: This regex is VERY expencive and often too strong.
 ###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""