CC Mode 5.28 (C++); imenu regexp fails to find some functions

[Andy . Ling]

For function definitions that look like :-

void myFunction
(
  int arg1,
  int arg2
)
{
}

The imenu regexp fails. the following changes to cc-menus.el seems to fix
it

> diff -c cc-menus.el cc-menus.el.orig
*** cc-menus.el Wed Mar 27 10:34:20 2002
--- cc-menus.el.orig    Wed Mar 27 10:32:52 2002
***************
*** 110,118 ****
         "[^()]*"                               ; no parentheses before
         "[^a-zA-Z0-9_:<>~]"                    ; match any non-identifier
char
         "\\([a-zA-Z_][a-zA-Z0-9_:<>~]*\\)"     ; match function name
!        "[ \t\n]*("                          ; see above, BUT
!        "[ \t\n]*\\([^ \t(*][^)]*\\)?)"          ; the arg list must not
start
!        "[ \t\n]*[^ \t;(]"                       ; with an asterisk or
parenthe
ses
         ) 1)
      ;; Special case for definitions using phony prototype macros like:
      ;; `int main _PROTO( (int argc,char *argv[]) )'.
--- 110,118 ----
         "[^()]*"                               ; no parentheses before
         "[^a-zA-Z0-9_:<>~]"                    ; match any non-identifier
char
         "\\([a-zA-Z_][a-zA-Z0-9_:<>~]*\\)"     ; match function name
!        "[ \t]*("                            ; see above, BUT
!        "[ \t]*\\([^ \t(*][^)]*\\)?)"          ; the arg list must not
start
!        "[ \t]*[^ \t;(]"                       ; with an asterisk or
parenthese
s
         ) 1)
      ;; Special case for definitions using phony prototype macros like:
      ;; `int main _PROTO( (int argc,char *argv[]) )'.


Regards

----------------------------------------------------------------
Andy Ling                         email: Andy.Ling@quantel.com
Quantel Ltd.                      Tel:   +44 (0)1635 48222
Turnpike Road, Newbury Berks UK. RG14 2NE
----------------------------------------------------------------

Emacs  : GNU Emacs 21.2.1 (i386-msvc-nt5.0.2195)
 of 2002-03-19 on buffy
Package: CC Mode 5.28 (C++)
Buffer Style: MyCstyle

c-emacs-features: (1-bit)

current state:
==============
(setq
 c-basic-offset 2
 c-comment-only-line-offset 0
 c-block-comment-prefix "* "
 c-comment-prefix-regexp '((pike-mode . "//+!?\\|\\**") (other .
"//+\\|\\**"))
 c-cleanup-list '(scope-operator defun-close-semi)
 c-hanging-braces-alist '((brace-list-open) (block-close .
c-snug-do-while))
 c-hanging-colons-alist '((case-label after) (label after))
 c-hanging-semi&comma-criteria '(c-semi&comma-inside-parenlist)
 c-backslash-column 48
 c-label-minimum-indentation 0
 c-offsets-alist '((string . c-lineup-dont-change)
                   (c . c-lineup-C-comments)
                   (defun-open . 0)
                   (defun-close . 0)
                   (defun-block-intro . +)
                   (class-open . 0)
                   (class-close . 0)
                   (inline-close . 0)
                   (func-decl-cont . +)
                   (knr-argdecl . 0)
                   (topmost-intro . 0)
                   (topmost-intro-cont . 0)
                   (member-init-intro . +)
                   (member-init-cont . c-lineup-multi-inher)
                   (inher-intro . +)
                   (inher-cont . c-lineup-multi-inher)
                   (block-open . 0)
                   (block-close . 0)
                   (brace-list-close . 0)
                   (brace-list-intro . +)
                   (brace-list-entry . 0)
                   (brace-entry-open . 0)
                   (statement . 0)
                   (statement-case-intro . +)
                   (substatement . +)
                   (case-label . +)
                   (access-label . -)
                   (do-while-closure . 0)
                   (else-clause . 0)
                   (catch-clause . 0)
                   (comment-intro . c-lineup-comment)
                   (arglist-cont . 0)
                   (arglist-cont-nonempty . c-lineup-arglist)
                   (stream-op . c-lineup-streamop)
                   (inclass . +)
                   (cpp-macro . [0])
                   (cpp-macro-cont . c-lineup-dont-change)
                   (friend . 0)
                   (objc-method-intro . [0])
                   (objc-method-args-cont . c-lineup-ObjC-method-args)
                   (objc-method-call-cont . c-lineup-ObjC-method-call)
                   (extern-lang-open . 0)
                   (extern-lang-close . 0)
                   (inextern-lang . +)
                   (namespace-open . 0)
                   (namespace-close . 0)
                   (innamespace . +)
                   (template-args-cont c-lineup-template-args +)
                   (inlambda . c-lineup-inexpr-block)
                   (lambda-intro-cont . +)
                   (inexpr-statement . 0)
                   (inexpr-class . +)
                   (statement-block-intro . +)
                   (knr-argdecl-intro . +)
                   (substatement-open . 0)
                   (label . 0)
                   (statement-case-open . 0)
                   (statement-cont . +)
                   (arglist-intro . +)
                   (arglist-close . 0)
                   (inline-open . 0)
                   (brace-list-open . 0)
                   )
 c-delete-function 'delete-char
 c-electric-pound-behavior '(alignleft)
 c-indent-comments-syntactically-p nil
 c-tab-always-indent t
 defun-prompt-regexp nil
 tab-width 8
 comment-column 60
 parse-sexp-ignore-comments t
 auto-fill-function nil
 comment-multi-line t
 comment-start-skip "/\\*+ *\\|//+ *"
 fill-prefix nil
 paragraph-start "[      ]*\\(//+\\|\\**\\)[       ]*$\\|^\f"
 adaptive-fill-mode t
 adaptive-fill-regexp "[      ]*\\(//+\\|\\**\\)[       ]*\\([    ]
*\\([-|#;>*]+[      ]*\\|(?[0-9]+[.)][   ]*\\)*\\)"
 )