Hacks to bypass reserved cpp keywords in enumerated values. -- only affects cpp, not cli
Merge remote-tracking branch 'upstream/lex' into nvp
updated syntax.h from upstream