Output yylloc macro defn in glr.c even if locations are not being generated.

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index 4e59d0ad4ac3f5571b1ab7a77b13b35aa7d1e763..7273805ac09107ba0e1f192591efcce346e770ce 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,6 +1,6 @@
 /* Compute look-ahead criteria for Bison.
 
 /* Compute look-ahead criteria for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002
+   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -239,7 +239,7 @@ build_relations (void)
 
       for (rulep = derives[symbol1 - ntokens]; *rulep; rulep++)
        {
 
       for (rulep = derives[symbol1 - ntokens]; *rulep; rulep++)
        {

-         int done;
+         bool done;

          int length = 1;
          item_number *rp;
          state *s = states[from_state[i]];
          int length = 1;
          item_number *rp;
          state *s = states[from_state[i]];


@@ -256,10 +256,10 @@ build_relations (void)
            add_lookback_edge (s, *rulep, i);
 
          length--;
            add_lookback_edge (s, *rulep, i);
 
          length--;

-         done = 0;
+         done = false;

          while (!done)
            {
          while (!done)
            {

-             done = 1;
+             done = true;

              rp--;
              /* JF added rp>=ritem &&   I hope to god its right! */
              if (rp >= ritem && ISVAR (*rp))
              rp--;
              /* JF added rp>=ritem &&   I hope to god its right! */
              if (rp >= ritem && ISVAR (*rp))


@@ -268,7 +268,7 @@ build_relations (void)
                  edge[nedges++] = map_goto (states1[--length],
                                             item_number_as_symbol_number (*rp));
                  if (nullable[*rp - ntokens])
                  edge[nedges++] = map_goto (states1[--length],
                                             item_number_as_symbol_number (*rp));
                  if (nullable[*rp - ntokens])

-                   done = 0;
+                   done = false;

                }
            }
        }
                }
            }
        }