Merge remote-tracking branch 'origin/maint'

[bison.git] / data / glr.c

diff --git a/data/glr.c b/data/glr.c
index 37f40aee4ff240bc27a87d847567a01ad43fb6a5..509ee123f5997afca57ae67bf0df578cb5de605a 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -215,23 +215,19 @@ b4_token_enums(b4_tokens)
 [[typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1]])])[
 #endif
 [[typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1]])])[
 #endif

-
+]b4_locations_if([[

 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
 typedef struct YYLTYPE
 {
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
 typedef struct YYLTYPE
 {

-]b4_locations_if([

   int first_line;
   int first_column;
   int last_line;
   int last_column;
   int first_line;
   int first_column;
   int last_line;
   int last_column;

-],[
-  char yydummy;
-])[

 } YYLTYPE;
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 } YYLTYPE;
 # define YYLTYPE_IS_DECLARED 1
 # define YYLTYPE_IS_TRIVIAL 1
 #endif

-
+]])[

 ]b4_percent_code_get([[provides]])[]dnl
 ])
 
 ]b4_percent_code_get([[provides]])[]dnl
 ])
 


@@ -511,9 +507,8 @@ m4_if(b4_prefix[], [yy], [],
 #define b4_prefix[]char yychar
 #define b4_prefix[]lval yylval
 #define b4_prefix[]lloc yylloc])],
 #define b4_prefix[]char yychar
 #define b4_prefix[]lval yylval
 #define b4_prefix[]lloc yylloc])],

-[YYSTYPE yylval;
-
-YYLTYPE yylloc;
+[YYSTYPE yylval;]b4_locations_if([[
+YYLTYPE yylloc;]])[

 
 int yynerrs;
 int yychar;])[
 
 int yynerrs;
 int yychar;])[


@@ -716,9 +711,9 @@ struct yyGLRState {
     yySemanticOption* yyfirstVal;
     /** Semantic value for this state.  */
     YYSTYPE yysval;
     yySemanticOption* yyfirstVal;
     /** Semantic value for this state.  */
     YYSTYPE yysval;

-  } yysemantics;
+  } yysemantics;]b4_locations_if([[

   /** Source location for this state.  */
   /** Source location for this state.  */

-  YYLTYPE yyloc;
+  YYLTYPE yyloc;]])[

 };
 
 struct yyGLRStateSet {
 };
 
 struct yyGLRStateSet {


@@ -740,8 +735,8 @@ struct yySemanticOption {
   yyGLRState* yystate;
   /** The lookahead for this reduction.  */
   int yyrawchar;
   yyGLRState* yystate;
   /** The lookahead for this reduction.  */
   int yyrawchar;

-  YYSTYPE yyval;
-  YYLTYPE yyloc;
+  YYSTYPE yyval;]b4_locations_if([[
+  YYLTYPE yyloc;]])[

   /** Next sibling in chain of options.  To facilitate merging,
    *  options are chained in decreasing order by address.  */
   yySemanticOption* yynext;
   /** Next sibling in chain of options.  To facilitate merging,
    *  options are chained in decreasing order by address.  */
   yySemanticOption* yynext;


@@ -762,8 +757,8 @@ struct yyGLRStack {
 [
   int yyerrcnt;
   int yyrawchar;
 [
   int yyerrcnt;
   int yyrawchar;

-  YYSTYPE yyval;
-  YYLTYPE yyloc;
+  YYSTYPE yyval;]b4_locations_if([[
+  YYLTYPE yyloc;]])[

 ])[
   YYJMP_BUF yyexception_buffer;
   yyGLRStackItem* yyitems;
 ])[
   YYJMP_BUF yyexception_buffer;
   yyGLRStackItem* yyitems;


@@ -829,8 +824,8 @@ yyfillin (yyGLRStackItem *yyvsp, int yylow0, int yylow1)
       else
         /* The effect of using yysval or yyloc (in an immediate rule) is
          * undefined.  */
       else
         /* The effect of using yysval or yyloc (in an immediate rule) is
          * undefined.  */

-        yyvsp[i].yystate.yysemantics.yyfirstVal = NULL;
-      yyvsp[i].yystate.yyloc = s->yyloc;
+        yyvsp[i].yystate.yysemantics.yyfirstVal = YY_NULL;]b4_locations_if([[
+      yyvsp[i].yystate.yyloc = s->yyloc;]])[

       s = yyvsp[i].yystate.yypred = s->yypred;
     }
 }
       s = yyvsp[i].yystate.yypred = s->yypred;
     }
 }


@@ -1434,7 +1429,7 @@ yyglrReduce (yyGLRStack* yystackp, size_t yyk, yyRuleNum yyrule,
       YYLTYPE yyloc;])[
 
       yyflag = yydoAction (yystackp, yyk, yyrule, &yysval]b4_locuser_args([&yyloc])[);
       YYLTYPE yyloc;])[
 
       yyflag = yydoAction (yystackp, yyk, yyrule, &yysval]b4_locuser_args([&yyloc])[);

-      if (yyflag == yyerr && yystackp->yysplitPoint != NULL)
+      if (yyflag == yyerr && yystackp->yysplitPoint != YY_NULL)

         {
           YYDPRINTF ((stderr, "Parse on stack %lu rejected by rule #%d.\n",
                      (unsigned long int) yyk, yyrule - 1));
         {
           YYDPRINTF ((stderr, "Parse on stack %lu rejected by rule #%d.\n",
                      (unsigned long int) yyk, yyrule - 1));