java: stype is obsoleted by api.value.type

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index f18b5b82ceb67486c4271be5542151b5d0a8ba53..a2f3bfb1d8cdb66589e8ba147df1a8e55093e99a 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -326,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 (&r->location, warn_flag, _("unused value: $%d"), n);
+              complain (&l->location, warn_flag, _("unused value: $%d"), n);

             else
             else

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

           }
       }
   }
           }
       }
   }


@@ -631,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);