X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1921f1d7a44530a5196880d52ce83fea60da6255..366eea36d3a9aaccf80a78c2fcd8c3cd6b563e25:/src/parse-gram.y

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 241dcdce..06a32c31 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -34,12 +34,27 @@
 #include "files.h"
 #include "getargs.h"
 #include "output.h"
+#include "symlist.h"
 #include "gram.h"
 #include "reader.h"
 #include "conflicts.h"
 
 /* Produce verbose parse errors.  */
 #define YYERROR_VERBOSE 1
+#define YYLLOC_DEFAULT(Current, Rhs, N)			\
+do {							\
+  if (N)						\
+  {							\
+    Current.first_column  = Rhs[1].first_column;	\
+    Current.first_line    = Rhs[1].first_line;		\
+    Current.last_column   = Rhs[N].last_column;		\
+    Current.last_line     = Rhs[N].last_line;		\
+  }							\
+  else							\
+  {							\
+    Current = Rhs[0];					\
+  }							\
+} while (0)
 
 /* Pass the control structure to YYPARSE and YYLEX. */
 #define YYPARSE_PARAM gram_control
@@ -64,8 +79,10 @@ static void yyprint (FILE *file, const location_t *loc,
 symbol_class current_class = unknown_sym;
 char *current_type = 0;
 symbol_t *current_lhs;
+location_t current_lhs_location;
 associativity current_assoc;
 int current_prec = 0;
+braced_code_t current_braced_code = action_braced_code;
 %}
 
 
@@ -73,6 +90,7 @@ int current_prec = 0;
 %union
 {
   symbol_t *symbol;
+  symbol_list_t *list;
   int integer;
   char *string;
   associativity assoc;
@@ -83,10 +101,19 @@ int current_prec = 0;
 %token STRING CHARACTER
 %token INT
 
-%token PERCENT_TOKEN "%token"
-%token PERCENT_NTERM "%nterm"
-%token PERCENT_TYPE  "%type"
-%token PERCENT_UNION "%union"
+%token PERCENT_TOKEN       "%token"
+%token PERCENT_NTERM       "%nterm"
+
+%token PERCENT_TYPE        "%type"
+%token PERCENT_DESTRUCTOR  "%destructor"
+%token PERCENT_PRINTER     "%printer"
+
+%token PERCENT_UNION       "%union"
+
+%token PERCENT_LEFT        "%left"
+%token PERCENT_RIGHT       "%right"
+%token PERCENT_NONASSOC    "%nonassoc"
+
 %token PERCENT_EXPECT "%expect"
 %token PERCENT_START "%start"
 %token PERCENT_PREC     "%prec"
@@ -125,14 +152,14 @@ int current_prec = 0;
 %type <integer> INT
 %type <symbol> ID symbol string_as_id
 %type <assoc> precedence_declarator
-
+%type <list>  symbols.1
 %%
 
-input: { LOCATION_RESET (yylloc); }
+input:
   declarations "%%" grammar epilogue.opt
     {
       yycontrol->errcode = 0;
-      epilogue_set ($5, @5);
+      epilogue_set ($4, @4);
     }
 ;
 
@@ -171,7 +198,7 @@ grammar_declaration:
 | symbol_declaration
 | "%start" symbol
     {
-      grammar_start_symbol_set ($2);
+      grammar_start_symbol_set ($2, @2);
     }
 | "%union" BRACED_CODE
     {
@@ -179,6 +206,26 @@ grammar_declaration:
       MUSCLE_INSERT_INT ("stype_line", @2.first_line);
       muscle_insert ("stype", $2);
     }
+| "%destructor"
+    { current_braced_code = destructor_braced_code; }
+  BRACED_CODE symbols.1
+    {
+      symbol_list_t *list;
+      for (list = $4; list; list = list->next)
+	symbol_destructor_set (list->sym, list->location, $3);
+      symbol_list_free ($4);
+      current_braced_code = action_braced_code;
+    }
+| "%printer"
+    { current_braced_code = printer_braced_code; }
+  BRACED_CODE symbols.1
+    {
+      symbol_list_t *list;
+      for (list = $4; list; list = list->next)
+	symbol_printer_set (list->sym, $3, list->location);
+      symbol_list_free ($4);
+      current_braced_code = action_braced_code;
+    }
 ;
 
 symbol_declaration:
@@ -192,22 +239,30 @@ symbol_declaration:
       current_class = unknown_sym;
       current_type = NULL;
     }
-| "%type" TYPE {current_type = $2; } nterms_to_type.1
+| "%type" TYPE symbols.1
     {
-      current_type = NULL;
+      symbol_list_t *list;
+      for (list = $3; list; list = list->next)
+	symbol_type_set (list->sym, list->location, $2);
+      symbol_list_free ($3);
     }
 ;
 
 precedence_declaration:
-  precedence_declarator type.opt
-    { current_assoc = $1; ++current_prec; }
-  terms_to_prec.1
-    { current_assoc = non_assoc; current_type = NULL; }
+  precedence_declarator type.opt symbols.1
+    {
+      symbol_list_t *list;
+      ++current_prec;
+      for (list = $3; list; list = list->next)
+	{
+	  symbol_type_set (list->sym, list->location, current_type);
+	  symbol_precedence_set (list->sym, list->location, current_prec, $1);
+	}
+      symbol_list_free ($3);
+      current_type = NULL;
+    }
 ;
 
-%token PERCENT_LEFT     "%left";
-%token PERCENT_RIGHT    "%right";
-%token PERCENT_NONASSOC "%nonassoc";
 precedence_declarator:
   "%left"     { $$ = left_assoc; }
 | "%right"    { $$ = right_assoc; }
@@ -220,23 +275,10 @@ type.opt:
 ;
 
 /* One or more nonterminals to be %typed. */
-nterms_to_type.1:
-  ID                   { symbol_type_set ($1, current_type); }
-| nterms_to_type.1 ID  { symbol_type_set ($2, current_type); }
-;
 
-/* One or more symbols to be given a precedence/associativity.  */
-terms_to_prec.1:
-  symbol
-    {
-      symbol_type_set ($1, current_type);
-      symbol_precedence_set ($1, current_prec, current_assoc);
-    }
-| terms_to_prec.1 symbol
-    {
-      symbol_type_set ($2, current_type);
-      symbol_precedence_set ($2, current_prec, current_assoc);
-    }
+symbols.1:
+  symbol            { $$ = symbol_list_new ($1, @1); }
+| symbols.1 symbol  { $$ = symbol_list_prepend ($1, $2, @2); }
 ;
 
 /* One token definition.  */
@@ -248,24 +290,24 @@ symbol_def:
 | ID
      {
        symbol_class_set ($1, current_class);
-       symbol_type_set ($1, current_type);
+       symbol_type_set ($1, @1, current_type);
      }
 | ID INT
     {
       symbol_class_set ($1, current_class);
-      symbol_type_set ($1, current_type);
+      symbol_type_set ($1, @1, current_type);
       symbol_user_token_number_set ($1, $2);
     }
 | ID string_as_id
     {
       symbol_class_set ($1, current_class);
-      symbol_type_set ($1, current_type);
+      symbol_type_set ($1, @1, current_type);
       symbol_make_alias ($1, $2);
     }
 | ID INT string_as_id
     {
       symbol_class_set ($1, current_class);
-      symbol_type_set ($1, current_type);
+      symbol_type_set ($1, @1, current_type);
       symbol_user_token_number_set ($1, $2);
       symbol_make_alias ($1, $3);
     }
@@ -298,22 +340,22 @@ rules_or_grammar_declaration:
 ;
 
 rules:
-  ID ":" { current_lhs = $1; } rhses.1 ";"
+  ID ":" { current_lhs = $1; current_lhs_location = @1; } rhses.1 ";"
     {;}
 ;
 
 rhses.1:
-  rhs                { grammar_rule_end (); }
-| rhses.1 "|" rhs    { grammar_rule_end (); }
+  rhs                { grammar_rule_end (@1); }
+| rhses.1 "|" rhs    { grammar_rule_end (@3); }
 ;
 
 rhs:
   /* Nothing.  */
-    { grammar_rule_begin (current_lhs); }
+    { grammar_rule_begin (current_lhs, current_lhs_location); }
 | rhs symbol
-    { grammar_current_rule_symbol_append ($2); }
+    { grammar_current_rule_symbol_append ($2, @2); }
 | rhs action
-    { grammar_current_rule_action_append ($2, @2.first_line); }
+    { grammar_current_rule_action_append ($2, @2); }
 | rhs "%prec" symbol
     { grammar_current_rule_prec_set ($3); }
 ;
@@ -321,7 +363,7 @@ rhs:
 symbol:
   ID              { $$ = $1; }
 | string_as_id    { $$ = $1; }
-| CHARACTER       { $$ = getsym ($1); }
+| CHARACTER       { $$ = getsym ($1, @1); }
 ;
 
 action:
@@ -333,7 +375,7 @@ action:
 string_as_id:
   STRING
     {
-      $$ = getsym ($1);
+      $$ = getsym ($1, @1);
       symbol_class_set ($$, token_sym);
     }
 ;