X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e776192e4fcb3b34d8a279d7cc1ea153e96ae2e7..b63473552d7014a4868eb32bf90e4f4814b9be39:/src/parse-gram.y?ds=sidebyside

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 66b8c68e..6e9faa74 100644
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -30,6 +30,7 @@
 
 %{
 #include "system.h"
+#include "complain.h"
 #include "muscle_tab.h"
 #include "files.h"
 #include "getargs.h"
@@ -63,11 +64,11 @@ do {							\
    correctly typed access to it.  */
 #define yycontrol ((gram_control_t *) gram_control)
 
-/* Request detailed parse error messages, and pass them to
-   GRAM_ERROR. */
+/* Request detailed parse error messages, and pass them to GRAM_ERROR.
+   FIXME: depends on the undocumented availability of YYLLOC.t */
 #undef  yyerror
 #define yyerror(Msg) \
-        gram_error (yycontrol, &yylloc, Msg)
+        gram_error (&yylloc, Msg)
 
 #define YYPRINT(File, Type, Value) \
         yyprint (File, Type, &Value)
@@ -77,7 +78,7 @@ symbol_class current_class = unknown_sym;
 char *current_type = 0;
 symbol_t *current_lhs;
 location_t current_lhs_location;
-associativity current_assoc;
+assoc_t current_assoc;
 int current_prec = 0;
 braced_code_t current_braced_code = action_braced_code;
 %}
@@ -90,10 +91,10 @@ braced_code_t current_braced_code = action_braced_code;
   symbol_list_t *list;
   int integer;
   char *string;
-  associativity assoc;
+  assoc_t assoc;
 };
 
-/* Define the tokens together with there human representation. */
+/* Define the tokens together with their human representation.  */
 %token GRAM_EOF 0 "end of string"
 %token STRING CHARACTER
 %token INT
@@ -114,6 +115,8 @@ braced_code_t current_braced_code = action_braced_code;
 %token PERCENT_EXPECT "%expect"
 %token PERCENT_START "%start"
 %token PERCENT_PREC     "%prec"
+%token PERCENT_DPREC    "%dprec"
+%token PERCENT_MERGE    "%merge"
 %token PERCENT_VERBOSE  "%verbose"
 %token PERCENT_ERROR_VERBOSE "%error-verbose"
 
@@ -123,6 +126,7 @@ braced_code_t current_braced_code = action_braced_code;
 
 %token PERCENT_DEFINE "%define"
 %token PERCENT_PURE_PARSER "%pure-parser"
+%token PERCENT_GLR_PARSER "%glr-parser"
 
 %token PERCENT_DEFINES "%defines"
 
@@ -184,6 +188,7 @@ declaration:
 | "%no-lines"                              { no_lines_flag = 1; }
 | "%output" "=" string_content             { spec_outfile = $3; }
 | "%pure-parser"                           { pure_parser = 1; }
+| "%glr-parser" 			   { glr_parser = 1; }
 | "%skeleton" string_content               { skeleton = $2; }
 | "%token-table"                           { token_table_flag = 1; }
 | "%verbose"                               { report_flag = 1; }
@@ -209,7 +214,7 @@ grammar_declaration:
     {
       symbol_list_t *list;
       for (list = $4; list; list = list->next)
-	symbol_destructor_set (list->sym, list->location, $3);
+	symbol_destructor_set (list->sym, $3, @3);
       symbol_list_free ($4);
       current_braced_code = action_braced_code;
     }
@@ -240,7 +245,7 @@ symbol_declaration:
     {
       symbol_list_t *list;
       for (list = $3; list; list = list->next)
-	symbol_type_set (list->sym, list->location, $2);
+	symbol_type_set (list->sym, $2, @2);
       symbol_list_free ($3);
     }
 ;
@@ -252,8 +257,8 @@ precedence_declaration:
       ++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_type_set (list->sym, current_type, @2);
+	  symbol_precedence_set (list->sym, current_prec, $1, @1);
 	}
       symbol_list_free ($3);
       current_type = NULL;
@@ -287,26 +292,26 @@ symbol_def:
 | ID
      {
        symbol_class_set ($1, current_class, @1);
-       symbol_type_set ($1, @1, current_type);
+       symbol_type_set ($1, current_type, @1);
      }
 | ID INT
     {
       symbol_class_set ($1, current_class, @1);
-      symbol_type_set ($1, @1, current_type);
+      symbol_type_set ($1, current_type, @1);
       symbol_user_token_number_set ($1, $2, @2);
     }
 | ID string_as_id
     {
       symbol_class_set ($1, current_class, @1);
-      symbol_type_set ($1, @1, current_type);
-      symbol_make_alias ($1, $2);
+      symbol_type_set ($1, current_type, @1);
+      symbol_make_alias ($1, $2, @$);
     }
 | ID INT string_as_id
     {
       symbol_class_set ($1, current_class, @1);
-      symbol_type_set ($1, @1, current_type);
+      symbol_type_set ($1, current_type, @1);
       symbol_user_token_number_set ($1, $2, @2);
-      symbol_make_alias ($1, $3);
+      symbol_make_alias ($1, $3, @$);
     }
 ;
 
@@ -334,6 +339,14 @@ grammar:
 rules_or_grammar_declaration:
   rules
 | grammar_declaration ";"
+    {
+      if (yacc_flag)
+	complain_at (@$, _("POSIX forbids declarations in the grammar"));
+    }
+| error ";"
+    {
+      yyerrok;
+    }
 ;
 
 rules:
@@ -355,12 +368,16 @@ rhs:
     { grammar_current_rule_action_append ($2, @2); }
 | rhs "%prec" symbol
     { grammar_current_rule_prec_set ($3, @3); }
+| rhs "%dprec" INT
+    { grammar_current_rule_dprec_set ($3, @3); }
+| rhs "%merge" TYPE
+    { grammar_current_rule_merge_set ($3, @3); }
 ;
 
 symbol:
   ID              { $$ = $1; }
 | string_as_id    { $$ = $1; }
-| CHARACTER       { $$ = getsym ($1, @1); }
+| CHARACTER       { $$ = symbol_get ($1, @1); }
 ;
 
 action:
@@ -372,7 +389,7 @@ action:
 string_as_id:
   STRING
     {
-      $$ = getsym ($1, @1);
+      $$ = symbol_get ($1, @1);
       symbol_class_set ($$, token_sym, @1);
     }
 ;
@@ -442,9 +459,7 @@ yyprint (FILE *file,
 }
 
 void
-gram_error (gram_control_t *control ATTRIBUTE_UNUSED,
-	    location_t *yylloc, const char *msg)
+gram_error (location_t *yylloc, const char *msg)
 {
-  LOCATION_PRINT (stderr, *yylloc);
-  fprintf (stderr, ": %s\n", msg);
+  complain_at (*yylloc, "%s", msg);
 }