lalr1.cc: rename lex_symbol as api.token.constructor

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 52c0b13983440fca9fcae407645098f8b6a58795..fb17b0186c41c6b24fa3bb1712d53aac4d5db15b 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -59,7 +59,7 @@ void
 grammar_start_symbol_set (symbol *sym, location loc)
 {
   if (start_flag)
 grammar_start_symbol_set (symbol *sym, location loc)
 {
   if (start_flag)

-    complain_at (loc, complaint, _("multiple %s declarations"), "%start");
+    complain (&loc, complaint, _("multiple %s declarations"), "%start");

   else
     {
       start_flag = true;
   else
     {
       start_flag = true;


@@ -128,11 +128,16 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
   aver (merge_function != NULL && merger_find == merger);
   if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
     {
   aver (merge_function != NULL && merger_find == merger);
   if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
     {

-      complain_at (declaration_loc, complaint,
-                   _("result type clash on merge function %s: <%s> != <%s>"),
-                   quote (merge_function->name), type, merge_function->type);
-      complain_at (merge_function->type_declaration_location, complaint,
-                   _("previous declaration"));
+      unsigned indent = 0;
+      complain_indent (&declaration_loc, complaint, &indent,
+                       _("result type clash on merge function %s: "
+                         "<%s> != <%s>"),
+                       quote (merge_function->name), type,
+                       merge_function->type);
+      indent += SUB_INDENT;
+      complain_indent (&merge_function->type_declaration_location, complaint,
+                       &indent,
+                       _("previous declaration"));

     }
   merge_function->type = uniqstr_new (type);
   merge_function->type_declaration_location = declaration_loc;
     }
   merge_function->type = uniqstr_new (type);
   merge_function->type_declaration_location = declaration_loc;


@@ -197,9 +202,9 @@ assign_named_ref (symbol_list *p, named_ref *name)
 
   if (name->id == sym->tag)
     {
 
   if (name->id == sym->tag)
     {

-      complain_at (name->loc, Wother,
-                   _("duplicated symbol name for %s ignored"),
-                   quote (sym->tag));
+      complain (&name->loc, Wother,
+                _("duplicated symbol name for %s ignored"),
+                quote (sym->tag));

       named_ref_free (name);
     }
   else
       named_ref_free (name);
     }
   else


@@ -242,8 +247,8 @@ grammar_current_rule_begin (symbol *lhs, location loc,
       ++nvars;
     }
   else if (lhs->class == token_sym)
       ++nvars;
     }
   else if (lhs->class == token_sym)

-    complain_at (loc, complaint, _("rule given for %s, which is a token"),
-                 lhs->tag);
+    complain (&loc, complaint, _("rule given for %s, which is a token"),
+              lhs->tag);

 }
 
 
 }
 
 


@@ -297,14 +302,14 @@ grammar_rule_check (const symbol_list *r)
           const char *rhs_type =
             first_rhs->type_name ? first_rhs->type_name : "";
           if (!UNIQSTR_EQ (lhs_type, rhs_type))
           const char *rhs_type =
             first_rhs->type_name ? first_rhs->type_name : "";
           if (!UNIQSTR_EQ (lhs_type, rhs_type))

-            complain_at (r->location, Wother,
-                         _("type clash on default action: <%s> != <%s>"),
-                         lhs_type, rhs_type);
+            complain (&r->location, Wother,
+                      _("type clash on default action: <%s> != <%s>"),
+                      lhs_type, rhs_type);

         }
       /* Warn if there is no default for $$ but we need one.  */
       else
         }
       /* Warn if there is no default for $$ but we need one.  */
       else

-        complain_at (r->location, Wother,
-                     _("empty rule for typed nonterminal, and no action"));
+        complain (&r->location, Wother,
+                  _("empty rule for typed nonterminal, and no action"));

     }
 
   /* Check that symbol values that should be used are in fact used.  */
     }
 
   /* Check that symbol values that should be used are in fact used.  */


@@ -321,9 +326,9 @@ grammar_rule_check (const symbol_list *r)
           {
             warnings warn_flag = midrule_warning ? Wmidrule_values : Wother;
             if (n)
           {
             warnings warn_flag = midrule_warning ? Wmidrule_values : Wother;
             if (n)

-              complain_at (r->location, warn_flag, _("unused value: $%d"), n);
+              complain (&r->location, warn_flag, _("unused value: $%d"), n);

             else
             else

-              complain_at (r->location, warn_flag, _("unset value: $$"));
+              complain (&r->location, warn_flag, _("unset value: $$"));

           }
       }
   }
           }
       }
   }


@@ -334,8 +339,8 @@ grammar_rule_check (const symbol_list *r)
   if (r->ruleprec
       && r->ruleprec->tag[0] != '\'' && r->ruleprec->tag[0] != '"'
       && r->ruleprec->status != declared && !r->ruleprec->prec)
   if (r->ruleprec
       && r->ruleprec->tag[0] != '\'' && r->ruleprec->tag[0] != '"'
       && r->ruleprec->status != declared && !r->ruleprec->prec)

-    complain_at (r->location, Wother,
-                 _("token for %%prec is not defined: %s"), r->ruleprec->tag);
+    complain (&r->location, Wother,
+              _("token for %%prec is not defined: %s"), r->ruleprec->tag);

 }
 
 
 }
 
 


@@ -425,7 +430,7 @@ grammar_current_rule_prec_set (symbol *precsym, location loc)
      token.  */
   symbol_class_set (precsym, token_sym, loc, false);
   if (current_rule->ruleprec)
      token.  */
   symbol_class_set (precsym, token_sym, loc, false);
   if (current_rule->ruleprec)

-    complain_at (loc, complaint, _("only one %s allowed per rule"), "%prec");
+    complain (&loc, complaint, _("only one %s allowed per rule"), "%prec");

   current_rule->ruleprec = precsym;
 }
 
   current_rule->ruleprec = precsym;
 }
 


@@ -435,13 +440,13 @@ void
 grammar_current_rule_dprec_set (int dprec, location loc)
 {
   if (! glr_parser)
 grammar_current_rule_dprec_set (int dprec, location loc)
 {
   if (! glr_parser)

-    complain_at (loc, Wother, _("%s affects only GLR parsers"),
-                 "%dprec");
+    complain (&loc, Wother, _("%s affects only GLR parsers"),
+              "%dprec");

   if (dprec <= 0)
   if (dprec <= 0)

-    complain_at (loc, complaint, _("%s must be followed by positive number"),
-                 "%dprec");
+    complain (&loc, complaint, _("%s must be followed by positive number"),
+              "%dprec");

   else if (current_rule->dprec != 0)
   else if (current_rule->dprec != 0)

-    complain_at (loc, complaint, _("only one %s allowed per rule"), "%dprec");
+    complain (&loc, complaint, _("only one %s allowed per rule"), "%dprec");

   current_rule->dprec = dprec;
 }
 
   current_rule->dprec = dprec;
 }
 


@@ -452,10 +457,10 @@ void
 grammar_current_rule_merge_set (uniqstr name, location loc)
 {
   if (! glr_parser)
 grammar_current_rule_merge_set (uniqstr name, location loc)
 {
   if (! glr_parser)

-    complain_at (loc, Wother, _("%s affects only GLR parsers"),
-                 "%merge");
+    complain (&loc, Wother, _("%s affects only GLR parsers"),
+              "%merge");

   if (current_rule->merger != 0)
   if (current_rule->merger != 0)

-    complain_at (loc, complaint, _("only one %s allowed per rule"), "%merge");
+    complain (&loc, complaint, _("only one %s allowed per rule"), "%merge");

   current_rule->merger = get_merge_function (name);
   current_rule->merger_declaration_location = loc;
 }
   current_rule->merger = get_merge_function (name);
   current_rule->merger_declaration_location = loc;
 }


@@ -554,7 +559,7 @@ packgram (void)
           /* Don't allow rule_length == INT_MAX, since that might
              cause confusion with strtol if INT_MAX == LONG_MAX.  */
           if (rule_length == INT_MAX)
           /* Don't allow rule_length == INT_MAX, since that might
              cause confusion with strtol if INT_MAX == LONG_MAX.  */
           if (rule_length == INT_MAX)

-            complain_at (rules[ruleno].location, fatal, _("rule is too long"));
+            complain (&rules[ruleno].location, fatal, _("rule is too long"));

 
           /* item_number = symbol_number.
              But the former needs to contain more: negative rule numbers. */
 
           /* item_number = symbol_number.
              But the former needs to contain more: negative rule numbers. */


@@ -626,7 +631,7 @@ reader (void)
   gram_parse ();
   prepare_percent_define_front_end_variables ();
 
   gram_parse ();
   prepare_percent_define_front_end_variables ();
 

-  if (! complaint_issued)
+  if (complaint_status  < status_complaint)

     check_and_convert_grammar ();
 
   xfclose (gram_in);
     check_and_convert_grammar ();
 
   xfclose (gram_in);


@@ -636,7 +641,7 @@ static void
 prepare_percent_define_front_end_variables (void)
 {
   /* Set %define front-end variable defaults.  */
 prepare_percent_define_front_end_variables (void)
 {
   /* Set %define front-end variable defaults.  */

-  muscle_percent_define_default ("lr.keep-unreachable-states", "false");
+  muscle_percent_define_default ("lr.keep-unreachable-state", "false");

   {
     char *lr_type;
     /* IELR would be a better default, but LALR is historically the
   {
     char *lr_type;
     /* IELR would be a better default, but LALR is historically the


@@ -644,9 +649,9 @@ prepare_percent_define_front_end_variables (void)
     muscle_percent_define_default ("lr.type", "lalr");
     lr_type = muscle_percent_define_get ("lr.type");
     if (STRNEQ (lr_type, "canonical-lr"))
     muscle_percent_define_default ("lr.type", "lalr");
     lr_type = muscle_percent_define_get ("lr.type");
     if (STRNEQ (lr_type, "canonical-lr"))

-      muscle_percent_define_default ("lr.default-reductions", "most");
+      muscle_percent_define_default ("lr.default-reduction", "most");

     else
     else

-      muscle_percent_define_default ("lr.default-reductions", "accepting");
+      muscle_percent_define_default ("lr.default-reduction", "accepting");

     free (lr_type);
   }
 
     free (lr_type);
   }
 


@@ -654,7 +659,7 @@ prepare_percent_define_front_end_variables (void)
   {
     static char const * const values[] = {
       "lr.type", "lalr", "ielr", "canonical-lr", NULL,
   {
     static char const * const values[] = {
       "lr.type", "lalr", "ielr", "canonical-lr", NULL,

-      "lr.default-reductions", "most", "consistent", "accepting", NULL,
+      "lr.default-reduction", "most", "consistent", "accepting", NULL,

       NULL
     };
     muscle_percent_define_check_values (values);
       NULL
     };
     muscle_percent_define_check_values (values);


@@ -672,7 +677,7 @@ check_and_convert_grammar (void)
 {
   /* Grammar has been read.  Do some checking.  */
   if (nrules == 0)
 {
   /* Grammar has been read.  Do some checking.  */
   if (nrules == 0)

-    complain (fatal, _("no rules in the input grammar"));
+    complain (NULL, fatal, _("no rules in the input grammar"));

 
   /* If the user did not define her ENDTOKEN, do it now. */
   if (!endtoken)
 
   /* If the user did not define her ENDTOKEN, do it now. */
   if (!endtoken)