Mercurial > emacs
comparison lisp/progmodes/cc-menus.el @ 106184:0579465d2619
(cc-imenu-java-generic-expression): A corrected version of the patch from
2009-11-18.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Sat, 21 Nov 2009 10:32:20 +0000 |
| parents | 7e681be660d6 |
| children | 1d1d5d9bd884 |
comparison
equal
deleted
inserted
replaced
| 106183:1bd47b596efb | 106184:0579465d2619 |
|---|---|
| 148 | 148 |
| 149 (defvar cc-imenu-java-generic-expression | 149 (defvar cc-imenu-java-generic-expression |
| 150 `((nil | 150 `((nil |
| 151 ,(concat | 151 ,(concat |
| 152 "[" c-alpha "_][\]\[." c-alnum "_<> ]+[ \t\n\r]+" ; type spec | 152 "[" c-alpha "_][\]\[." c-alnum "_<> ]+[ \t\n\r]+" ; type spec |
| 153 "\\([" c-alpha "_][" c-alnum "_]+\\)" ; method name | 153 "\\([" c-alpha "_][" c-alnum "_]*\\)" ; method name |
| 154 "[ \t\n\r]*" | 154 "[ \t\n\r]*" |
| 155 ;; An argument list htat is either empty or contains any number | 155 ;; An argument list htat is either empty or contains any number |
| 156 ;; of arguments. An argument is any number of annotations | 156 ;; of arguments. An argument is any number of annotations |
| 157 ;; followed by a type spec followed by a word. A word is an | 157 ;; followed by a type spec followed by a word. A word is an |
| 158 ;; identifier. A type spec is an identifier, possibly followed | 158 ;; identifier. A type spec is an identifier, possibly followed |
| 159 ;; by < typespec > possibly followed by []. | 159 ;; by < typespec > possibly followed by []. |
| 160 (concat "(" | 160 (concat "(" |
| 161 "\\(" | 161 "\\(" |
| 162 "[ \t\n\r]*" | 162 "[ \t\n\r]*" |
| 163 "\\(" | 163 "\\(" |
| 164 "@" | 164 "@" |
| 165 "[" c-alpha "_]" | 165 "[" c-alpha "_]" |
| 166 "[" c-alnum "._]""*" | 166 "[" c-alnum "._]""*" |
| 167 "[ \t\n\r]+" | 167 "[ \t\n\r]+" |
| 168 "\\)*" | |
| 169 "\\(" | |
| 170 "[" c-alpha "_]" | |
| 171 "[\]\[" c-alnum "_.]*" | |
| 172 "\\(" | |
| 173 "<" | |
| 174 "[ \t\n\r]*" | |
| 175 "[\]\[.," c-alnum "_<> \t\n\r]*" | |
| 176 ">" | |
| 177 "\\)?" | |
| 178 "\\(\\[\\]\\)?" | |
| 179 "[ \t\n\r]+" | |
| 180 "\\)" | |
| 181 "[" c-alpha "_]" | |
| 182 "[" c-alnum "_]*" | |
| 183 "[ \t\n\r,]*" | |
| 184 "\\)*" | 168 "\\)*" |
| 185 ")" | 169 "\\(" |
| 186 "[ \t\n\r]*" | 170 "[" c-alpha "_]" |
| 187 "{" | 171 "[\]\[" c-alnum "_.]*" |
| 188 )) 1)) | 172 "\\(" |
| 173 | |
| 174 "<" | |
| 175 "[ \t\n\r]*" | |
| 176 "[\]\[.," c-alnum "_<> \t\n\r]*" | |
| 177 ">" | |
| 178 "\\)?" | |
| 179 "\\(\\[\\]\\)?" | |
| 180 "[ \t\n\r]+" | |
| 181 "\\)" | |
| 182 "[" c-alpha "_]" | |
| 183 "[" c-alnum "_]*" | |
| 184 "[ \t\n\r,]*" | |
| 185 "\\)*" | |
| 186 ")" | |
| 187 "[.," c-alnum " \t\n\r]*" | |
| 188 "{" | |
| 189 )) 1)) | |
| 189 "Imenu generic expression for Java mode. See | 190 "Imenu generic expression for Java mode. See |
| 190 `imenu-generic-expression'.") | 191 `imenu-generic-expression'.") |
| 191 | 192 |
| 192 ;; *Warning for cc-mode developers* | 193 ;; *Warning for cc-mode developers* |
| 193 ;; | 194 ;; |