Minor code cleanup.

* src/parse-gram.y: Clean up sorting of declarations.
Use types to simplify %printer declarations where possible.
Provide %printer for BRACKETED_ID and symbol.prec.
* src/symtab.c: Whitespace change.
(cherry picked from commit b143f4048f)

Conflicts:

	src/parse-gram.c
	src/parse-gram.h
	src/parse-gram.y

ChangeLog

@@ -1,3 +1,11 @@
+2009-10-04  Joel E. Denny  <jdenny@clemson.edu>
+
+	Minor code cleanup.
+	* src/parse-gram.y: Clean up sorting of declarations.
+	Use types to simplify %printer declarations where possible.
+	Provide %printer for BRACKETED_ID and symbol.prec.
+	* src/symtab.c: Whitespace change.
+
 2009-10-04  Joel E. Denny  <jdenny@clemson.edu>
 
 	tests: skip tests of file names that platform does not support.

src/parse-gram.h

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.4.1.144-419e.  */
+/* A Bison parser, made by GNU Bison 2.4.1.153-9637-dirty.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
    
@@ -80,19 +80,19 @@
      PERCENT_VERBOSE = 296,
      PERCENT_YACC = 297,
      BRACED_CODE = 298,
-     CHAR = 299,
+     BRACKETED_ID = 299,
-     EPILOGUE = 300,
+     CHAR = 300,
-     EQUAL = 301,
+     EPILOGUE = 301,
-     ID = 302,
+     EQUAL = 302,
-     ID_COLON = 303,
+     ID = 303,
-     PERCENT_PERCENT = 304,
+     ID_COLON = 304,
-     PIPE = 305,
+     PERCENT_PERCENT = 305,
-     PROLOGUE = 306,
+     PIPE = 306,
-     SEMICOLON = 307,
+     PROLOGUE = 307,
-     TYPE = 308,
+     SEMICOLON = 308,
-     TYPE_TAG_ANY = 309,
+     TYPE = 309,
-     TYPE_TAG_NONE = 310,
+     TYPE_TAG_ANY = 310,
-     BRACKETED_ID = 311,
+     TYPE_TAG_NONE = 311,
      PERCENT_UNION = 312
    };
 #endif
@@ -139,19 +139,19 @@
 #define PERCENT_VERBOSE 296
 #define PERCENT_YACC 297
 #define BRACED_CODE 298
-#define CHAR 299
+#define BRACKETED_ID 299
-#define EPILOGUE 300
+#define CHAR 300
-#define EQUAL 301
+#define EPILOGUE 301
-#define ID 302
+#define EQUAL 302
-#define ID_COLON 303
+#define ID 303
-#define PERCENT_PERCENT 304
+#define ID_COLON 304
-#define PIPE 305
+#define PERCENT_PERCENT 305
-#define PROLOGUE 306
+#define PIPE 306
-#define SEMICOLON 307
+#define PROLOGUE 307
-#define TYPE 308
+#define SEMICOLON 308
-#define TYPE_TAG_ANY 309
+#define TYPE 309
-#define TYPE_TAG_NONE 310
+#define TYPE_TAG_ANY 310
-#define BRACKETED_ID 311
+#define TYPE_TAG_NONE 311
 #define PERCENT_UNION 312
 
 

src/parse-gram.y

@@ -160,6 +160,7 @@ static int current_prec = 0;
 ;
 
 %token BRACED_CODE     "{...}"
+%token BRACKETED_ID    "[identifier]"
 %token CHAR            "char"
 %token EPILOGUE        "epilogue"
 %token EQUAL           "="
@@ -172,7 +173,6 @@ static int current_prec = 0;
 %token TYPE            "type"
 %token TYPE_TAG_ANY    "<*>"
 %token TYPE_TAG_NONE   "<>"
-%token BRACKETED_ID    "[identifier]"
 
 %type <character> CHAR
 %printer { fputs (char_name ($$), stderr); } CHAR
@@ -186,21 +186,23 @@ static int current_prec = 0;
 %printer { fprintf (stderr, "{\n%s\n}", $$); }
 	 braceless content.opt "{...}" "%{...%}" EPILOGUE
 
-%type <uniqstr> TYPE ID ID_COLON BRACKETED_ID variable
+%type <uniqstr> BRACKETED_ID ID ID_COLON TYPE variable
-%type <named_ref> named_ref.opt
+%printer { fputs ($$, stderr); } <uniqstr>
-%printer { fprintf (stderr, "<%s>", $$); } TYPE
+%printer { fprintf (stderr, "[%s]", $$); } BRACKETED_ID
-%printer { fputs ($$, stderr); } ID variable
 %printer { fprintf (stderr, "%s:", $$); } ID_COLON
+%printer { fprintf (stderr, "<%s>", $$); } TYPE
 
 %type <integer> INT
-%printer { fprintf (stderr, "%d", $$); } INT
+%printer { fprintf (stderr, "%d", $$); } <integer>
 
-%type <symbol> id id_colon symbol symbol.prec string_as_id
+%type <symbol> id id_colon string_as_id symbol symbol.prec
-%printer { fprintf (stderr, "%s", $$->tag); } id symbol string_as_id
+%printer { fprintf (stderr, "%s", $$->tag); } <symbol>
 %printer { fprintf (stderr, "%s:", $$->tag); } id_colon
 
 %type <assoc> precedence_declarator
 %type <list>  symbols.1 symbols.prec generic_symlist generic_symlist_item
+%type <named_ref> named_ref.opt
+
 %%
 
 input:

src/symtab.c

@@ -454,7 +454,7 @@ static inline void
 symbol_check_alias_consistency (symbol *this)
 {
   symbol *sym = this;
-  symbol *str  = this->alias;
+  symbol *str = this->alias;
 
   /* Check only the symbol in the symbol-string pair.  */
   if (!(this->alias