X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9c1e26bd3b5ec47c159fd7eb5db7353380d1b4ac..464c692789eba089bb21ebd3983ebeaa4a8d3312:/data/yacc.c?ds=sidebyside diff --git a/data/yacc.c b/data/yacc.c index b0517a05..dc2d58d6 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -1,8 +1,7 @@ m4_divert(-1) -*- C -*- -m4_include([c.m4]) # Yacc compatible skeleton for Bison -# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 +# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -30,9 +29,6 @@ m4_include([c.m4]) m4_define_default([b4_stack_depth_max], [10000]) m4_define_default([b4_stack_depth_init], [200]) -# Location type. -m4_define_default([b4_location_type], [yyltype]) - ## ------------------------ ## ## Pure/impure interfaces. ## @@ -58,7 +54,7 @@ m4_ifset([b4_parse_param], [b4_c_args(b4_parse_param), ])]) # b4_lex_param # ------------ -# Accumule in b4_lex_param all the yylex arguments. +# Accumulate in b4_lex_param all the yylex arguments. # b4_lex_param arrives quoted twice, but we want to keep only one level. m4_define([b4_lex_param], m4_dquote(b4_pure_if([[[[YYSTYPE *]], [[&yylval]]][]dnl @@ -138,7 +134,7 @@ m4_changecom() m4_divert(0)dnl @output @output_parser_name@ b4_copyright([Skeleton parser for Yacc-like parsing with Bison], - [1984, 1989, 1990, 2000, 2001, 2002])[ + [1984, 1989, 1990, 2000, 2001, 2002, 2003])[ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -186,34 +182,37 @@ b4_location_if([#define yylloc b4_prefix[]lloc])])[ # define YYERROR_VERBOSE ]b4_error_verbose[ #endif -#ifndef YYSTYPE +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) ]m4_ifdef([b4_stype], [b4_syncline([b4_stype_line], [b4_filename]) -typedef union b4_stype yystype; -/* Line __line__ of __file__. */ +typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE; +/* Line __line__ of yacc.c. */ b4_syncline([@oline@], [@ofile@])], -[typedef int yystype;])[ -# define YYSTYPE yystype +[typedef int YYSTYPE;])[ +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 #endif -#ifndef YYLTYPE -typedef struct yyltype +]b4_location_if([#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED) +typedef struct YYLTYPE { int first_line; int first_column; int last_line; int last_column; -} yyltype; -# define YYLTYPE ]b4_location_type[ +} YYLTYPE; +# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +# define YYLTYPE_IS_DECLARED 1 # define YYLTYPE_IS_TRIVIAL 1 #endif +])[ /* Copy the second part of user declarations. */ -]b4_post_prologue[ +]b4_post_prologue -/* Line __line__ of __file__. */ -]b4_syncline([@oline@], [@ofile@])[ +/* Line __line__ of yacc.c. */ +b4_syncline([@oline@], [@ofile@])[ #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -249,7 +248,7 @@ typedef struct yyltype #if (! defined (yyoverflow) \ && (! defined (__cplusplus) \ - || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (]b4_location_if([YYLTYPE_IS_TRIVIAL && ])[YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -261,17 +260,17 @@ union yyalloc [}; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ ]b4_location_if( [# define YYSTACK_BYTES(N) \ ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAX)], + + 2 * YYSTACK_GAP_MAXIMUM)], [# define YYSTACK_BYTES(N) \ ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ - + YYSTACK_GAP_MAX)])[ + + YYSTACK_GAP_MAXIMUM)])[ /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ @@ -302,7 +301,7 @@ union yyalloc YYSIZE_T yynewbytes; \ YYCOPY (&yyptr->Stack, Stack, yysize); \ Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ while (0) @@ -334,114 +333,113 @@ union yyalloc #define YYMAXUTOK ]b4_user_token_number_max[ #define YYTRANSLATE(YYX) \ - ((YYX <= 0) ? YYEOF : \ - (unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ static const ]b4_int_type_for([b4_translate])[ yytranslate[] = { - ]b4_translate + ]b4_translate[ }; #if YYDEBUG -/* YYPRHS[[YYN]] -- Index of the first RHS symbol of rule number YYN in +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const b4_int_type_for([b4_prhs]) yyprhs[[]] = +static const ]b4_int_type_for([b4_prhs])[ yyprhs[] = { - b4_prhs + ]b4_prhs[ }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const b4_int_type_for([b4_rhs]) yyrhs[[]] = +static const ]b4_int_type_for([b4_rhs])[ yyrhs[] = { - b4_rhs + ]b4_rhs[ }; -/* YYRLINE[[YYN]] -- source line where rule number YYN was defined. */ -static const b4_int_type_for([b4_rline]) yyrline[[]] = +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const ]b4_int_type_for([b4_rline])[ yyrline[] = { - b4_rline + ]b4_rline[ }; #endif #if YYDEBUG || YYERROR_VERBOSE -/* YYTNME[[SYMBOL-NUM]] -- String name of the symbol SYMBOL-NUM. +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[[]] = +static const char *const yytname[] = { - b4_tname + ]b4_tname[ }; #endif # ifdef YYPRINT -/* YYTOKNUM[[YYLEX-NUM]] -- Internal token number corresponding to +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const b4_int_type_for([b4_toknum]) yytoknum[[]] = +static const ]b4_int_type_for([b4_toknum])[ yytoknum[] = { - b4_toknum + ]b4_toknum[ }; # endif -/* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives. */ -static const b4_int_type_for([b4_r1]) yyr1[[]] = +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const ]b4_int_type_for([b4_r1])[ yyr1[] = { - b4_r1 + ]b4_r1[ }; -/* YYR2[[YYN]] -- Number of symbols composing right hand side of rule YYN. */ -static const b4_int_type_for([b4_r2]) yyr2[[]] = +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const ]b4_int_type_for([b4_r2])[ yyr2[] = { - b4_r2 + ]b4_r2[ }; -/* YYDEFACT[[STATE-NAME]] -- Default rule to reduce with in state +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const b4_int_type_for([b4_defact]) yydefact[[]] = +static const ]b4_int_type_for([b4_defact])[ yydefact[] = { - b4_defact + ]b4_defact[ }; -/* YYDEFGOTO[[NTERM-NUM]]. */ -static const b4_int_type_for([b4_defgoto]) yydefgoto[[]] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const ]b4_int_type_for([b4_defgoto])[ yydefgoto[] = { - b4_defgoto + ]b4_defgoto[ }; -/* YYPACT[[STATE-NUM]] -- Index in YYTABLE of the portion describing +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF b4_pact_ninf -static const b4_int_type_for([b4_pact]) yypact[[]] = +#define YYPACT_NINF ]b4_pact_ninf[ +static const ]b4_int_type_for([b4_pact])[ yypact[] = { - b4_pact + ]b4_pact[ }; -/* YYPGOTO[[NTERM-NUM]]. */ -static const b4_int_type_for([b4_pgoto]) yypgoto[[]] = +/* YYPGOTO[NTERM-NUM]. */ +static const ]b4_int_type_for([b4_pgoto])[ yypgoto[] = { - b4_pgoto + ]b4_pgoto[ }; -/* YYTABLE[[YYPACT[STATE-NUM]]]. What to do in state STATE-NUM. If +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, parse error. */ -#define YYTABLE_NINF b4_table_ninf -static const b4_int_type_for([b4_table]) yytable[[]] = + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF ]b4_table_ninf[ +static const ]b4_int_type_for([b4_table])[ yytable[] = { - b4_table + ]b4_table[ }; -static const b4_int_type_for([b4_check]) yycheck[[]] = +static const ]b4_int_type_for([b4_check])[ yycheck[] = { - b4_check + ]b4_check[ }; -/* YYSTOS[[STATE-NUM]] -- The (internal number of the) accessing +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const b4_int_type_for([b4_stos]) yystos[[]] = +static const ]b4_int_type_for([b4_stos])[ yystos[] = { - b4_stos[ + ]b4_stos[ }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -461,8 +459,8 @@ static const b4_int_type_for([b4_stos]) yystos[[]] = #endif #define yyerrok (yyerrstatus = 0) -#define yyclearin (yytoken = YYEMPTY) -#define YYEMPTY -2 +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) #define YYEOF 0 #define YYACCEPT goto yyacceptlab @@ -479,7 +477,7 @@ static const b4_int_type_for([b4_stos]) yystos[[]] = #define YYBACKUP(Token, Value) \ do \ - if (yytoken == YYEMPTY && yylen == 1) \ + if (yychar == YYEMPTY && yylen == 1) \ { \ yychar = (Token); \ yylval = (Value); \ @@ -529,11 +527,13 @@ do { \ if (yydebug) \ YYFPRINTF Args; \ } while (0) + # define YYDSYMPRINT(Args) \ do { \ if (yydebug) \ yysymprint Args; \ } while (0) + # define YYDSYMPRINTF(Title, Token, Value, Location) \ do { \ if (yydebug) \ @@ -545,6 +545,51 @@ do { \ } \ } while (0) +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (cinluded). | +`------------------------------------------------------------------*/ + +]b4_c_function_def([yy_stack_print], [static void], + [[short *bottom], [bottom]], + [[short *top], [top]])[ +{ + YYFPRINTF (stderr, "Stack now"); + for (/* Nothing. */; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +]b4_c_function_def([yy_reduce_print], [static void], + [[int yyrule], [yyrule]])[ +{ + int yyi; + unsigned int yylineno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + yyrule - 1, yylineno); + /* Print the symbols being reduced, and their result. */ + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (Rule); \ +} while (0) + /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; @@ -552,8 +597,11 @@ int yydebug; # define YYDPRINTF(Args) # define YYDSYMPRINT(Args) # define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ + /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH ]b4_stack_depth_init[ @@ -633,7 +681,7 @@ yystpcpy (yydest, yysrc) #if YYDEBUG ]b4_yysymprint_generate([b4_c_function_def])[ -#endif /* YYDEBUG. */ +#endif /* ! YYDEBUG */ ]b4_yydestruct_generate([b4_c_function_def]) @@ -647,7 +695,7 @@ int yyparse (); # endif #else /* ! YYPARSE_PARAM */ b4_c_function_decl([yyparse], [int], b4_parse_param) -#endif +#endif /* ! YYPARSE_PARAM */ m4_divert_push([KILL])# ======================== M4 code. @@ -662,7 +710,7 @@ int yychar; /* The semantic value of the lookahead symbol. */ YYSTYPE yylval; -/* Number of parse errors so far. */ +/* Number of syntax errors so far. */ int yynerrs;b4_location_if([ /* Location data for the lookahead symbol. */ YYLTYPE yylloc;]) @@ -719,7 +767,8 @@ b4_c_function_def([yyparse], [int], b4_parse_param) [[ /* The location stack. */ YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp;]])[ + YYLTYPE *yylsp; + YYLTYPE *yylerrsp;]])[ #define YYPOPSTACK (yyvsp--, yyssp--]b4_location_if([, yylsp--])[) @@ -739,7 +788,7 @@ b4_c_function_def([yyparse], [int], b4_parse_param) yystate = 0; yyerrstatus = 0; yynerrs = 0; - yychar = yytoken = YYEMPTY; /* Cause a token to be read. */ + yychar = YYEMPTY; /* Cause a token to be read. */ /* Initialize stack pointers. Waste one element of value and location stack @@ -849,22 +898,21 @@ yybackup: /* Not known => get a lookahead token if don't already have one. */ - /* YYTOKEN is either YYEMPTY or YYEOF or a valid token. */ - if (yytoken == YYEMPTY) + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); yychar = YYLEX; - yytoken = YYTRANSLATE (yychar); } - if (yytoken == YYEOF) + if (yychar <= YYEOF) { + yychar = yytoken = YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } else { - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ + yytoken = YYTRANSLATE (yychar); YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } @@ -889,8 +937,8 @@ yybackup: YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); /* Discard the token being shifted unless it is eof. */ - if (yytoken != YYEOF) - yytoken = YYEMPTY; + if (yychar != YYEOF) + yychar = YYEMPTY; *++yyvsp = yylval; ]b4_location_if([ *++yylsp = yylloc;])[ @@ -934,45 +982,20 @@ yyreduce: ]b4_location_if( [ /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);])[ - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables which - are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - int yyi; - - YYFPRINTF (stderr, "Reducing by rule %d (line %d), ", - yyn - 1, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyn]]); - } -#endif + YY_REDUCE_PRINT (yyn); switch (yyn) ]{ b4_actions } -/* Line __line__ of __file__. */ +/* Line __line__ of yacc.c. */ b4_syncline([@oline@], [@ofile@]) [ yyvsp -= yylen; yyssp -= yylen; ]b4_location_if([ yylsp -= yylen;])[ -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; ]b4_location_if([ *++yylsp = yyloc;])[ @@ -1017,12 +1040,12 @@ yyerrlab: yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) yysize += yystrlen (yytname[yyx]) + 15, yycount++; - yysize += yystrlen ("parse error, unexpected ") + 1; + yysize += yystrlen ("syntax error, unexpected ") + 1; yysize += yystrlen (yytname[yytype]); yymsg = (char *) YYSTACK_ALLOC (yysize); if (yymsg != 0) { - char *yyp = yystpcpy (yymsg, "parse error, unexpected "); + char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); yyp = yystpcpy (yyp, yytname[yytype]); if (yycount < 5) @@ -1043,26 +1066,22 @@ yyerrlab: YYSTACK_FREE (yymsg); } else - yyerror (]b4_yyerror_args["parse error; also virtual memory exhausted"); + yyerror (]b4_yyerror_args["syntax error; also virtual memory exhausted"); } else #endif /* YYERROR_VERBOSE */ - yyerror (]b4_yyerror_args["parse error"); + yyerror (]b4_yyerror_args["syntax error"); } - goto yyerrlab1; +]b4_location_if([ yylerrsp = yylsp;])[ -/*----------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action. | -`----------------------------------------------------*/ -yyerrlab1: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ /* Return failure if at end of input. */ - if (yytoken == YYEOF) + if (yychar == YYEOF) { /* Pop the error token. */ YYPOPSTACK; @@ -1078,12 +1097,39 @@ yyerrlab1: YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); yydestruct (yytoken, &yylval]b4_location_if([, &yylloc])[); - yytoken = YYEMPTY; + yychar = YYEMPTY; +]b4_location_if([ *++yylerrsp = yylloc;])[ } /* Else will try to reuse lookahead token after shifting the error token. */ + goto yyerrlab2; + +/*----------------------------------------------------. +| yyerrlab1 -- error raised explicitly by an action. | +`----------------------------------------------------*/ +yyerrlab1: + + /* Suppress GCC warning that yyerrlab1 is unused when no action + invokes YYERROR. MacOS 10.2.3's buggy "smart preprocessor" + insists on the trailing semicolon. */ +#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) + /* GNU C++ (as of version 3.2.1) does not allow attributes on labels. */ +# ifndef __cplusplus + __attribute__ ((__unused__)); +# endif +#endif + +]b4_location_if([ yylerrsp = yylsp; + *++yylerrsp = yyloc;])[ + goto yyerrlab2; + + +/*---------------------------------------------------------------. +| yyerrlab2 -- pop states until the error token can be shifted. | +`---------------------------------------------------------------*/ +yyerrlab2: yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) @@ -1109,17 +1155,7 @@ yyerrlab1: yyvsp--; yystate = *--yyssp; ]b4_location_if([ yylsp--;])[ - -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "Error: state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + YY_STACK_PRINT (yyss, yyssp); } if (yyn == YYFINAL) @@ -1128,7 +1164,8 @@ yyerrlab1: YYDPRINTF ((stderr, "Shifting error token, ")); *++yyvsp = yylval; -]b4_location_if([ *++yylsp = yylloc;])[ +]b4_location_if([ YYLLOC_DEFAULT (yyloc, yylsp, (yylerrsp - yylsp)); + *++yylsp = yyloc;])[ yystate = yyn; goto yynewstate; @@ -1171,7 +1208,7 @@ b4_epilogue m4_if(b4_defines_flag, 0, [], [@output @output_header_name@ b4_copyright([Skeleton parser for Yacc-like parsing with Bison], - [1984, 1989, 1990, 2000, 2001, 2002]) + [1984, 1989, 1990, 2000, 2001, 2002, 2003]) /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -1180,14 +1217,15 @@ b4_copyright([Skeleton parser for Yacc-like parsing with Bison], b4_token_defines(b4_tokens) -#ifndef YYSTYPE +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) m4_ifdef([b4_stype], [b4_syncline([b4_stype_line], [b4_filename]) -typedef union b4_stype yystype; -/* Line __line__ of __file__. */ +typedef union m4_bregexp(b4_stype, [^{], [YYSTYPE ])b4_stype YYSTYPE; +/* Line __line__ of yacc.c. */ b4_syncline([@oline@], [@ofile@])], -[typedef int yystype;]) -# define YYSTYPE yystype +[typedef int YYSTYPE;]) +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 #endif @@ -1195,15 +1233,17 @@ b4_pure_if([], [extern YYSTYPE b4_prefix[]lval;]) b4_location_if( -[#ifndef YYLTYPE -typedef struct yyltype +[#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED) +typedef struct YYLTYPE { int first_line; int first_column; int last_line; int last_column; -} yyltype; -# define YYLTYPE yyltype +} YYLTYPE; +# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +# define YYLTYPE_IS_DECLARED 1 +# define YYLTYPE_IS_TRIVIAL 1 #endif m4_if(b4_pure, [0],