gengtype.c (create_option): New function.

	* gengtype.c (create_option): New function.
	* gengtype.h: Prototype it.
	* gengtype-yacc.y (stringseq): New rule.
	(option): Use create_option.  Add new bare ID production.  Use
	stringseq, not STRING directly.

	* alias.c, bitmap.c, c-decl.c, cgraph.h, cpplib.h, cselib.h
	* dwarf2out.c, emit-rtl.c, function.h, lists.c, tree.h
	* varray.h, config/alpha/alpha.c, cp/name-lookup.c, cp/parser.c
	* f/com.c, java/builtins.c, java/expr.c, java/jcf.h, java/parse.h:
	Use new shorter form of GTY markers.

	* doc/gty.texi: Rewrite.

From-SVN: r80091

5 files changed, 27 insertions, 22 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7cb754c..3843f9d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-30  Zack Weinberg  <zack@codesourcery.com>
+
+	* builtins.c, expr.c, jcf.h, parse.h: Use new shorter
+	form of GTY markers.
+
 2004-03-25  Marcus Meissner  <meissner@suse.de>
 
 	PR java/14689:
@@ -38,7 +43,7 @@
 	* lang.c (java_handle_option):  Handle new options.
 	* parse.y (build_incomplete_class_ref):  Handle class$ in an inner
 	class in an interface - create helper class nested in outer interface.
-        (build_assertion):  Short-circuit if enable_assertions is false.
+	(build_assertion):  Short-circuit if enable_assertions is false.
 
 2004-03-18  Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
 
@@ -93,7 +98,7 @@
 	!METHOD_INVISIBLE (iface_method).
 	* class.c (layout_class_methods): Check for CLASS_INTERFACE as
 	well as CLASS_ABSTRACT.
-	
+
 2004-02-25  Per Bothner  <per@bothner.com>
 
 	* parse.y (build_assertion):  If we're in an inner class, create the
@@ -176,7 +181,7 @@
 
 2004-01-30  Kelley Cook  <kcook@gcc.gnu.org>
 
-	* Make-lang.in (doc/gcj.dvi): Use $(abs_docdir). 
+	* Make-lang.in (doc/gcj.dvi): Use $(abs_docdir).
 
 2004-01-28  Andrew Pinski  <pinskia@physics.uc.edu>
 
@@ -204,11 +209,11 @@
 	* Make-lang.in: Replace $(docdir) with doc.
 	(java.info, java.srcinfo, java.man, java.srcman): New rules.
 	(java.install-man): Revamp rule.
-	
+
 2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
 
-	* Make-lang.in (JAVA_INSTALL_NAME, JAVA_TARGET_INSTALL_NAME, 
-	GCJH_TARGET_INSTALL_NAME): Define via a immediate $(shell) 
+	* Make-lang.in (JAVA_INSTALL_NAME, JAVA_TARGET_INSTALL_NAME,
+	GCJH_TARGET_INSTALL_NAME): Define via a immediate $(shell)
 	instead of deferred backquote.
 
 2004-01-16  Andrew Pinski  <pinskia@physics.uc.edu>
@@ -264,7 +269,7 @@
 	using indirect dis[atch.
 	(java_decl_ok_for_sibcall): Use output_class, not current_class.
 	(java_get_callee_fndecl): Use class local atable.
-	* jcf-parse.c 
+	* jcf-parse.c
 	(always_initialize_class_p): Decl moved to java-tree.h.
 	(HANDLE_CLASS_INFO): Set output_class.
 	(read_class): Likewise.
@@ -312,13 +317,13 @@
 	Make otable, atable, and ctable class local rather than global.
 	(emit_catch_table): Make otable, atable, and ctable class local
 	rather than global.
-		
+
 2003-12-25  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	* parse.y (catch_clause_parameter): Fix typo.
 
 	PR java/13404
-	* parse.y: (catch_clause_parameter): Return early if $3, aka 
+	* parse.y: (catch_clause_parameter): Return early if $3, aka
 	formal_parameter, is null.
 
 2003-12-20  Kazu Hirata  <kazu@cs.umass.edu>
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index 65fb3e2..563bd8d 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -65,7 +65,7 @@ struct builtin_record GTY(())
 {
   union string_or_tree GTY ((desc ("1"))) class_name;
   union string_or_tree GTY ((desc ("1"))) method_name;
-  builtin_creator_function * GTY((skip (""))) creator;
+  builtin_creator_function * GTY((skip)) creator;
   enum built_in_function builtin_code;
 };
 
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index a4356eb..95c3b69 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -126,7 +126,7 @@ int always_initialize_class_p;
 static GTY(()) tree quick_stack;
 
 /* A free-list of unused permanent TREE_LIST nodes.  */
-static GTY((deletable (""))) tree tree_list_free_list;
+static GTY((deletable)) tree tree_list_free_list;
 
 /* The stack pointer of the Java virtual machine.
    This does include the size of the quick_stack. */
diff --git a/gcc/java/jcf.h b/gcc/java/jcf.h
index b7a6f38..27e0761 100644
--- a/gcc/java/jcf.h
+++ b/gcc/java/jcf.h
@@ -102,19 +102,19 @@ struct ZipDirectory;
 /* JCF encapsulates the state of reading a Java Class File. */
 
 typedef struct JCF GTY(()) {
-  unsigned char * GTY ((skip (""))) buffer;
-  unsigned char * GTY ((skip (""))) buffer_end;
-  unsigned char * GTY ((skip (""))) read_ptr;
-  unsigned char * GTY ((skip (""))) read_end;
+  unsigned char * GTY ((skip)) buffer;
+  unsigned char * GTY ((skip)) buffer_end;
+  unsigned char * GTY ((skip)) read_ptr;
+  unsigned char * GTY ((skip)) read_end;
   int java_source : 1;
   int right_zip : 1;
   int finished : 1;
   jcf_filbuf_t filbuf;
-  PTR GTY ((skip (""))) read_state;
+  PTR GTY ((skip)) read_state;
   const char *filename;
   const char *classname;
   /* Directory entry where it was found.  */
-  struct ZipDirectory * GTY ((skip (""))) zipd;
+  struct ZipDirectory * GTY ((skip)) zipd;
   JCF_u2 access_flags;
   JCF_u2 this_class;
   JCF_u2 super_class;
diff --git a/gcc/java/parse.h b/gcc/java/parse.h
index f845ce2..bedf706 100644
--- a/gcc/java/parse.h
+++ b/gcc/java/parse.h
@@ -728,10 +728,10 @@ struct parser_ctxt GTY(()) {
   const char *filename;		    /* Current filename */
   struct parser_ctxt *next;
 
-  java_lexer * GTY((skip (""))) lexer; /* Current lexer state */
+  java_lexer * GTY((skip)) lexer; /* Current lexer state */
   char marker_begining;		     /* Marker. Should be a sub-struct */
-  struct java_line * GTY ((skip (""))) p_line; /* Previous line */
-  struct java_line * GTY ((skip (""))) c_line; /* Current line */
+  struct java_line * GTY ((skip)) p_line; /* Previous line */
+  struct java_line * GTY ((skip)) c_line; /* Current line */
   java_lc elc;			     /* Error's line column info */
   int ccb_indent;		     /* Keep track of {} indent, lexer */
   int first_ccb_indent1;	     /* First { at ident level 1 */
@@ -739,7 +739,7 @@ struct parser_ctxt GTY(()) {
   int parser_ccb_indent;	     /* Keep track of {} indent, parser */
   int osb_depth;		     /* Current depth of [ in an expression */
   int osb_limit;		     /* Limit of this depth */
-  int * GTY ((skip (""))) osb_number; /* Keep track of ['s */
+  int * GTY ((skip)) osb_number; /* Keep track of ['s */
   int lineno;			     /* Current lineno */
   char marker_end;		     /* End marker. Should be a sub-struct */
 
@@ -774,7 +774,7 @@ struct parser_ctxt GTY(()) {
 
   /* These two lists won't survive file traversal */
   tree  class_list;		    /* List of classes in a CU */
-  jdeplist * GTY((skip (""))) classd_list; /* Classe dependencies in a CU */
+  jdeplist * GTY((skip)) classd_list; /* Classe dependencies in a CU */
   
   tree  current_parsed_class;	    /* Class currently parsed */
   tree  current_parsed_class_un;    /* Curr. parsed class unqualified name */