aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/cedet')
-rw-r--r--lisp/cedet/ChangeLog12
-rw-r--r--lisp/cedet/ede/autoconf-edit.el2
-rw-r--r--lisp/cedet/ede/files.el2
-rw-r--r--lisp/cedet/ede/proj-shared.el4
-rw-r--r--lisp/cedet/ede/proj.el4
-rw-r--r--lisp/cedet/semantic.el2
-rw-r--r--lisp/cedet/semantic/analyze.el4
-rw-r--r--lisp/cedet/semantic/analyze/fcn.el2
-rw-r--r--lisp/cedet/semantic/bovine/c-by.el2
-rw-r--r--lisp/cedet/semantic/bovine/c.el2
-rw-r--r--lisp/cedet/semantic/complete.el2
-rw-r--r--lisp/cedet/semantic/grammar-wy.el505
-rw-r--r--lisp/cedet/semantic/grammar.el6
-rw-r--r--lisp/cedet/semantic/ia-sb.el2
-rw-r--r--lisp/cedet/semantic/lex-spp.el4
-rw-r--r--lisp/cedet/semantic/lex.el4
-rw-r--r--lisp/cedet/semantic/senator.el4
-rw-r--r--lisp/cedet/semantic/sort.el2
-rw-r--r--lisp/cedet/semantic/symref.el2
-rw-r--r--lisp/cedet/semantic/symref/list.el2
-rw-r--r--lisp/cedet/semantic/wisent/javat-wy.el49
-rw-r--r--lisp/cedet/semantic/wisent/js-wy.el106
-rw-r--r--lisp/cedet/semantic/wisent/python-wy.el87
-rw-r--r--lisp/cedet/srecode/srt-wy.el33
-rw-r--r--lisp/cedet/srecode/texi.el2
25 files changed, 471 insertions, 375 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 788bf71845f..f3ff89ddd7f 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,15 @@
12011-11-26 Chong Yidong <cyd@gnu.org>
2
3 * semantic/wisent/python-wy.el:
4 * semantic/wisent/js-wy.el:
5 * semantic/wisent/javat-wy.el:
6 * semantic/bovine/c-by.el:
7 * semantic/grammar-wy.el: Regenerate.
8
92011-11-24 Juanma Barranquero <lekktu@gmail.com>
10
11 * semantic/lex-spp.el (semantic-lex-spp-first-token-arg-list): Fix typo.
12
12011-11-20 Juanma Barranquero <lekktu@gmail.com> 132011-11-20 Juanma Barranquero <lekktu@gmail.com>
2 14
3 * cedet-cscope.el (cedet-cscope-version-check): 15 * cedet-cscope.el (cedet-cscope-version-check):
diff --git a/lisp/cedet/ede/autoconf-edit.el b/lisp/cedet/ede/autoconf-edit.el
index bd4a5a627a9..c6545dd9015 100644
--- a/lisp/cedet/ede/autoconf-edit.el
+++ b/lisp/cedet/ede/autoconf-edit.el
@@ -191,7 +191,7 @@ This is to make it compatible with `autoconf-find-last-macro'.
191Assume that MACRO doesn't appear in the buffer yet, so search 191Assume that MACRO doesn't appear in the buffer yet, so search
192the ordering list `autoconf-preferred-macro-order'." 192the ordering list `autoconf-preferred-macro-order'."
193 ;; Search this list backwards.. heh heh heh 193 ;; Search this list backwards.. heh heh heh
194 ;; This lets us do a reverse search easilly. 194 ;; This lets us do a reverse search easily.
195 (let ((ml (member macro (reverse autoconf-preferred-macro-order)))) 195 (let ((ml (member macro (reverse autoconf-preferred-macro-order))))
196 (if (not ml) (error "Don't know how to position for %s yet" macro)) 196 (if (not ml) (error "Don't know how to position for %s yet" macro))
197 (setq ml (cdr ml)) 197 (setq ml (cdr ml))
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 6179d304464..f17dfd85fdf 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -249,7 +249,7 @@ Do this whenever a new project is created, as opposed to loaded."
249 "Return a project description object if DIR has a project. 249 "Return a project description object if DIR has a project.
250Optional argument FORCE means to ignore a hash-hit of 'nomatch. 250Optional argument FORCE means to ignore a hash-hit of 'nomatch.
251This depends on an up to date `ede-project-class-files' variable. 251This depends on an up to date `ede-project-class-files' variable.
252Any directory that contains the file .ede-ignore will allways 252Any directory that contains the file .ede-ignore will always
253return nil." 253return nil."
254 (when (not (file-exists-p (expand-file-name ".ede-ignore" dir))) 254 (when (not (file-exists-p (expand-file-name ".ede-ignore" dir)))
255 (let* ((dirtest (expand-file-name dir)) 255 (let* ((dirtest (expand-file-name dir))
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index ec514194e33..4e233f56a12 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -61,7 +61,7 @@ Use ldlibs to add addition libraries.")
61; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^") 61; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^")
62; ) 62; )
63; :commands '("$(C_SHARED_LINK) %s") 63; :commands '("$(C_SHARED_LINK) %s")
64 ;; @TODO - addative modification of autoconf. 64 ;; @TODO - additive modification of autoconf.
65 :autoconf '("AC_PROG_LIBTOOL") 65 :autoconf '("AC_PROG_LIBTOOL")
66 ) 66 )
67 "Compiler for C sourcecode.") 67 "Compiler for C sourcecode.")
@@ -108,7 +108,7 @@ Use ldlibs to add addition libraries.")
108 :variables '(("CXX_SHARED" . "g++") 108 :variables '(("CXX_SHARED" . "g++")
109 ("CXX_SHARED_COMPILE" . 109 ("CXX_SHARED_COMPILE" .
110 "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")) 110 "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
111 ;; @TODO - addative modification of autoconf. 111 ;; @TODO - additive modification of autoconf.
112 :autoconf '("AC_PROG_LIBTOOL") 112 :autoconf '("AC_PROG_LIBTOOL")
113 ) 113 )
114 "Compiler for C sourcecode.") 114 "Compiler for C sourcecode.")
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 79022be6a5f..a77bb02218b 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -546,7 +546,7 @@ You may need to add support for this type of file."
546 (file-name-extension (car sources)) 546 (file-name-extension (car sources))
547 ""))) 547 "")))
548 )) 548 ))
549 ;; Return the disovered compilers 549 ;; Return the discovered compilers.
550 comp))) 550 comp)))
551 551
552(defmethod ede-proj-linkers ((obj ede-proj-target)) 552(defmethod ede-proj-linkers ((obj ede-proj-target))
@@ -580,7 +580,7 @@ Converts all symbols into the objects to be used."
580 (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype))) 580 (while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype)))
581 (setq avail (cdr avail))) 581 (setq avail (cdr avail)))
582 (setq link (cdr avail))))) 582 (setq link (cdr avail)))))
583 ;; Return the disovered linkers 583 ;; Return the discovered linkers.
584 link))) 584 link)))
585 585
586 586
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 3ffb6baee9f..3355ed83a91 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -437,7 +437,7 @@ RETURNONERROR specifies that parsing should stop on the first
437unmatched syntax encountered. When nil, parsing skips the syntax, 437unmatched syntax encountered. When nil, parsing skips the syntax,
438adding it to the unmatched syntax cache. 438adding it to the unmatched syntax cache.
439 439
440Must return a list of semantic tags wich have been cooked 440Must return a list of semantic tags which have been cooked
441\(repositioned properly) but which DO NOT HAVE OVERLAYS associated 441\(repositioned properly) but which DO NOT HAVE OVERLAYS associated
442with them. When overloading this function, use `semantic--tag-expand' 442with them. When overloading this function, use `semantic--tag-expand'
443to cook raw tags.") 443to cook raw tags.")
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index ae199703c80..ef09ea13b42 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -57,7 +57,7 @@
57;; 57;;
58;; context - A semantic datatype representing a point in a buffer. 58;; context - A semantic datatype representing a point in a buffer.
59;; 59;;
60;; constriant - If a context specifies a specific datatype is needed, 60;; constraint - If a context specifies a specific datatype is needed,
61;; that is a constraint. 61;; that is a constraint.
62;; constants - Some datatypes define elements of themselves as a 62;; constants - Some datatypes define elements of themselves as a
63;; constant. These need to be returned as there would be no 63;; constant. These need to be returned as there would be no
@@ -254,7 +254,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error
254 (fname nil) 254 (fname nil)
255 (miniscope (when scope (clone scope))) 255 (miniscope (when scope (clone scope)))
256 ) 256 )
257 ;; First order check. Is this wholely contained in the typecache? 257 ;; First order check. Is this wholly contained in the typecache?
258 (setq tmp (semanticdb-typecache-find sequence)) 258 (setq tmp (semanticdb-typecache-find sequence))
259 259
260 (if tmp 260 (if tmp
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index eae6d013400..967e5c59cda 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -157,7 +157,7 @@ Almost all searches use the same arguments."
157;; 157;;
158 158
159(define-overloadable-function semantic-analyze-dereference-metatype (type scope &optional type-declaration) 159(define-overloadable-function semantic-analyze-dereference-metatype (type scope &optional type-declaration)
160 ;; todo - move into typecahe!! 160 ;; todo - move into typecache!!
161 "Return a concrete type tag based on input TYPE tag. 161 "Return a concrete type tag based on input TYPE tag.
162A concrete type is an actual declaration of a memory description, 162A concrete type is an actual declaration of a memory description,
163such as a structure, or class. A meta type is an alias, 163such as a structure, or class. A meta type is an alias,
diff --git a/lisp/cedet/semantic/bovine/c-by.el b/lisp/cedet/semantic/bovine/c-by.el
index 31489a4f625..99429f01acd 100644
--- a/lisp/cedet/semantic/bovine/c-by.el
+++ b/lisp/cedet/semantic/bovine/c-by.el
@@ -1,6 +1,6 @@
1;;; semantic/bovine/c-by.el --- Generated parser support file 1;;; semantic/bovine/c-by.el --- Generated parser support file
2 2
3;;; Copyright (C) 1999-2011 Free Software Foundation, Inc. 3;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
4 4
5;; This file is part of GNU Emacs. 5;; This file is part of GNU Emacs.
6 6
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 686113c23e2..fe659d118e1 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -298,7 +298,7 @@ Moves completely over balanced #if blocks."
298 ;; @TODO - can we use the new c-scan-conditionals 298 ;; @TODO - can we use the new c-scan-conditionals
299 (c-forward-conditional 1)) 299 (c-forward-conditional 1))
300 ((looking-at "^\\s-*#\\s-*elif") 300 ((looking-at "^\\s-*#\\s-*elif")
301 ;; We need to let the preprocessor analize this one. 301 ;; We need to let the preprocessor analyze this one.
302 (beginning-of-line) 302 (beginning-of-line)
303 (setq done t) 303 (setq done t)
304 ) 304 )
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index aaec4cb30ff..7e01b88f60b 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1023,7 +1023,7 @@ Output must be in semanticdb Find result format."
1023 1023
1024(defmethod semantic-collector-try-completion-whitespace 1024(defmethod semantic-collector-try-completion-whitespace
1025 ((obj semantic-collector-abstract) prefix) 1025 ((obj semantic-collector-abstract) prefix)
1026 "For OBJ, do whatepsace completion based on PREFIX. 1026 "For OBJ, do whitespace completion based on PREFIX.
1027This implies that if there are two completions, one matching 1027This implies that if there are two completions, one matching
1028the test \"prefix\\>\", and one not, the one matching the full 1028the test \"prefix\\>\", and one not, the one matching the full
1029word version of PREFIX will be chosen, and that text returned. 1029word version of PREFIX will be chosen, and that text returned.
diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el
index acaad49f6af..879fdd92331 100644
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -22,8 +22,7 @@
22 22
23;;; Commentary: 23;;; Commentary:
24;; 24;;
25;; This file is generated from the grammar file semantic-grammar.wy in 25;; This file was generated from admin/grammars/grammar.wy.
26;; the upstream CEDET repository.
27 26
28;;; Code: 27;;; Code:
29 28
@@ -113,296 +112,296 @@
113 '((DEFAULT-PREC NO-DEFAULT-PREC KEYWORD LANGUAGEMODE LEFT NONASSOC PACKAGE PREC PUT QUOTEMODE RIGHT SCOPESTART START TOKEN TYPE USE-MACROS STRING SYMBOL PERCENT_PERCENT CHARACTER PREFIXED_LIST SEXP PROLOGUE EPILOGUE PAREN_BLOCK BRACE_BLOCK LPAREN RPAREN LBRACE RBRACE COLON SEMI OR LT GT) 112 '((DEFAULT-PREC NO-DEFAULT-PREC KEYWORD LANGUAGEMODE LEFT NONASSOC PACKAGE PREC PUT QUOTEMODE RIGHT SCOPESTART START TOKEN TYPE USE-MACROS STRING SYMBOL PERCENT_PERCENT CHARACTER PREFIXED_LIST SEXP PROLOGUE EPILOGUE PAREN_BLOCK BRACE_BLOCK LPAREN RPAREN LBRACE RBRACE COLON SEMI OR LT GT)
114 nil 113 nil
115 (grammar 114 (grammar
116 ((prologue)) 115 ((prologue))
117 ((epilogue)) 116 ((epilogue))
118 ((declaration)) 117 ((declaration))
119 ((nonterminal)) 118 ((nonterminal))
120 ((PERCENT_PERCENT))) 119 ((PERCENT_PERCENT)))
121 (prologue 120 (prologue
122 ((PROLOGUE) 121 ((PROLOGUE)
123 (wisent-raw-tag 122 (wisent-raw-tag
124 (semantic-tag-new-code "prologue" nil)))) 123 (semantic-tag-new-code "prologue" nil))))
125 (epilogue 124 (epilogue
126 ((EPILOGUE) 125 ((EPILOGUE)
127 (wisent-raw-tag 126 (wisent-raw-tag
128 (semantic-tag-new-code "epilogue" nil)))) 127 (semantic-tag-new-code "epilogue" nil))))
129 (declaration 128 (declaration
130 ((decl) 129 ((decl)
131 (eval $1))) 130 (eval $1)))
132 (decl 131 (decl
133 ((default_prec_decl)) 132 ((default_prec_decl))
134 ((no_default_prec_decl)) 133 ((no_default_prec_decl))
135 ((languagemode_decl)) 134 ((languagemode_decl))
136 ((package_decl)) 135 ((package_decl))
137 ((precedence_decl)) 136 ((precedence_decl))
138 ((put_decl)) 137 ((put_decl))
139 ((quotemode_decl)) 138 ((quotemode_decl))
140 ((scopestart_decl)) 139 ((scopestart_decl))
141 ((start_decl)) 140 ((start_decl))
142 ((keyword_decl)) 141 ((keyword_decl))
143 ((token_decl)) 142 ((token_decl))
144 ((type_decl)) 143 ((type_decl))
145 ((use_macros_decl))) 144 ((use_macros_decl)))
146 (default_prec_decl 145 (default_prec_decl
147 ((DEFAULT-PREC) 146 ((DEFAULT-PREC)
148 `(wisent-raw-tag 147 `(wisent-raw-tag
149 (semantic-tag "default-prec" 'assoc :value 148 (semantic-tag "default-prec" 'assoc :value
150 '("t"))))) 149 '("t")))))
151 (no_default_prec_decl 150 (no_default_prec_decl
152 ((NO-DEFAULT-PREC) 151 ((NO-DEFAULT-PREC)
153 `(wisent-raw-tag 152 `(wisent-raw-tag
154 (semantic-tag "default-prec" 'assoc :value 153 (semantic-tag "default-prec" 'assoc :value
155 '("nil"))))) 154 '("nil")))))
156 (languagemode_decl 155 (languagemode_decl
157 ((LANGUAGEMODE symbols) 156 ((LANGUAGEMODE symbols)
158 `(wisent-raw-tag 157 `(wisent-raw-tag
159 (semantic-tag ',(car $2) 158 (semantic-tag ',(car $2)
160 'languagemode :rest ',(cdr $2))))) 159 'languagemode :rest ',(cdr $2)))))
161 (package_decl 160 (package_decl
162 ((PACKAGE SYMBOL) 161 ((PACKAGE SYMBOL)
163 `(wisent-raw-tag 162 `(wisent-raw-tag
164 (semantic-tag-new-package ',$2 nil)))) 163 (semantic-tag-new-package ',$2 nil))))
165 (precedence_decl 164 (precedence_decl
166 ((associativity token_type_opt items) 165 ((associativity token_type_opt items)
167 `(wisent-raw-tag 166 `(wisent-raw-tag
168 (semantic-tag ',$1 'assoc :type ',$2 :value ',$3)))) 167 (semantic-tag ',$1 'assoc :type ',$2 :value ',$3))))
169 (associativity 168 (associativity
170 ((LEFT) 169 ((LEFT)
171 (progn "left")) 170 (progn "left"))
172 ((RIGHT) 171 ((RIGHT)
173 (progn "right")) 172 (progn "right"))
174 ((NONASSOC) 173 ((NONASSOC)
175 (progn "nonassoc"))) 174 (progn "nonassoc")))
176 (put_decl 175 (put_decl
177 ((PUT put_name put_value) 176 ((PUT put_name put_value)
178 `(wisent-raw-tag 177 `(wisent-raw-tag
179 (semantic-tag ',$2 'put :value ',(list $3)))) 178 (semantic-tag ',$2 'put :value ',(list $3))))
180 ((PUT put_name put_value_list) 179 ((PUT put_name put_value_list)
181 `(wisent-raw-tag 180 `(wisent-raw-tag
182 (semantic-tag ',$2 'put :value ',$3))) 181 (semantic-tag ',$2 'put :value ',$3)))
183 ((PUT put_name_list put_value) 182 ((PUT put_name_list put_value)
184 `(wisent-raw-tag 183 `(wisent-raw-tag
185 (semantic-tag ',(car $2) 184 (semantic-tag ',(car $2)
186 'put :rest ',(cdr $2) 185 'put :rest ',(cdr $2)
187 :value ',(list $3)))) 186 :value ',(list $3))))
188 ((PUT put_name_list put_value_list) 187 ((PUT put_name_list put_value_list)
189 `(wisent-raw-tag 188 `(wisent-raw-tag
190 (semantic-tag ',(car $2) 189 (semantic-tag ',(car $2)
191 'put :rest ',(cdr $2) 190 'put :rest ',(cdr $2)
192 :value ',$3)))) 191 :value ',$3))))
193 (put_name_list 192 (put_name_list
194 ((BRACE_BLOCK) 193 ((BRACE_BLOCK)
195 (mapcar 'semantic-tag-name 194 (mapcar 'semantic-tag-name
196 (semantic-parse-region 195 (semantic-parse-region
197 (car $region1) 196 (car $region1)
198 (cdr $region1) 197 (cdr $region1)
199 'put_names 1)))) 198 'put_names 1))))
200 (put_names 199 (put_names
201 ((LBRACE) 200 ((LBRACE)
202 nil) 201 nil)
203 ((RBRACE) 202 ((RBRACE)
204 nil) 203 nil)
205 ((put_name) 204 ((put_name)
206 (wisent-raw-tag 205 (wisent-raw-tag
207 (semantic-tag $1 'put-name)))) 206 (semantic-tag $1 'put-name))))
208 (put_name 207 (put_name
209 ((SYMBOL)) 208 ((SYMBOL))
210 ((token_type))) 209 ((token_type)))
211 (put_value_list 210 (put_value_list
212 ((BRACE_BLOCK) 211 ((BRACE_BLOCK)
213 (mapcar 'semantic-tag-code-detail 212 (mapcar 'semantic-tag-code-detail
214 (semantic-parse-region 213 (semantic-parse-region
215 (car $region1) 214 (car $region1)
216 (cdr $region1) 215 (cdr $region1)
217 'put_values 1)))) 216 'put_values 1))))
218 (put_values 217 (put_values
219 ((LBRACE) 218 ((LBRACE)
220 nil) 219 nil)
221 ((RBRACE) 220 ((RBRACE)
222 nil) 221 nil)
223 ((put_value) 222 ((put_value)
224 (wisent-raw-tag 223 (wisent-raw-tag
225 (semantic-tag-new-code "put-value" $1)))) 224 (semantic-tag-new-code "put-value" $1))))
226 (put_value 225 (put_value
227 ((SYMBOL any_value) 226 ((SYMBOL any_value)
228 (cons $1 $2))) 227 (cons $1 $2)))
229 (scopestart_decl 228 (scopestart_decl
230 ((SCOPESTART SYMBOL) 229 ((SCOPESTART SYMBOL)
231 `(wisent-raw-tag 230 `(wisent-raw-tag
232 (semantic-tag ',$2 'scopestart)))) 231 (semantic-tag ',$2 'scopestart))))
233 (quotemode_decl 232 (quotemode_decl
234 ((QUOTEMODE SYMBOL) 233 ((QUOTEMODE SYMBOL)
235 `(wisent-raw-tag 234 `(wisent-raw-tag
236 (semantic-tag ',$2 'quotemode)))) 235 (semantic-tag ',$2 'quotemode))))
237 (start_decl 236 (start_decl
238 ((START symbols) 237 ((START symbols)
239 `(wisent-raw-tag 238 `(wisent-raw-tag
240 (semantic-tag ',(car $2) 239 (semantic-tag ',(car $2)
241 'start :rest ',(cdr $2))))) 240 'start :rest ',(cdr $2)))))
242 (keyword_decl 241 (keyword_decl
243 ((KEYWORD SYMBOL string_value) 242 ((KEYWORD SYMBOL string_value)
244 `(wisent-raw-tag 243 `(wisent-raw-tag
245 (semantic-tag ',$2 'keyword :value ',$3)))) 244 (semantic-tag ',$2 'keyword :value ',$3))))
246 (token_decl 245 (token_decl
247 ((TOKEN token_type_opt SYMBOL string_value) 246 ((TOKEN token_type_opt SYMBOL string_value)
248 `(wisent-raw-tag 247 `(wisent-raw-tag
249 (semantic-tag ',$3 ',(if $2 'token 'keyword) 248 (semantic-tag ',$3 ',(if $2 'token 'keyword)
250 :type ',$2 :value ',$4))) 249 :type ',$2 :value ',$4)))
251 ((TOKEN token_type_opt symbols) 250 ((TOKEN token_type_opt symbols)
252 `(wisent-raw-tag 251 `(wisent-raw-tag
253 (semantic-tag ',(car $3) 252 (semantic-tag ',(car $3)
254 'token :type ',$2 :rest ',(cdr $3))))) 253 'token :type ',$2 :rest ',(cdr $3)))))
255 (token_type_opt 254 (token_type_opt
256 (nil) 255 (nil)
257 ((token_type))) 256 ((token_type)))
258 (token_type 257 (token_type
259 ((LT SYMBOL GT) 258 ((LT SYMBOL GT)
260 (progn $2))) 259 (progn $2)))
261 (type_decl 260 (type_decl
262 ((TYPE token_type plist_opt) 261 ((TYPE token_type plist_opt)
263 `(wisent-raw-tag 262 `(wisent-raw-tag
264 (semantic-tag ',$2 'type :value ',$3)))) 263 (semantic-tag ',$2 'type :value ',$3))))
265 (plist_opt 264 (plist_opt
266 (nil) 265 (nil)
267 ((plist))) 266 ((plist)))
268 (plist 267 (plist
269 ((plist put_value) 268 ((plist put_value)
270 (append 269 (append
271 (list $2) 270 (list $2)
272 $1)) 271 $1))
273 ((put_value) 272 ((put_value)
274 (list $1))) 273 (list $1)))
275 (use_name_list 274 (use_name_list
276 ((BRACE_BLOCK) 275 ((BRACE_BLOCK)
277 (mapcar 'semantic-tag-name 276 (mapcar 'semantic-tag-name
278 (semantic-parse-region 277 (semantic-parse-region
279 (car $region1) 278 (car $region1)
280 (cdr $region1) 279 (cdr $region1)
281 'use_names 1)))) 280 'use_names 1))))
282 (use_names 281 (use_names
283 ((LBRACE) 282 ((LBRACE)
284 nil) 283 nil)
285 ((RBRACE) 284 ((RBRACE)
286 nil) 285 nil)
287 ((SYMBOL) 286 ((SYMBOL)
288 (wisent-raw-tag 287 (wisent-raw-tag
289 (semantic-tag $1 'use-name)))) 288 (semantic-tag $1 'use-name))))
290 (use_macros_decl 289 (use_macros_decl
291 ((USE-MACROS SYMBOL use_name_list) 290 ((USE-MACROS SYMBOL use_name_list)
292 `(wisent-raw-tag 291 `(wisent-raw-tag
293 (semantic-tag "macro" 'macro :type ',$2 :value ',$3)))) 292 (semantic-tag "macro" 'macro :type ',$2 :value ',$3))))
294 (string_value 293 (string_value
295 ((STRING) 294 ((STRING)
296 (read $1))) 295 (read $1)))
297 (any_value 296 (any_value
298 ((SYMBOL)) 297 ((SYMBOL))
299 ((STRING)) 298 ((STRING))
300 ((PAREN_BLOCK)) 299 ((PAREN_BLOCK))
301 ((PREFIXED_LIST)) 300 ((PREFIXED_LIST))
302 ((SEXP))) 301 ((SEXP)))
303 (symbols 302 (symbols
304 ((lifo_symbols) 303 ((lifo_symbols)
305 (nreverse $1))) 304 (nreverse $1)))
306 (lifo_symbols 305 (lifo_symbols
307 ((lifo_symbols SYMBOL) 306 ((lifo_symbols SYMBOL)
308 (cons $2 $1)) 307 (cons $2 $1))
309 ((SYMBOL) 308 ((SYMBOL)
310 (list $1))) 309 (list $1)))
311 (nonterminal 310 (nonterminal
312 ((SYMBOL 311 ((SYMBOL
313 (setq semantic-grammar-wy--nterm $1 semantic-grammar-wy--rindx 0) 312 (setq semantic-grammar-wy--nterm $1 semantic-grammar-wy--rindx 0)
314 COLON rules SEMI) 313 COLON rules SEMI)
315 (wisent-raw-tag 314 (wisent-raw-tag
316 (semantic-tag $1 'nonterminal :children $4)))) 315 (semantic-tag $1 'nonterminal :children $4))))
317 (rules 316 (rules
318 ((lifo_rules) 317 ((lifo_rules)
319 (apply 'nconc 318 (apply 'nconc
320 (nreverse $1)))) 319 (nreverse $1))))
321 (lifo_rules 320 (lifo_rules
322 ((lifo_rules OR rule) 321 ((lifo_rules OR rule)
323 (cons $3 $1)) 322 (cons $3 $1))
324 ((rule) 323 ((rule)
325 (list $1))) 324 (list $1)))
326 (rule 325 (rule
327 ((rhs) 326 ((rhs)
328 (let* 327 (let*
329 ((nterm semantic-grammar-wy--nterm) 328 ((nterm semantic-grammar-wy--nterm)
330 (rindx semantic-grammar-wy--rindx) 329 (rindx semantic-grammar-wy--rindx)
331 (rhs $1) 330 (rhs $1)
332 comps prec action elt) 331 comps prec action elt)
333 (setq semantic-grammar-wy--rindx 332 (setq semantic-grammar-wy--rindx
334 (1+ semantic-grammar-wy--rindx)) 333 (1+ semantic-grammar-wy--rindx))
335 (while rhs 334 (while rhs
336 (setq elt 335 (setq elt
337 (car rhs) 336 (car rhs)
338 rhs 337 rhs
339 (cdr rhs)) 338 (cdr rhs))
340 (cond 339 (cond
341 ((vectorp elt) 340 ((vectorp elt)
342 (if prec 341 (if prec
343 (error "Duplicate %%prec in `%s:%d' rule" nterm rindx)) 342 (error "Duplicate %%prec in `%s:%d' rule" nterm rindx))
344 (setq prec 343 (setq prec
345 (aref elt 0))) 344 (aref elt 0)))
346 ((consp elt) 345 ((consp elt)
347 (if 346 (if
348 (or action comps) 347 (or action comps)
349 (setq comps 348 (setq comps
350 (cons elt comps) 349 (cons elt comps)
351 semantic-grammar-wy--rindx 350 semantic-grammar-wy--rindx
352 (1+ semantic-grammar-wy--rindx)) 351 (1+ semantic-grammar-wy--rindx))
353 (setq action 352 (setq action
354 (car elt)))) 353 (car elt))))
355 (t 354 (t
356 (setq comps 355 (setq comps
357 (cons elt comps))))) 356 (cons elt comps)))))
358 (wisent-cook-tag 357 (wisent-cook-tag
359 (wisent-raw-tag 358 (wisent-raw-tag
360 (semantic-tag 359 (semantic-tag
361 (format "%s:%d" nterm rindx) 360 (format "%s:%d" nterm rindx)
362 'rule :type 361 'rule :type
363 (if comps "group" "empty") 362 (if comps "group" "empty")
364 :value comps :prec prec :expr action)))))) 363 :value comps :prec prec :expr action))))))
365 (rhs 364 (rhs
366 (nil) 365 (nil)
367 ((rhs item) 366 ((rhs item)
368 (cons $2 $1)) 367 (cons $2 $1))
369 ((rhs action) 368 ((rhs action)
370 (cons 369 (cons
371 (list $2) 370 (list $2)
372 $1)) 371 $1))
373 ((rhs PREC item) 372 ((rhs PREC item)
374 (cons 373 (cons
375 (vector $3) 374 (vector $3)
376 $1))) 375 $1)))
377 (action 376 (action
378 ((PAREN_BLOCK)) 377 ((PAREN_BLOCK))
379 ((PREFIXED_LIST)) 378 ((PREFIXED_LIST))
380 ((BRACE_BLOCK) 379 ((BRACE_BLOCK)
381 (format "(progn\n%s)" 380 (format "(progn\n%s)"
382 (let 381 (let
383 ((s $1)) 382 ((s $1))
384 (if 383 (if
385 (string-match "^{[ \n ]*" s) 384 (string-match "^{[ \n ]*" s)
386 (setq s 385 (setq s
387 (substring s 386 (substring s
388 (match-end 0)))) 387 (match-end 0))))
389 (if 388 (if
390 (string-match "[ \n ]*}$" s) 389 (string-match "[ \n ]*}$" s)
391 (setq s 390 (setq s
392 (substring s 0 391 (substring s 0
393 (match-beginning 0)))) 392 (match-beginning 0))))
394 s)))) 393 s))))
395 (items 394 (items
396 ((lifo_items) 395 ((lifo_items)
397 (nreverse $1))) 396 (nreverse $1)))
398 (lifo_items 397 (lifo_items
399 ((lifo_items item) 398 ((lifo_items item)
400 (cons $2 $1)) 399 (cons $2 $1))
401 ((item) 400 ((item)
402 (list $1))) 401 (list $1)))
403 (item 402 (item
404 ((SYMBOL)) 403 ((SYMBOL))
405 ((CHARACTER)))) 404 ((CHARACTER))))
406 '(grammar prologue epilogue declaration nonterminal rule put_names put_values use_names))) 405 '(grammar prologue epilogue declaration nonterminal rule put_names put_values use_names)))
407 "Parser table.") 406 "Parser table.")
408 407
@@ -411,10 +410,10 @@
411 (semantic-install-function-overrides 410 (semantic-install-function-overrides
412 '((parse-stream . wisent-parse-stream))) 411 '((parse-stream . wisent-parse-stream)))
413 (setq semantic-parser-name "LALR" 412 (setq semantic-parser-name "LALR"
414 semantic--parse-table semantic-grammar-wy--parse-table 413 semantic--parse-table semantic-grammar-wy--parse-table
415 semantic-debug-parser-source "semantic-grammar.wy" 414 semantic-debug-parser-source "semantic-grammar.wy"
416 semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table 415 semantic-flex-keywords-obarray semantic-grammar-wy--keyword-table
417 semantic-lex-types-obarray semantic-grammar-wy--token-table) 416 semantic-lex-types-obarray semantic-grammar-wy--token-table)
418 ;; Collect unmatched syntax lexical tokens 417 ;; Collect unmatched syntax lexical tokens
419 (semantic-make-local-hook 'wisent-discarding-token-functions) 418 (semantic-make-local-hook 'wisent-discarding-token-functions)
420 (add-hook 'wisent-discarding-token-functions 419 (add-hook 'wisent-discarding-token-functions
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 1d1184e534f..98b1ab55c32 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -104,10 +104,10 @@ It ignores whitespaces, newlines and comments."
104 ;; regexp match semicolons inside strings! 104 ;; regexp match semicolons inside strings!
105 semantic-lex-ignore-comments 105 semantic-lex-ignore-comments
106 ;; Must detect prefixed list before punctuation because prefix chars 106 ;; Must detect prefixed list before punctuation because prefix chars
107 ;; are also punctuations! 107 ;; are also punctuation!
108 semantic-grammar-wy--<qlist>-sexp-analyzer 108 semantic-grammar-wy--<qlist>-sexp-analyzer
109 ;; Must detect punctuations after comments because the semicolon can 109 ;; Must detect punctuation after comments because the semicolon can
110 ;; be a punctuation or a comment start! 110 ;; be punctuation or a comment start!
111 semantic-grammar-wy--<punctuation>-string-analyzer 111 semantic-grammar-wy--<punctuation>-string-analyzer
112 semantic-grammar-wy--<block>-block-analyzer 112 semantic-grammar-wy--<block>-block-analyzer
113 semantic-grammar-wy--<sexp>-sexp-analyzer) 113 semantic-grammar-wy--<sexp>-sexp-analyzer)
diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el
index 95a68673b8c..edd62cc5ca5 100644
--- a/lisp/cedet/semantic/ia-sb.el
+++ b/lisp/cedet/semantic/ia-sb.el
@@ -348,7 +348,7 @@ TEXT TAG and INDENT are the details."
348 (insert (semantic-tag-name tag)) 348 (insert (semantic-tag-name tag))
349 (if movepoint (setq movepoint (point))) 349 (if movepoint (setq movepoint (point)))
350 ;; I'd like to use this to add fancy () or what not at the end 350 ;; I'd like to use this to add fancy () or what not at the end
351 ;; but we need the parent file whih requires an upgrade to the 351 ;; but we need the parent file which requires an upgrade to the
352 ;; analysis tool. 352 ;; analysis tool.
353 ;;(semantic-insert-foreign-tag tag ??)) 353 ;;(semantic-insert-foreign-tag tag ??))
354 ) 354 )
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index 03a3f1b0cb1..cf82da303ce 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -452,7 +452,7 @@ continue processing recursively."
452 ;; If val is nil, that's probably wrong. 452 ;; If val is nil, that's probably wrong.
453 ;; Found a system header case where this was true. 453 ;; Found a system header case where this was true.
454 ((null val) "") 454 ((null val) "")
455 ;; Debug wierd stuff. 455 ;; Debug weird stuff.
456 (t (debug))) 456 (t (debug)))
457 )) 457 ))
458 ((stringp txt) 458 ((stringp txt)
@@ -821,7 +821,7 @@ STR occurs in the current buffer between BEG and END."
821;; a macro. 821;; a macro.
822 822
823(defun semantic-lex-spp-first-token-arg-list (token) 823(defun semantic-lex-spp-first-token-arg-list (token)
824 "If TOKEN is a semantic-list, turn it into a an SPP ARG LIST." 824 "If TOKEN is a semantic-list, turn it into an SPP ARG LIST."
825 (when (and (consp token) 825 (when (and (consp token)
826 (symbolp (car token)) 826 (symbolp (car token))
827 (eq 'semantic-list (car token))) 827 (eq 'semantic-list (car token)))
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index fca367ecb8c..ba43ba657a1 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -165,7 +165,7 @@
165;; 165;;
166;; %type <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string 166;; %type <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
167;; 167;;
168;; ;; Some punctuations based on the type defines above 168;; ;; Some punctuation based on the type defines above
169;; 169;;
170;; %token <punctuation> NOT "!" 170;; %token <punctuation> NOT "!"
171;; %token <punctuation> NOTEQ "!=" 171;; %token <punctuation> NOTEQ "!="
@@ -1313,7 +1313,7 @@ and number formats."
1313 1313
1314(define-lex-analyzer semantic-lex-punctuation-type 1314(define-lex-analyzer semantic-lex-punctuation-type
1315 "Detect and create a punctuation type token. 1315 "Detect and create a punctuation type token.
1316Recognized punctuations are defined in the current table of lexical 1316Recognized punctuation is defined in the current table of lexical
1317types, as the value of the `punctuation' token type." 1317types, as the value of the `punctuation' token type."
1318 (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+") 1318 (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+")
1319 (let* ((key (match-string 0)) 1319 (let* ((key (match-string 0))
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 5399d4d5649..b4618d1c18f 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -179,8 +179,8 @@ source."
179 (goto-char (semantic-tag-start tag)) 179 (goto-char (semantic-tag-start tag))
180 (when (re-search-forward (concat 180 (when (re-search-forward (concat
181 ;; The tag name is expected to be 181 ;; The tag name is expected to be
182 ;; between word delimiters, whitespaces, 182 ;; between word delimiters, whitespace,
183 ;; or punctuations. 183 ;; or punctuation.
184 "\\(\\<\\|\\s-+\\|\\s.\\)" 184 "\\(\\<\\|\\s-+\\|\\s.\\)"
185 (regexp-quote name) 185 (regexp-quote name)
186 "\\(\\>\\|\\s-+\\|\\s.\\)") 186 "\\(\\>\\|\\s-+\\|\\s.\\)")
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el
index c3d8b26810c..a4126e1384b 100644
--- a/lisp/cedet/semantic/sort.el
+++ b/lisp/cedet/semantic/sort.el
@@ -229,7 +229,7 @@ unmodified as components of their parent tags."
229 (mapc (lambda (tag) 229 (mapc (lambda (tag)
230 (let ((components (semantic-tag-components tag))) 230 (let ((components (semantic-tag-components tag)))
231 (if (and components 231 (if (and components
232 ;; unpositined tags can be hazardous to 232 ;; unpositioned tags can be hazardous to
233 ;; completion. Do we need any type of tag 233 ;; completion. Do we need any type of tag
234 ;; here? - EL 234 ;; here? - EL
235 (semantic-tag-with-position-p (car components))) 235 (semantic-tag-with-position-p (car components)))
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 61006802c0d..cbae9f85573 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -324,7 +324,7 @@ Use the `semantic-symref-hit-tags' method to get this list.")
324 (setq ans (list (car files)) 324 (setq ans (list (car files))
325 files (cdr files)) 325 files (cdr files))
326 (dolist (F files) 326 (dolist (F files)
327 ;; This algorithm for uniqing the file list depends on the 327 ;; This algorithm for uniquifying the file list depends on the
328 ;; tool in question providing all the hits in the same file 328 ;; tool in question providing all the hits in the same file
329 ;; grouped together. 329 ;; grouped together.
330 (when (not (string= F (car ans))) 330 (when (not (string= F (car ans)))
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index ce3500f83e1..53422541c47 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -401,7 +401,7 @@ BUTTON is the button that was clicked."
401 401
402;;; UTILS 402;;; UTILS
403;; 403;;
404;; List mode utils for understadning the current line 404;; List mode utils for understanding the current line
405 405
406(defun semantic-symref-list-on-hit-p () 406(defun semantic-symref-list-on-hit-p ()
407 "Return the line number if the cursor is on a buffer line with a hit. 407 "Return the line number if the cursor is on a buffer line with a hit.
diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el
index 4470b87a1f1..562b0da6caa 100644
--- a/lisp/cedet/semantic/wisent/javat-wy.el
+++ b/lisp/cedet/semantic/wisent/javat-wy.el
@@ -19,12 +19,11 @@
19 19
20;;; Commentary: 20;;; Commentary:
21;; 21;;
22;; This file was generated from etc/java-tags.wy. 22;; This file was generated from admin/grammars/java-tags.wy.
23 23
24;;; Code: 24;;; Code:
25 25
26(require 'semantic/lex) 26(require 'semantic/lex)
27
28 27
29;;; Prologue 28;;; Prologue
30;; 29;;
@@ -396,7 +395,7 @@
396 ((SEMICOLON)) 395 ((SEMICOLON))
397 ((block))) 396 ((block)))
398 (block 397 (block
399 ((BRACE_BLOCK))) 398 ((BRACE_BLOCK)))
400 (formal_parameter_list 399 (formal_parameter_list
401 ((PAREN_BLOCK) 400 ((PAREN_BLOCK)
402 (semantic-parse-region 401 (semantic-parse-region
@@ -557,7 +556,7 @@
557 '((parse-stream . wisent-parse-stream))) 556 '((parse-stream . wisent-parse-stream)))
558 (setq semantic-parser-name "LALR" 557 (setq semantic-parser-name "LALR"
559 semantic--parse-table wisent-java-tags-wy--parse-table 558 semantic--parse-table wisent-java-tags-wy--parse-table
560 semantic-debug-parser-source "wisent-java-tags.wy" 559 semantic-debug-parser-source "java-tags.wy"
561 semantic-flex-keywords-obarray wisent-java-tags-wy--keyword-table 560 semantic-flex-keywords-obarray wisent-java-tags-wy--keyword-table
562 semantic-lex-types-obarray wisent-java-tags-wy--token-table) 561 semantic-lex-types-obarray wisent-java-tags-wy--token-table)
563 ;; Collect unmatched syntax lexical tokens 562 ;; Collect unmatched syntax lexical tokens
@@ -567,10 +566,6 @@
567 566
568 567
569;;; Analyzers 568;;; Analyzers
570;;
571(define-lex-keyword-type-analyzer wisent-java-tags-wy--<keyword>-keyword-analyzer
572 "keyword analyzer for <keyword> tokens."
573 "\\(\\sw\\|\\s_\\)+")
574 569
575(define-lex-block-type-analyzer wisent-java-tags-wy--<block>-block-analyzer 570(define-lex-block-type-analyzer wisent-java-tags-wy--<block>-block-analyzer
576 "block analyzer for <block> tokens." 571 "block analyzer for <block> tokens."
@@ -583,23 +578,6 @@
583 ("]" RBRACK)) 578 ("]" RBRACK))
584 ) 579 )
585 580
586(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
587 "regexp analyzer for <symbol> tokens."
588 "\\(\\sw\\|\\s_\\)+"
589 nil
590 'IDENTIFIER)
591
592(define-lex-sexp-type-analyzer wisent-java-tags-wy--<string>-sexp-analyzer
593 "sexp analyzer for <string> tokens."
594 "\\s\""
595 'STRING_LITERAL)
596
597(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
598 "regexp analyzer for <number> tokens."
599 semantic-lex-number-expression
600 nil
601 'NUMBER_LITERAL)
602
603(define-lex-string-type-analyzer wisent-java-tags-wy--<punctuation>-string-analyzer 581(define-lex-string-type-analyzer wisent-java-tags-wy--<punctuation>-string-analyzer
604 "string analyzer for <punctuation> tokens." 582 "string analyzer for <punctuation> tokens."
605 "\\(\\s.\\|\\s$\\|\\s'\\)+" 583 "\\(\\s.\\|\\s$\\|\\s'\\)+"
@@ -645,12 +623,33 @@
645 (NOT . "!")) 623 (NOT . "!"))
646 'punctuation) 624 'punctuation)
647 625
626(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
627 "regexp analyzer for <symbol> tokens."
628 "\\(\\sw\\|\\s_\\)+"
629 nil
630 'IDENTIFIER)
631
648(define-lex-regex-type-analyzer wisent-java-tags-wy--<unicode>-regexp-analyzer 632(define-lex-regex-type-analyzer wisent-java-tags-wy--<unicode>-regexp-analyzer
649 "regexp analyzer for <unicode> tokens." 633 "regexp analyzer for <unicode> tokens."
650 "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]" 634 "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
651 nil 635 nil
652 'unicodecharacter) 636 'unicodecharacter)
653 637
638(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
639 "regexp analyzer for <number> tokens."
640 semantic-lex-number-expression
641 nil
642 'NUMBER_LITERAL)
643
644(define-lex-sexp-type-analyzer wisent-java-tags-wy--<string>-sexp-analyzer
645 "sexp analyzer for <string> tokens."
646 "\\s\""
647 'STRING_LITERAL)
648
649(define-lex-keyword-type-analyzer wisent-java-tags-wy--<keyword>-keyword-analyzer
650 "keyword analyzer for <keyword> tokens."
651 "\\(\\sw\\|\\s_\\)+")
652
654 653
655;;; Epilogue 654;;; Epilogue
656;; 655;;
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el
index b523db8771b..c8dded08d1f 100644
--- a/lisp/cedet/semantic/wisent/js-wy.el
+++ b/lisp/cedet/semantic/wisent/js-wy.el
@@ -1,7 +1,7 @@
1;;; semantic/wisent/js-wy.el --- Generated parser support file 1;;; semantic/wisent/js-wy.el --- Generated parser support file
2 2
3;; Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc.
4;; Copyright (C) Ecma International. 4;; Copyright (C) 1998-2011 Ecma International
5 5
6;; This file is part of GNU Emacs. 6;; This file is part of GNU Emacs.
7 7
@@ -20,9 +20,45 @@
20 20
21;;; Commentary: 21;;; Commentary:
22;; 22;;
23;; This file was generated from etc/grammars/javascript-jv.wy. 23;; This file was generated from admin/grammars/js.wy.
24
25;; It is derived from the grammar in the ECMAScript Language
26;; Specification published at
27;;
28;; http://www.ecma-international.org/publications/standards/Ecma-262.htm
29;;
30;; and redistributed under the following license:
31;;
32;; Redistribution and use in source and binary forms, with or without
33;; modification, are permitted provided that the following conditions
34;; are met:
35;;
36;; 1. Redistributions of source code must retain the above copyright
37;; notice, this list of conditions and the following disclaimer.
38;;
39;; 2. Redistributions in binary form must reproduce the above
40;; copyright notice, this list of conditions and the following
41;; disclaimer in the documentation and/or other materials provided
42;; with the distribution.
43;;
44;; 3. Neither the name of the authors nor Ecma International may be
45;; used to endorse or promote products derived from this software
46;; without specific prior written permission. THIS SOFTWARE IS
47;; PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR
48;; IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
49;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
50;; ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR
51;; ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
52;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
53;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
54;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
55;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
56;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
57;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
58;; DAMAGE.
24 59
25;;; Code: 60;;; Code:
61
26(require 'semantic/lex) 62(require 'semantic/lex)
27 63
28;;; Prologue 64;;; Prologue
@@ -370,7 +406,7 @@
370 '((parse-stream . wisent-parse-stream))) 406 '((parse-stream . wisent-parse-stream)))
371 (setq semantic-parser-name "LALR" 407 (setq semantic-parser-name "LALR"
372 semantic--parse-table wisent-javascript-jv-wy--parse-table 408 semantic--parse-table wisent-javascript-jv-wy--parse-table
373 semantic-debug-parser-source "wisent-javascript-jv.wy" 409 semantic-debug-parser-source "js.wy"
374 semantic-flex-keywords-obarray wisent-javascript-jv-wy--keyword-table 410 semantic-flex-keywords-obarray wisent-javascript-jv-wy--keyword-table
375 semantic-lex-types-obarray wisent-javascript-jv-wy--token-table) 411 semantic-lex-types-obarray wisent-javascript-jv-wy--token-table)
376 ;; Collect unmatched syntax lexical tokens 412 ;; Collect unmatched syntax lexical tokens
@@ -380,38 +416,6 @@
380 416
381 417
382;;; Analyzers 418;;; Analyzers
383;;
384(define-lex-keyword-type-analyzer wisent-javascript-jv-wy--<keyword>-keyword-analyzer
385 "keyword analyzer for <keyword> tokens."
386 "\\(\\sw\\|\\s_\\)+")
387
388(define-lex-block-type-analyzer wisent-javascript-jv-wy--<block>-block-analyzer
389 "block analyzer for <block> tokens."
390 "\\s(\\|\\s)"
391 '((("(" OPEN_PARENTHESIS PAREN_BLOCK)
392 ("{" START_BLOCK BRACE_BLOCK)
393 ("[" OPEN_SQ_BRACKETS BRACK_BLOCK))
394 (")" CLOSE_PARENTHESIS)
395 ("}" END_BLOCK)
396 ("]" CLOSE_SQ_BRACKETS))
397 )
398
399(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<symbol>-regexp-analyzer
400 "regexp analyzer for <symbol> tokens."
401 "\\(\\sw\\|\\s_\\)+"
402 nil
403 'VARIABLE)
404
405(define-lex-sexp-type-analyzer wisent-javascript-jv-wy--<string>-sexp-analyzer
406 "sexp analyzer for <string> tokens."
407 "\\s\""
408 'STRING)
409
410(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<number>-regexp-analyzer
411 "regexp analyzer for <number> tokens."
412 semantic-lex-number-expression
413 nil
414 'NUMBER)
415 419
416(define-lex-string-type-analyzer wisent-javascript-jv-wy--<punctuation>-string-analyzer 420(define-lex-string-type-analyzer wisent-javascript-jv-wy--<punctuation>-string-analyzer
417 "string analyzer for <punctuation> tokens." 421 "string analyzer for <punctuation> tokens."
@@ -458,6 +462,38 @@
458 (ASSIGN_SYMBOL . "=")) 462 (ASSIGN_SYMBOL . "="))
459 'punctuation) 463 'punctuation)
460 464
465(define-lex-block-type-analyzer wisent-javascript-jv-wy--<block>-block-analyzer
466 "block analyzer for <block> tokens."
467 "\\s(\\|\\s)"
468 '((("(" OPEN_PARENTHESIS PAREN_BLOCK)
469 ("{" START_BLOCK BRACE_BLOCK)
470 ("[" OPEN_SQ_BRACKETS BRACK_BLOCK))
471 (")" CLOSE_PARENTHESIS)
472 ("}" END_BLOCK)
473 ("]" CLOSE_SQ_BRACKETS))
474 )
475
476(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<symbol>-regexp-analyzer
477 "regexp analyzer for <symbol> tokens."
478 "\\(\\sw\\|\\s_\\)+"
479 nil
480 'VARIABLE)
481
482(define-lex-regex-type-analyzer wisent-javascript-jv-wy--<number>-regexp-analyzer
483 "regexp analyzer for <number> tokens."
484 semantic-lex-number-expression
485 nil
486 'NUMBER)
487
488(define-lex-sexp-type-analyzer wisent-javascript-jv-wy--<string>-sexp-analyzer
489 "sexp analyzer for <string> tokens."
490 "\\s\""
491 'STRING)
492
493(define-lex-keyword-type-analyzer wisent-javascript-jv-wy--<keyword>-keyword-analyzer
494 "keyword analyzer for <keyword> tokens."
495 "\\(\\sw\\|\\s_\\)+")
496
461 497
462;;; Epilogue 498;;; Epilogue
463;; 499;;
diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el
index 36965757a14..2445d7162a7 100644
--- a/lisp/cedet/semantic/wisent/python-wy.el
+++ b/lisp/cedet/semantic/wisent/python-wy.el
@@ -20,7 +20,58 @@
20 20
21;;; Commentary: 21;;; Commentary:
22;; 22;;
23;; This file was generated from etc/grammars/python.wy. 23;; This file was generated from admin/grammars/python.wy.
24;; It is derived in part from the Python grammar, used under the
25;; following license:
26;;
27;; PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
28;; --------------------------------------------
29;; 1. This LICENSE AGREEMENT is between the Python Software Foundation
30;; ("PSF"), and the Individual or Organization ("Licensee") accessing
31;; and otherwise using this software ("Python") in source or binary
32;; form and its associated documentation.
33;;
34;; 2. Subject to the terms and conditions of this License Agreement,
35;; PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide
36;; license to reproduce, analyze, test, perform and/or display
37;; publicly, prepare derivative works, distribute, and otherwise use
38;; Python alone or in any derivative version, provided, however, that
39;; PSF's License Agreement and PSF's notice of copyright, i.e.,
40;; "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
41;; 2009, 2010 Python Software Foundation; All Rights Reserved" are
42;; retained in Python alone or in any derivative version prepared by
43;; Licensee.
44;;
45;; 3. In the event Licensee prepares a derivative work that is based
46;; on or incorporates Python or any part thereof, and wants to make
47;; the derivative work available to others as provided herein, then
48;; Licensee hereby agrees to include in any such work a brief summary
49;; of the changes made to Python.
50;;
51;; 4. PSF is making Python available to Licensee on an "AS IS"
52;; basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
53;; IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
54;; DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
55;; FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
56;; INFRINGE ANY THIRD PARTY RIGHTS.
57;;
58;; 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
59;; FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
60;; RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR
61;; ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
62;;
63;; 6. This License Agreement will automatically terminate upon a
64;; material breach of its terms and conditions.
65;;
66;; 7. Nothing in this License Agreement shall be deemed to create any
67;; relationship of agency, partnership, or joint venture between PSF
68;; and Licensee. This License Agreement does not grant permission to
69;; use PSF trademarks or trade name in a trademark sense to endorse or
70;; promote products or services of Licensee, or any third party.
71;;
72;; 8. By copying, installing or otherwise using Python, Licensee
73;; agrees to be bound by the terms and conditions of this License
74;; Agreement.
24 75
25;;; Code: 76;;; Code:
26 77
@@ -664,7 +715,7 @@
664 '((parse-stream . wisent-parse-stream))) 715 '((parse-stream . wisent-parse-stream)))
665 (setq semantic-parser-name "LALR" 716 (setq semantic-parser-name "LALR"
666 semantic--parse-table wisent-python-wy--parse-table 717 semantic--parse-table wisent-python-wy--parse-table
667 semantic-debug-parser-source "wisent-python.wy" 718 semantic-debug-parser-source "python.wy"
668 semantic-flex-keywords-obarray wisent-python-wy--keyword-table 719 semantic-flex-keywords-obarray wisent-python-wy--keyword-table
669 semantic-lex-types-obarray wisent-python-wy--token-table) 720 semantic-lex-types-obarray wisent-python-wy--token-table)
670 ;; Collect unmatched syntax lexical tokens 721 ;; Collect unmatched syntax lexical tokens
@@ -675,10 +726,6 @@
675 726
676;;; Analyzers 727;;; Analyzers
677 728
678(define-lex-keyword-type-analyzer wisent-python-wy--<keyword>-keyword-analyzer
679 "keyword analyzer for <keyword> tokens."
680 "\\(\\sw\\|\\s_\\)+")
681
682(define-lex-block-type-analyzer wisent-python-wy--<block>-block-analyzer 729(define-lex-block-type-analyzer wisent-python-wy--<block>-block-analyzer
683 "block analyzer for <block> tokens." 730 "block analyzer for <block> tokens."
684 "\\s(\\|\\s)" 731 "\\s(\\|\\s)"
@@ -690,18 +737,6 @@
690 ("]" RBRACK)) 737 ("]" RBRACK))
691 ) 738 )
692 739
693(define-lex-regex-type-analyzer wisent-python-wy--<symbol>-regexp-analyzer
694 "regexp analyzer for <symbol> tokens."
695 "\\(\\sw\\|\\s_\\)+"
696 nil
697 'NAME)
698
699(define-lex-regex-type-analyzer wisent-python-wy--<number>-regexp-analyzer
700 "regexp analyzer for <number> tokens."
701 semantic-lex-number-expression
702 nil
703 'NUMBER_LITERAL)
704
705(define-lex-string-type-analyzer wisent-python-wy--<punctuation>-string-analyzer 740(define-lex-string-type-analyzer wisent-python-wy--<punctuation>-string-analyzer
706 "string analyzer for <punctuation> tokens." 741 "string analyzer for <punctuation> tokens."
707 "\\(\\s.\\|\\s$\\|\\s'\\)+" 742 "\\(\\s.\\|\\s$\\|\\s'\\)+"
@@ -745,6 +780,22 @@
745 (LTLTEQ . "<<=")) 780 (LTLTEQ . "<<="))
746 'punctuation) 781 'punctuation)
747 782
783(define-lex-regex-type-analyzer wisent-python-wy--<symbol>-regexp-analyzer
784 "regexp analyzer for <symbol> tokens."
785 "\\(\\sw\\|\\s_\\)+"
786 nil
787 'NAME)
788
789(define-lex-regex-type-analyzer wisent-python-wy--<number>-regexp-analyzer
790 "regexp analyzer for <number> tokens."
791 semantic-lex-number-expression
792 nil
793 'NUMBER_LITERAL)
794
795(define-lex-keyword-type-analyzer wisent-python-wy--<keyword>-keyword-analyzer
796 "keyword analyzer for <keyword> tokens."
797 "\\(\\sw\\|\\s_\\)+")
798
748 799
749;;; Epilogue 800;;; Epilogue
750;; 801;;
diff --git a/lisp/cedet/srecode/srt-wy.el b/lisp/cedet/srecode/srt-wy.el
index 2fb8e7665e9..5bd202093e9 100644
--- a/lisp/cedet/srecode/srt-wy.el
+++ b/lisp/cedet/srecode/srt-wy.el
@@ -18,13 +18,12 @@
18;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 18;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
19 19
20;;; Commentary: 20;;; Commentary:
21 21;;
22;; Generated from srecode-template.wy in the CEDET repository. 22;; This file was generated from admin/grammars/srecode-template.wy.
23 23
24;;; Code: 24;;; Code:
25 25
26(require 'semantic/lex) 26(require 'semantic/lex)
27
28 27
29;;; Prologue 28;;; Prologue
30;; 29;;
@@ -206,10 +205,12 @@
206 205
207 206
208;;; Analyzers 207;;; Analyzers
209;; 208
210(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer 209(define-lex-string-type-analyzer srecode-template-wy--<punctuation>-string-analyzer
211 "keyword analyzer for <keyword> tokens." 210 "string analyzer for <punctuation> tokens."
212 "\\(\\sw\\|\\s_\\)+") 211 "\\s.+"
212 nil
213 'punctuation)
213 214
214(define-lex-regex-type-analyzer srecode-template-wy--<symbol>-regexp-analyzer 215(define-lex-regex-type-analyzer srecode-template-wy--<symbol>-regexp-analyzer
215 "regexp analyzer for <symbol> tokens." 216 "regexp analyzer for <symbol> tokens."
@@ -217,22 +218,20 @@
217 nil 218 nil
218 'symbol) 219 'symbol)
219 220
220(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
221 "sexp analyzer for <string> tokens."
222 "\\s\""
223 'string)
224
225(define-lex-regex-type-analyzer srecode-template-wy--<number>-regexp-analyzer 221(define-lex-regex-type-analyzer srecode-template-wy--<number>-regexp-analyzer
226 "regexp analyzer for <number> tokens." 222 "regexp analyzer for <number> tokens."
227 semantic-lex-number-expression 223 semantic-lex-number-expression
228 nil 224 nil
229 'number) 225 'number)
230 226
231(define-lex-string-type-analyzer srecode-template-wy--<punctuation>-string-analyzer 227(define-lex-sexp-type-analyzer srecode-template-wy--<string>-sexp-analyzer
232 "string analyzer for <punctuation> tokens." 228 "sexp analyzer for <string> tokens."
233 "\\s.+" 229 "\\s\""
234 nil 230 'string)
235 'punctuation) 231
232(define-lex-keyword-type-analyzer srecode-template-wy--<keyword>-keyword-analyzer
233 "keyword analyzer for <keyword> tokens."
234 "\\(\\sw\\|\\s_\\)+")
236 235
237 236
238;;; Epilogue 237;;; Epilogue
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index acfc2486711..df90f6c464f 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -244,7 +244,7 @@ that class.
244 `function' => @dfn{function} 244 `function' => @dfn{function}
245 `variable' => @code{variable} 245 `variable' => @code{variable}
246 `class' => @code{class} @xref{class} 246 `class' => @code{class} @xref{class}
247 `unknown' => @code{unknonwn} 247 `unknown' => @code{unknown}
248 \"text\" => ``text'' 248 \"text\" => ``text''
249 'quoteme => @code{quoteme} 249 'quoteme => @code{quoteme}
250 non-nil => non-@code{nil} 250 non-nil => non-@code{nil}
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-20 17:40:55 +0000