From 165cecf85ad32d442837b72420567fb5161a580f Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 13 Jul 2013 16:34:40 +0100 Subject: [PATCH] el/dot-emacs.el: Mark some magic C constants separately. I've been highlighting built-in constants `null', `this', `true', and friends in other languages so let's do the same for C and C++. --- el/dot-emacs.el | 72 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/el/dot-emacs.el b/el/dot-emacs.el index e341b93..e8751ff 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -1197,7 +1197,6 @@ doesn't match any of the regular expressions in "explicit" ;C++ "export" ;C++ "extern" ;K&R, C89 - "false" ;C++, C9X macro "float" ;K&R, C89 "for" ;K&R, C89 ;; "fortran" ;K&R @@ -1229,9 +1228,7 @@ doesn't match any of the regular expressions in "struct" ;K&R, C89 "switch" ;K&R, C89 "template" ;C++ - "this" ;C++ "throw" ;C++ - "true" ;C++, C9X macro "try" ;C++ "this" ;C++ "typedef" ;C89 @@ -1266,6 +1263,11 @@ doesn't match any of the regular expressions in "__typeof__" ;GCC "__volatile__" ;GCC )) + (c-constants + (mdw-regexps "false" ;C++, C9X macro + "this" ;C++ + "true" ;C++, C9X macro + )) (preprocessor-keywords (mdw-regexps "assert" "define" "elif" "else" "endif" "error" "ident" "if" "ifdef" "ifndef" "import" "include" @@ -1297,6 +1299,9 @@ doesn't match any of the regular expressions in (list (concat "\\<\\(" c-keywords "\\)\\>") '(0 font-lock-keyword-face)) + (list (concat "\\<\\(" c-constants "\\)\\>") + '(0 font-lock-variable-name-face)) + ;; Handle numbers too. ;; ;; This looks strange, I know. It corresponds to the @@ -1401,11 +1406,11 @@ doesn't match any of the regular expressions in "for" "goto" "if" "implements" "import" "instanceof" "int" "interface" "long" "native" "new" "package" "private" "protected" "public" "return" "short" - "static" "super" "switch" "synchronized" "this" - "throw" "throws" "transient" "try" "void" "volatile" - "while" + "static" "switch" "synchronized" "throw" "throws" + "transient" "try" "void" "volatile" "while")) - "false" "null" "true"))) + (java-constants + (mdw-regexps "false" "null" "super" "this" "true"))) (setq font-lock-keywords (list @@ -1414,6 +1419,10 @@ doesn't match any of the regular expressions in (list (concat "\\<\\(" java-keywords "\\)\\>") '(0 font-lock-keyword-face)) + ;; Handle the magic constants defined above. + (list (concat "\\<\\(" java-constants "\\)\\>") + '(0 font-lock-variable-name-face)) + ;; Handle numbers too. ;; ;; The following isn't quite right, but it's close enough. @@ -1591,22 +1600,22 @@ doesn't match any of the regular expressions in ;; Now define things to be fontified. (make-local-variable 'font-lock-keywords) (let ((csharp-keywords - (mdw-regexps "abstract" "as" "base" "bool" "break" - "byte" "case" "catch" "char" "checked" - "class" "const" "continue" "decimal" "default" - "delegate" "do" "double" "else" "enum" - "event" "explicit" "extern" "false" "finally" - "fixed" "float" "for" "foreach" "goto" - "if" "implicit" "in" "int" "interface" - "internal" "is" "lock" "long" "namespace" - "new" "null" "object" "operator" "out" - "override" "params" "private" "protected" "public" - "readonly" "ref" "return" "sbyte" "sealed" - "short" "sizeof" "stackalloc" "static" "string" - "struct" "switch" "this" "throw" "true" - "try" "typeof" "uint" "ulong" "unchecked" - "unsafe" "ushort" "using" "virtual" "void" - "volatile" "while" "yield"))) + (mdw-regexps "abstract" "as" "bool" "break" "byte" "case" "catch" + "char" "checked" "class" "const" "continue" "decimal" + "default" "delegate" "do" "double" "else" "enum" + "event" "explicit" "extern" "finally" "fixed" "float" + "for" "foreach" "goto" "if" "implicit" "in" "int" + "interface" "internal" "is" "lock" "long" "namespace" + "new" "object" "operator" "out" "override" "params" + "private" "protected" "public" "readonly" "ref" + "return" "sbyte" "sealed" "short" "sizeof" + "stackalloc" "static" "string" "struct" "switch" + "throw" "try" "typeof" "uint" "ulong" "unchecked" + "unsafe" "ushort" "using" "virtual" "void" "volatile" + "while" "yield")) + + (csharp-constants + (mdw-regexps "base" "false" "null" "this" "true"))) (setq font-lock-keywords (list @@ -1615,6 +1624,10 @@ doesn't match any of the regular expressions in (list (concat "\\<\\(" csharp-keywords "\\)\\>") '(0 font-lock-keyword-face)) + ;; Handle the magic constants defined above. + (list (concat "\\<\\(" csharp-constants "\\)\\>") + '(0 font-lock-variable-name-face)) + ;; Handle numbers too. ;; ;; The following isn't quite right, but it's close enough. @@ -1654,12 +1667,12 @@ doesn't match any of the regular expressions in (let ((fsharp-keywords (mdw-regexps "abstract" "and" "as" "assert" "atomic" - "base" "begin" "break" + "begin" "break" "checked" "class" "component" "const" "constraint" "constructor" "continue" "default" "delegate" "do" "done" "downcast" "downto" "eager" "elif" "else" "end" "exception" "extern" - "false" "finally" "fixed" "for" "fori" "fun" "function" + "finally" "fixed" "for" "fori" "fun" "function" "functor" "global" "if" "in" "include" "inherit" "inline" "interface" @@ -1667,20 +1680,21 @@ doesn't match any of the regular expressions in "lazy" "let" "match" "measure" "member" "method" "mixin" "module" "mutable" - "namespace" "new" "null" - "object""of" "open" "or" "override" + "namespace" "new" + "object" "of" "open" "or" "override" "parallel" "params" "private" "process" "protected" "public" "pure" "rec" "recursive" "return" "sealed" "sig" "static" "struct" - "tailcall" "then" "to" "trait" "true" "try" "type" + "tailcall" "then" "to" "trait" "try" "type" "upcast" "use" "val" "virtual" "void" "volatile" "when" "while" "with" "yield")) (fsharp-builtins - (mdw-regexps "asr" "land" "lor" "lsl" "lsr" "lxor" "mod")) + (mdw-regexps "asr" "land" "lor" "lsl" "lsr" "lxor" "mod" + "base" "false" "null" "true")) (bang-keywords (mdw-regexps "do" "let" "return" "use" "yield")) -- 2.11.0