diff options
| author | Paul Eggert | 2013-03-03 23:25:17 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-03-03 23:25:17 -0800 |
| commit | f5572543da4d20babb11309a8972aa185d62c6b6 (patch) | |
| tree | eb038fa09cf60d626996aa06d3e97fa7153cbab8 /admin | |
| parent | f858ded2308479a89396926dd503f95637c85155 (diff) | |
| download | emacs-f5572543da4d20babb11309a8972aa185d62c6b6.tar.gz emacs-f5572543da4d20babb11309a8972aa185d62c6b6.zip | |
Fix encoding problem in javat-wy.el.
* admin/grammars/java-tags.wy (CHAR): Remove "('\u0000' to '\uffff')"
from summary, as this causes javat-wy.el to contain both a null byte
and a byte sequence that is not valid UTF-8, which is inconvenient.
* lisp/cedet/semantic/wisent/javat-wy.el: Regenerate.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 6 | ||||
| -rw-r--r-- | admin/grammars/java-tags.wy | 34 |
2 files changed, 23 insertions, 17 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 9389a6af28f..fe20d77d9f2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-03-04 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * grammars/java-tags.wy (CHAR): Remove "('\u0000' to '\uffff')" | ||
| 4 | from summary, as this causes javat-wy.el to contain both a null byte | ||
| 5 | and a byte sequence that is not valid UTF-8, which is inconvenient. | ||
| 6 | |||
| 1 | 2013-03-03 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2013-03-03 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic. | 9 | * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic. |
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy index 408d0f0da29..71607f452a0 100644 --- a/admin/grammars/java-tags.wy +++ b/admin/grammars/java-tags.wy | |||
| @@ -154,7 +154,7 @@ | |||
| 154 | 154 | ||
| 155 | %keyword CHAR "char" | 155 | %keyword CHAR "char" |
| 156 | %put CHAR summary | 156 | %put CHAR summary |
| 157 | "Integral primitive type ('\u0000' to '\uffff') (0 to 65535)" | 157 | "Integral primitive type (0 to 65535)" |
| 158 | 158 | ||
| 159 | %keyword CLASS "class" | 159 | %keyword CLASS "class" |
| 160 | %put CLASS summary | 160 | %put CLASS summary |
| @@ -312,7 +312,7 @@ | |||
| 312 | %keyword WHILE "while" | 312 | %keyword WHILE "while" |
| 313 | %put WHILE summary | 313 | %put WHILE summary |
| 314 | "while (<expr>) <stmt> | do <stmt> while (<expr>);" | 314 | "while (<expr>) <stmt> | do <stmt> while (<expr>);" |
| 315 | 315 | ||
| 316 | ;; -------------------------- | 316 | ;; -------------------------- |
| 317 | ;; Official javadoc line tags | 317 | ;; Official javadoc line tags |
| 318 | ;; -------------------------- | 318 | ;; -------------------------- |
| @@ -340,27 +340,27 @@ | |||
| 340 | %keyword _AUTHOR "@author" | 340 | %keyword _AUTHOR "@author" |
| 341 | %put _AUTHOR javadoc (seq 1 usage (type)) | 341 | %put _AUTHOR javadoc (seq 1 usage (type)) |
| 342 | %keyword _VERSION "@version" | 342 | %keyword _VERSION "@version" |
| 343 | %put _VERSION javadoc (seq 2 usage (type)) | 343 | %put _VERSION javadoc (seq 2 usage (type)) |
| 344 | %keyword _PARAM "@param" | 344 | %keyword _PARAM "@param" |
| 345 | %put _PARAM javadoc (seq 3 usage (function) with-name t) | 345 | %put _PARAM javadoc (seq 3 usage (function) with-name t) |
| 346 | %keyword _RETURN "@return" | 346 | %keyword _RETURN "@return" |
| 347 | %put _RETURN javadoc (seq 4 usage (function)) | 347 | %put _RETURN javadoc (seq 4 usage (function)) |
| 348 | %keyword _EXCEPTION "@exception" | 348 | %keyword _EXCEPTION "@exception" |
| 349 | %put _EXCEPTION javadoc (seq 5 usage (function) with-name t) | 349 | %put _EXCEPTION javadoc (seq 5 usage (function) with-name t) |
| 350 | %keyword _THROWS "@throws" | 350 | %keyword _THROWS "@throws" |
| 351 | %put _THROWS javadoc (seq 6 usage (function) with-name t) | 351 | %put _THROWS javadoc (seq 6 usage (function) with-name t) |
| 352 | %keyword _SEE "@see" | 352 | %keyword _SEE "@see" |
| 353 | %put _SEE javadoc (seq 7 usage (type function variable) opt t with-ref t) | 353 | %put _SEE javadoc (seq 7 usage (type function variable) opt t with-ref t) |
| 354 | %keyword _SINCE "@since" | 354 | %keyword _SINCE "@since" |
| 355 | %put _SINCE javadoc (seq 8 usage (type function variable) opt t) | 355 | %put _SINCE javadoc (seq 8 usage (type function variable) opt t) |
| 356 | %keyword _SERIAL "@serial" | 356 | %keyword _SERIAL "@serial" |
| 357 | %put _SERIAL javadoc (seq 9 usage (variable) opt t) | 357 | %put _SERIAL javadoc (seq 9 usage (variable) opt t) |
| 358 | %keyword _SERIALDATA "@serialData" | 358 | %keyword _SERIALDATA "@serialData" |
| 359 | %put _SERIALDATA javadoc (seq 10 usage (function) opt t) | 359 | %put _SERIALDATA javadoc (seq 10 usage (function) opt t) |
| 360 | %keyword _SERIALFIELD "@serialField" | 360 | %keyword _SERIALFIELD "@serialField" |
| 361 | %put _SERIALFIELD javadoc (seq 11 usage (variable) opt t) | 361 | %put _SERIALFIELD javadoc (seq 11 usage (variable) opt t) |
| 362 | %keyword _DEPRECATED "@deprecated" | 362 | %keyword _DEPRECATED "@deprecated" |
| 363 | %put _DEPRECATED javadoc (seq 12 usage (type function variable) opt t) | 363 | %put _DEPRECATED javadoc (seq 12 usage (type function variable) opt t) |
| 364 | 364 | ||
| 365 | %% | 365 | %% |
| 366 | 366 | ||
| @@ -387,7 +387,7 @@ package_declaration | |||
| 387 | ; | 387 | ; |
| 388 | 388 | ||
| 389 | ;;; Include file token | 389 | ;;; Include file token |
| 390 | ;; ("FILE" include SYSTEM "DOCSTRING") | 390 | ;; ("FILE" include SYSTEM "DOCSTRING") |
| 391 | import_declaration | 391 | import_declaration |
| 392 | : IMPORT qualified_name SEMICOLON | 392 | : IMPORT qualified_name SEMICOLON |
| 393 | (INCLUDE-TAG $2 nil) | 393 | (INCLUDE-TAG $2 nil) |
| @@ -476,7 +476,7 @@ static_initializer | |||
| 476 | ; | 476 | ; |
| 477 | 477 | ||
| 478 | ;;; Function token | 478 | ;;; Function token |
| 479 | ;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") | 479 | ;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") |
| 480 | constructor_declaration | 480 | constructor_declaration |
| 481 | : modifiers_opt constructor_declarator throwsc_opt constructor_body | 481 | : modifiers_opt constructor_declarator throwsc_opt constructor_body |
| 482 | (FUNCTION-TAG (car $2) nil (cdr $2) | 482 | (FUNCTION-TAG (car $2) nil (cdr $2) |
| @@ -491,11 +491,11 @@ constructor_declarator | |||
| 491 | ; | 491 | ; |
| 492 | 492 | ||
| 493 | constructor_body | 493 | constructor_body |
| 494 | : block | 494 | : block |
| 495 | ; | 495 | ; |
| 496 | 496 | ||
| 497 | ;;; Function token | 497 | ;;; Function token |
| 498 | ;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") | 498 | ;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") |
| 499 | method_declaration | 499 | method_declaration |
| 500 | : modifiers_opt VOID method_declarator throwsc_opt method_body | 500 | : modifiers_opt VOID method_declarator throwsc_opt method_body |
| 501 | (FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4) | 501 | (FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4) |