From f5572543da4d20babb11309a8972aa185d62c6b6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 3 Mar 2013 23:25:17 -0800 Subject: [PATCH] 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. --- admin/ChangeLog | 6 +++++ admin/grammars/java-tags.wy | 34 ++++++++++++------------- lisp/cedet/ChangeLog | 4 +++ lisp/cedet/semantic/wisent/javat-wy.el | Bin 19300 -> 19273 bytes 4 files changed, 27 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 @@ +2013-03-04 Paul Eggert + + * 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. + 2013-03-03 Paul Eggert * 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 @@ %keyword CHAR "char" %put CHAR summary -"Integral primitive type ('\u0000' to '\uffff') (0 to 65535)" +"Integral primitive type (0 to 65535)" %keyword CLASS "class" %put CLASS summary @@ -312,7 +312,7 @@ %keyword WHILE "while" %put WHILE summary "while () | do while ();" - + ;; -------------------------- ;; Official javadoc line tags ;; -------------------------- @@ -340,27 +340,27 @@ %keyword _AUTHOR "@author" %put _AUTHOR javadoc (seq 1 usage (type)) %keyword _VERSION "@version" -%put _VERSION javadoc (seq 2 usage (type)) +%put _VERSION javadoc (seq 2 usage (type)) %keyword _PARAM "@param" -%put _PARAM javadoc (seq 3 usage (function) with-name t) +%put _PARAM javadoc (seq 3 usage (function) with-name t) %keyword _RETURN "@return" -%put _RETURN javadoc (seq 4 usage (function)) +%put _RETURN javadoc (seq 4 usage (function)) %keyword _EXCEPTION "@exception" -%put _EXCEPTION javadoc (seq 5 usage (function) with-name t) +%put _EXCEPTION javadoc (seq 5 usage (function) with-name t) %keyword _THROWS "@throws" -%put _THROWS javadoc (seq 6 usage (function) with-name t) +%put _THROWS javadoc (seq 6 usage (function) with-name t) %keyword _SEE "@see" -%put _SEE javadoc (seq 7 usage (type function variable) opt t with-ref t) +%put _SEE javadoc (seq 7 usage (type function variable) opt t with-ref t) %keyword _SINCE "@since" -%put _SINCE javadoc (seq 8 usage (type function variable) opt t) +%put _SINCE javadoc (seq 8 usage (type function variable) opt t) %keyword _SERIAL "@serial" -%put _SERIAL javadoc (seq 9 usage (variable) opt t) +%put _SERIAL javadoc (seq 9 usage (variable) opt t) %keyword _SERIALDATA "@serialData" -%put _SERIALDATA javadoc (seq 10 usage (function) opt t) +%put _SERIALDATA javadoc (seq 10 usage (function) opt t) %keyword _SERIALFIELD "@serialField" -%put _SERIALFIELD javadoc (seq 11 usage (variable) opt t) +%put _SERIALFIELD javadoc (seq 11 usage (variable) opt t) %keyword _DEPRECATED "@deprecated" -%put _DEPRECATED javadoc (seq 12 usage (type function variable) opt t) +%put _DEPRECATED javadoc (seq 12 usage (type function variable) opt t) %% @@ -387,7 +387,7 @@ package_declaration ; ;;; Include file token -;; ("FILE" include SYSTEM "DOCSTRING") +;; ("FILE" include SYSTEM "DOCSTRING") import_declaration : IMPORT qualified_name SEMICOLON (INCLUDE-TAG $2 nil) @@ -476,7 +476,7 @@ static_initializer ; ;;; Function token -;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") +;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") constructor_declaration : modifiers_opt constructor_declarator throwsc_opt constructor_body (FUNCTION-TAG (car $2) nil (cdr $2) @@ -491,11 +491,11 @@ constructor_declarator ; constructor_body - : block + : block ; ;;; Function token -;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") +;; ("NAME" function "TYPE" ( ARG-LIST ) EXTRA-SPEC "DOCSTRING") method_declaration : modifiers_opt VOID method_declarator throwsc_opt method_body (FUNCTION-TAG (car $3) $2 (cdr $3) :typemodifiers $1 :throws $4) diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 60c15e17184..9968d3faa62 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,7 @@ +2013-03-04 Paul Eggert + + * semantic/wisent/javat-wy.el: Regenerate. + 2012-11-19 Stefan Monnier * semantic/fw.el (semantic-make-local-hook, semantic-mode-line-update): diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el index e666b9c419101e902d55ed00982e9adf51cb63c0..f082358c4f50a00236c17076c8cb057b5a960ca0 100644 GIT binary patch delta 50 zcmV-20L}m8mI29@0gzY)Eiy1MGm}998?l5l7_-J0)+e*ELZ1VZKtU>#c}W_x;6Ty= Ivr$G91>g!2w*UYD delta 59 zcmX>(jq%Ae#t9KTItoSx2IgSWa$`iW1g|=Sx