[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Minor code cleanup.
From: |
Joel E. Denny |
Subject: |
[PATCH] Minor code cleanup. |
Date: |
Mon, 5 Oct 2009 00:18:37 -0400 (EDT) |
User-agent: |
Alpine 1.00 (DEB 882 2007-12-20) |
I pushed this to master and branch-2.5.
>From b143f4048fe39451ec739d956b4ca1f4fd8e694d Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Sun, 4 Oct 2009 23:44:44 -0400
Subject: [PATCH] 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.
---
ChangeLog | 8 +
src/parse-gram.c | 666 +++++++++++++++++++++++++++--------------------------
src/parse-gram.h | 58 +++---
src/parse-gram.y | 15 +-
src/symtab.c | 2 +-
5 files changed, 385 insertions(+), 364 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7389708..90f6c23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-10-04 Joel E. Denny <address@hidden>
+ 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 <address@hidden>
+
tests: skip tests of file names that platform does not support.
Reported by Michael Raskin at
<http://lists.gnu.org/archive/html/bug-bison/2009-09/msg00001.html>.
diff --git a/src/parse-gram.y b/src/parse-gram.y
index 487d115..4d48d7a 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -151,6 +151,7 @@ static char const *char_name (char);
;
%token BRACED_CODE "{...}"
+%token BRACKETED_ID "[identifier]"
%token CHAR "char"
%token EPILOGUE "epilogue"
%token EQUAL "="
@@ -163,7 +164,6 @@ static char const *char_name (char);
%token TAG "<tag>"
%token TAG_ANY "<*>"
%token TAG_NONE "<>"
-%token BRACKETED_ID "[identifier]"
%type <character> CHAR
%printer { fputs (char_name ($$), stderr); } CHAR
@@ -177,22 +177,23 @@ static char const *char_name (char);
%printer { fprintf (stderr, "{\n%s\n}", $$); }
braceless content.opt "{...}" "%{...%}" EPILOGUE
-%type <uniqstr> TAG ID ID_COLON BRACKETED_ID PERCENT_FLAG variable
-%type <named_ref> named_ref.opt
-%printer { fputs ($$, stderr); } ID variable
+%type <uniqstr> BRACKETED_ID ID ID_COLON PERCENT_FLAG TAG variable
+%printer { fputs ($$, stderr); } <uniqstr>
+%printer { fprintf (stderr, "[%s]", $$); } BRACKETED_ID
%printer { fprintf (stderr, "%s:", $$); } ID_COLON
%printer { fprintf (stderr, "%%%s", $$); } PERCENT_FLAG
%printer { fprintf (stderr, "<%s>", $$); } TAG
%type <integer> INT
-%printer { fprintf (stderr, "%d", $$); } INT
+%printer { fprintf (stderr, "%d", $$); } <integer>
-%type <symbol> id id_colon symbol symbol.prec string_as_id
-%printer { fprintf (stderr, "%s", $$->tag); } id symbol string_as_id
+%type <symbol> id id_colon string_as_id symbol symbol.prec
+%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
/*---------.
| %param. |
diff --git a/src/symtab.c b/src/symtab.c
index 0a3c447..ce29dfc 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -489,7 +489,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
--
1.5.4.3
- [PATCH] Minor code cleanup.,
Joel E. Denny <=