Minor code cleanup.

[bison.git] / data / lalr1.java

diff --git a/data/lalr1.java b/data/lalr1.java
index 646b77721f5a766a1368b2fd0527e13102ad45bf..6637c3a214f2aa7df735edf685311c68ebca8f3f 100644 (file)
--- a/data/lalr1.java
+++ b/data/lalr1.java
@@ -533,7 +533,7 @@ m4_popdef([b4_at_dollar])])dnl
 
         /* Take a decision.  First try without lookahead.  */
         yyn = yypact_[yystate];
 
         /* Take a decision.  First try without lookahead.  */
         yyn = yypact_[yystate];

-        if (yyn == yypact_ninf_)
+        if (yy_pact_value_is_default_ (yyn))

           {
             label = YYDEFAULT;
             break;
           {
             label = YYDEFAULT;
             break;


@@ -572,7 +572,7 @@ m4_popdef([b4_at_dollar])])dnl
         /* <= 0 means reduce or error.  */
         else if ((yyn = yytable_[yyn]) <= 0)
           {
         /* <= 0 means reduce or error.  */
         else if ((yyn = yytable_[yyn]) <= 0)
           {

-            if (yyn == 0 || yyn == yytable_ninf_)
+            if (yy_table_value_is_error_ (yyn))

               label = YYFAIL;
             else
               {
               label = YYFAIL;
             else
               {


@@ -676,7 +676,7 @@ m4_popdef([b4_at_dollar])])dnl
         for (;;)
           {
             yyn = yypact_[yystate];
         for (;;)
           {
             yyn = yypact_[yystate];

-            if (yyn != yypact_ninf_)
+            if (!yy_pact_value_is_default_ (yyn))

               {
                 yyn += yyterror_;
                 if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)
               {
                 yyn += yyterror_;
                 if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)


@@ -745,7 +745,7 @@ m4_popdef([b4_at_dollar])])dnl
             int count = 0;
             for (int x = yyxbegin; x < yyxend; ++x)
               if (yycheck_[x + yyn] == x && x != yyterror_
             int count = 0;
             for (int x = yyxbegin; x < yyxend; ++x)
               if (yycheck_[x + yyn] == x && x != yyterror_

-                  && yycheck_[x + yyn] != yytable_ninf_)
+                  && !yy_table_value_is_error_ (yytable_[x + yyn]))

                 ++count;
 
             // FIXME: This method of building the message is not compatible
                 ++count;
 
             // FIXME: This method of building the message is not compatible


@@ -757,7 +757,7 @@ m4_popdef([b4_at_dollar])])dnl
                 count = 0;
                 for (int x = yyxbegin; x < yyxend; ++x)
                   if (yycheck_[x + yyn] == x && x != yyterror_
                 count = 0;
                 for (int x = yyxbegin; x < yyxend; ++x)
                   if (yycheck_[x + yyn] == x && x != yyterror_

-                      && yycheck_[x + yyn] != yytable_ninf_)
+                      && !yy_table_value_is_error_ (yytable_[x + yyn]))

                     {
                       res.append (count++ == 0 ? ", expecting " : " or ");
                       res.append (yytnamerr_ (yytname_[x]));
                     {
                       res.append (count++ == 0 ? ", expecting " : " or ");
                       res.append (yytnamerr_ (yytname_[x]));


@@ -770,6 +770,24 @@ m4_popdef([b4_at_dollar])])dnl
     return "syntax error";
   }
 
     return "syntax error";
   }
 

+  /**
+   * Whether the given <code>yypact_</code> value indicates a defaulted state.
+   * @@param yyvalue   the value to check
+   */
+  private static boolean yy_pact_value_is_default_ (int yyvalue)
+  {
+    return yyvalue == yypact_ninf_;
+  }
+
+  /**
+   * Whether the given <code>yytable_</code> value indicates a syntax error.
+   * @@param yyvalue   the value to check
+   */
+  private static boolean yy_table_value_is_error_ (int yyvalue)
+  {
+    return yyvalue == yytable_ninf_;
+  }
+

   private static final ]b4_int_type_for([b4_pact])[ yypact_ninf_ = ]b4_pact_ninf[;
   private static final ]b4_int_type_for([b4_table])[ yytable_ninf_ = ]b4_table_ninf[;
 
   private static final ]b4_int_type_for([b4_pact])[ yypact_ninf_ = ]b4_pact_ninf[;
   private static final ]b4_int_type_for([b4_table])[ yytable_ninf_ = ]b4_table_ninf[;