Add the switch statement to AWK Mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f338462b2be27036901ae4a530073b9fd1229604..cf042ec6c82613e5272c6da9166b9872e39ca4f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,15 @@
 2011-12-13  Alan Mackenzie  <acm@muc.de>
 
+       Add the switch statement to AWK Mode.
+
+       * progmodes/cc-awk (awk-font-lock-keywords): Add "switch", "case",
+       "default" to the keywords regexp.
+
+       * progmodes/cc-langs (c-label-kwds): Let AWK take the same
+       expression as the rest.
+       (c-nonlabel-token-key): Allow string literals for AWK.  Refactor
+       for the other modes.
+
        Large brace-block initialisation makes CC Mode slow: Fix.
        Tidy up and accelerate c-in-literal, etc. by using the
        c-parse-state

diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index f44b34ac35161f684261e0341490f42718ff85ab..ef67a18d807bd6f17862ca11c838f845dfe26f45 100644 (file)
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -894,9 +894,9 @@ std\\(err\\|in\\|out\\)\\|user\\)\\)\\>\
      ;; Keywords.
      (concat "\\<"
             (regexp-opt
-             '("BEGIN" "END" "break" "continue" "delete" "do" "else"
-               "exit" "for" "getline" "if" "in" "next" "nextfile"
-               "return" "while")
+             '("BEGIN" "END" "break" "case" "continue" "default" "delete"
+               "do" "else" "exit" "for" "getline" "if" "in" "next"
+               "nextfile" "return" "switch" "while")
              t) "\\>")
 
      ;; Builtins.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 0bfca84cd96011ecae14a959a79464e82dc9b872..96f0887eec0505d4811638609b79a270148a444f 100644 (file)
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2242,8 +2242,7 @@ This construct is \"<keyword> <expression> :\"."
 
 (c-lang-defconst c-label-kwds
   "Keywords introducing colon terminated labels in blocks."
-  t '("case" "default")
-  awk nil)
+  t '("case" "default"))
 
 (c-lang-defconst c-label-kwds-regexp
   ;; Adorned regexp matching any keyword that introduces a label.
@@ -2998,18 +2997,19 @@ neither in a statement nor in a declaration context.  The regexp is
 tested at the beginning of every sexp in a suspected label,
 i.e. before \":\".  Only used if `c-recognize-colon-labels' is set."
   t (concat
-     ;; Don't allow string literals.
-     "\"\\|"
      ;; All keywords except `c-label-kwds' and `c-protection-kwds'.
      (c-make-keywords-re t
        (set-difference (c-lang-const c-keywords)
                       (append (c-lang-const c-label-kwds)
                               (c-lang-const c-protection-kwds))
                       :test 'string-equal)))
+  ;; Don't allow string literals, except in AWK.  Character constants are OK.
+  (c objc java pike idl) (concat "\"\\|"
+                                (c-lang-const c-nonlabel-token-key))
   ;; Also check for open parens in C++, to catch member init lists in
   ;; constructors.  We normally allow it so that macros with arguments
   ;; work in labels.
-  c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key)))
+  c++ (concat "\\s\(\\|\"\\|" (c-lang-const c-nonlabel-token-key)))
 (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key))
 
 (c-lang-defconst c-nonlabel-token-2-key