[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-awk.el

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-awk.el
diff -c emacs/lisp/progmodes/cc-awk.el:1.2 emacs/lisp/progmodes/cc-awk.el:1.3
*** emacs/lisp/progmodes/cc-awk.el:1.2  Mon Sep  1 15:45:34 2003
--- emacs/lisp/progmodes/cc-awk.el      Mon May 23 00:03:59 2005
***************
*** 2,8 ****
  
  ;; Copyright (C) 1988,94,96,2000,01,02,03  Free Software Foundation, Inc.
  
! ;; Author: Alan Mackenzie (originally based on awk-mode.el)
  ;; Maintainer: FSF
  ;; Keywords: AWK, cc-mode, unix, languages
  
--- 2,8 ----
  
  ;; Copyright (C) 1988,94,96,2000,01,02,03  Free Software Foundation, Inc.
  
! ;; Author: Alan Mackenzie <address@hidden> (originally based on awk-mode.el)
  ;; Maintainer: FSF
  ;; Keywords: AWK, cc-mode, unix, languages
  
***************
*** 526,538 ****
  ;;   Matches any AWK regexp character which doesn't require special analysis.
  (defconst c-awk-escaped-newlines*-re "\\(\\\\[\n\r]\\)*")
  ;;   Matches a (possibly empty) sequence of escaped newlines.
  (defconst c-awk-regexp-char-class-re
    (concat "\\[" c-awk-escaped-newlines*-re "^?" c-awk-escaped-newlines*-re 
"]?"
!           "\\(" c-awk-esc-pair-re "\\|" "[^]\n\r]" "\\)*" "\\(]\\|$\\)"))
! ;;   Matches a regexp char class, up to (but not including) EOL if the ] is
  ;;   missing.
  (defconst c-awk-regexp-innards-re
!   (concat "\\(" c-awk-esc-pair-re "\\|" c-awk-regexp-char-class-re
            "\\|" c-awk-regexp-normal-re "\\)*"))
  ;;   Matches the inside of an AWK regexp (i.e. without the enclosing /s)
  (defconst c-awk-regexp-without-end-re
--- 526,547 ----
  ;;   Matches any AWK regexp character which doesn't require special analysis.
  (defconst c-awk-escaped-newlines*-re "\\(\\\\[\n\r]\\)*")
  ;;   Matches a (possibly empty) sequence of escaped newlines.
+ 
+ ;; NOTE: In what follows, "[asdf]" in a regexp will be called a "character
+ ;; list", and "[:alpha:]" inside a character list will be known as a
+ ;; "character class".  These terms for these things vary between regexp
+ ;; descriptions .
  (defconst c-awk-regexp-char-class-re
+   "\\[:[a-z]+:\\]")
+   ;; Matches a character class spec (e.g. [:alpha:]).
+ (defconst c-awk-regexp-char-list-re
    (concat "\\[" c-awk-escaped-newlines*-re "^?" c-awk-escaped-newlines*-re 
"]?"
!           "\\(" c-awk-esc-pair-re "\\|" c-awk-regexp-char-class-re
!         "\\|" "[^]\n\r]" "\\)*" "\\(]\\|$\\)"))
! ;;   Matches a regexp char list, up to (but not including) EOL if the ] is
  ;;   missing.
  (defconst c-awk-regexp-innards-re
!   (concat "\\(" c-awk-esc-pair-re "\\|" c-awk-regexp-char-list-re
            "\\|" c-awk-regexp-normal-re "\\)*"))
  ;;   Matches the inside of an AWK regexp (i.e. without the enclosing /s)
  (defconst c-awk-regexp-without-end-re
***************
*** 549,555 ****
  ;;   A "neutral" char(pair).  Doesn't change the "state" of a subsequent /.
  ;; This is space/tab, braces, an auto-increment/decrement operator or an
  ;; escaped character.  Or one of the (illegal) characters @ or `.  But NOT an
! ;; end of line (even if escpaed).
  (defconst c-awk-neutrals*-re
    (concat "\\(" c-awk-neutral-re "\\)*"))
  ;;   A (possibly empty) string of neutral characters (or character pairs).
--- 558,564 ----
  ;;   A "neutral" char(pair).  Doesn't change the "state" of a subsequent /.
  ;; This is space/tab, braces, an auto-increment/decrement operator or an
  ;; escaped character.  Or one of the (illegal) characters @ or `.  But NOT an
! ;; end of line (even if escaped).
  (defconst c-awk-neutrals*-re
    (concat "\\(" c-awk-neutral-re "\\)*"))
  ;;   A (possibly empty) string of neutral characters (or character pairs).