Allow %start after the first rule.

* src/reader.c (grammar_current_rule_begin): Don't set the start symbol
when parsing the first rule.
(check_and_convert_grammar): Search for it here after all grammar
declarations have been parsed.  Skip midrules, which have dummy LHS
nonterminals.
* src/symtab.c (symbol_is_dummy): New function.
* src/symtab.h (symbol_is_dummy): Declare it.
* tests/input.at (%start after first rule): New test.

diff --git a/ChangeLog b/ChangeLog
index 3cc5679f04bcfeb38a53a548d7d2206e0df03fcd..f8867cbce4a6ba4cad7abc51d2e3717bb70572a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-08-19  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Allow %start after the first rule.
+       * src/reader.c (grammar_current_rule_begin): Don't set the start symbol
+       when parsing the first rule.
+       (check_and_convert_grammar): Search for it here after all grammar
+       declarations have been parsed.  Skip midrules, which have dummy LHS
+       nonterminals.
+       * src/symtab.c (symbol_is_dummy): New function.
+       * src/symtab.h (symbol_is_dummy): Declare it.
+       * tests/input.at (%start after first rule): New test.
+
 2006-08-18  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Redo some of the previous commit: add back the ability to use

diff --git a/src/reader.c b/src/reader.c
index 5084618ffb4a5ba465db4dce995620e32ea84574..d380d047ebd0175e59c5269b47340479fbf6599f 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -225,13 +225,6 @@ static symbol_list *previous_rule_end = NULL;
 void
 grammar_current_rule_begin (symbol *lhs, location loc)
 {
-  if (!start_flag)
-    {
-      startsymbol = lhs;
-      startsymbol_location = loc;
-      start_flag = true;
-    }
-
   /* Start a new rule and record its lhs.  */
   ++nrules;
   previous_rule_end = grammar_end;
@@ -607,6 +600,23 @@ check_and_convert_grammar (void)
       endtoken->user_token_number = 0;
     }
 
+  /* Find the start symbol if no %start.  */
+  if (!start_flag)
+    {
+      symbol_list *node;
+      for (node = grammar;
+           node != NULL && symbol_is_dummy (node->sym);
+           node = node->next)
+        {
+          for (node = node->next;
+               node != NULL && node->sym != NULL;
+               node = node->next)
+            ;
+        }
+      assert (node != NULL);
+      grammar_start_symbol_set (node->sym, node->sym->location);
+    }
+
   /* Insert the initial rule, whose line is that of the first rule
      (not that of the start symbol):
 

diff --git a/src/symtab.c b/src/symtab.c
index 37677ed72f8f823a760e14fe99a99f33f002f761..40ba0beea05acbf8130f41c75f7e6d913de8ce64 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -615,6 +615,11 @@ dummy_symbol_get (location loc)
   return sym;
 }
 
+bool
+symbol_is_dummy (const symbol *sym)
+{
+  return sym->tag[0] == '@';
+}
 
 /*-------------------.
 | Free the symbols.  |

diff --git a/src/symtab.h b/src/symtab.h
index 1a3ada4c2ef8fb486cc63b17f0653198bd06e481..647a9e4c182f5da239c87aafd1a1634f76e916fe 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -133,6 +133,9 @@ symbol *symbol_get (const char *key, location loc);
    Its name cannot conflict with the user's names.  */
 symbol *dummy_symbol_get (location loc);
 
+/** Is this a dummy nonterminal?  */
+bool symbol_is_dummy (const symbol *sym);
+
 /** Declare the new symbol \c sym.  Make it an alias of \c symval.  */
 void symbol_make_alias (symbol *sym, symbol *symval, location loc);
 

diff --git a/tests/input.at b/tests/input.at
index 0fce2dd1d3cd4edf1dc9227224d4472b78f8a406..ce1c777ad60d5db8ede0ca3bfd9316f8d3d43e0e 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -537,3 +537,24 @@ input.y:20.1: syntax error, unexpected end of file, expecting ;
 ]])
 
 AT_CLEANUP
+
+
+## ------------------------- ##
+## %start after first rule.  ##
+## ------------------------- ##
+
+AT_SETUP([%start after first rule])
+
+# Bison once complained that a %start after the first rule was a redeclaration
+# of the start symbol.
+
+AT_DATA([input.y],
+[[%%
+false_start: ;
+start: false_start ;
+%start start;
+]])
+
+AT_CHECK([bison -o input.c input.y])
+
+AT_CLEANUP