[Emacs-diffs] /srv/bzr/emacs/trunk r111930: Fix encoding problem in javat-wy.el.

[Paul Eggert]

------------------------------------------------------------
revno: 111930
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-03 23:25:17 -0800
message:
  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.
modified:
  admin/ChangeLog
  admin/grammars/java-tags.wy
  lisp/cedet/ChangeLog
  lisp/cedet/semantic/wisent/javat-wy.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2013-03-03 07:26:39 +0000
+++ b/admin/ChangeLog   2013-03-04 07:25:17 +0000
@@ -1,3 +1,9 @@
+2013-03-04  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.

=== modified file 'admin/grammars/java-tags.wy'
--- a/admin/grammars/java-tags.wy       2013-01-01 09:11:05 +0000
+++ b/admin/grammars/java-tags.wy       2013-03-04 07:25:17 +0000
@@ -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 (<expr>) <stmt> | do <stmt> while (<expr>);"
-  
+
 ;; --------------------------
 ;; 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 @@
   ;
 
 ;;; 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 @@
   ;
 
 ;;; 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_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)

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-01-02 16:13:04 +0000
+++ b/lisp/cedet/ChangeLog      2013-03-04 07:25:17 +0000
@@ -1,3 +1,7 @@
+2013-03-04  Paul Eggert  <address@hidden>
+
+       * semantic/wisent/javat-wy.el: Regenerate.
+
 2012-11-19  Stefan Monnier  <address@hidden>
 
        * semantic/fw.el (semantic-make-local-hook, semantic-mode-line-update):

=== modified file 'lisp/cedet/semantic/wisent/javat-wy.el'
--- a/lisp/cedet/semantic/wisent/javat-wy.el    2013-01-01 09:11:05 +0000
+++ b/lisp/cedet/semantic/wisent/javat-wy.el    2013-03-04 07:25:17 +0000
@@ -1,6 +1,6 @@
 ;;; semantic/wisent/javat-wy.el --- Generated parser support file
 
-;; Copyright (C) 2002, 2007, 2009-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -175,7 +175,7 @@
      ("continue" summary "continue [<label>] ;")
      ("const" summary "Unused reserved word")
      ("class" summary "Class declaration: class <name>")
-     ("char" summary "Integral primitive type ('' to '�') (0 to 65535)")
+     ("char" summary "Integral primitive type (0 to 65535)")
      ("catch" summary "try {<stmts>} catch(<parm>) {<stmts>} ... ")
      ("case" summary "switch(<expr>) {case <const-expr>: <stmts> ... }")
      ("byte" summary "Integral primitive type (-128 to 127)")
@@ -584,24 +584,6 @@
     ("]" RBRACK))
   )
 
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
-  "regexp analyzer for <symbol> tokens."
-  "\\(\\sw\\|\\s_\\)+"
-  nil
-  'IDENTIFIER)
-
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<unicode>-regexp-analyzer
-  "regexp analyzer for <unicode> tokens."
-  "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
-  nil
-  'unicodecharacter)
-
-(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
-  "regexp analyzer for <number> tokens."
-  semantic-lex-number-expression
-  nil
-  'NUMBER_LITERAL)
-
 (define-lex-string-type-analyzer 
wisent-java-tags-wy--<punctuation>-string-analyzer
   "string analyzer for <punctuation> tokens."
   "\\(\\s.\\|\\s$\\|\\s'\\)+"
@@ -647,6 +629,24 @@
     (NOT . "!"))
   'punctuation)
 
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<symbol>-regexp-analyzer
+  "regexp analyzer for <symbol> tokens."
+  "\\(\\sw\\|\\s_\\)+"
+  nil
+  'IDENTIFIER)
+
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<unicode>-regexp-analyzer
+  "regexp analyzer for <unicode> tokens."
+  "\\\\u[0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
+  nil
+  'unicodecharacter)
+
+(define-lex-regex-type-analyzer wisent-java-tags-wy--<number>-regexp-analyzer
+  "regexp analyzer for <number> tokens."
+  semantic-lex-number-expression
+  nil
+  'NUMBER_LITERAL)
+
 (define-lex-sexp-type-analyzer wisent-java-tags-wy--<string>-sexp-analyzer
   "sexp analyzer for <string> tokens."
   "\\s\""