[llvm-commits] CVS: llvm-stacker/lib/compiler/StackerParser.cpp.cvs StackerParser.h.cvs StackerParser.y StackerParser.y.cvs
Reid Spencer
reid at x10sys.com
Mon Feb 5 12:48:35 PST 2007
Changes in directory llvm-stacker/lib/compiler:
StackerParser.cpp.cvs updated: 1.1 -> 1.2
StackerParser.h.cvs updated: 1.1 -> 1.2
StackerParser.y updated: 1.7 -> 1.8
StackerParser.y.cvs updated: 1.1 -> 1.2
---
Log message:
For PR411: http://llvm.org/PR411 :
This patch replaces the SymbolTable class with ValueSymbolTable which does
not support types planes. This means that all symbol names in LLVM must now
be unique. The patch addresses the necessary changes to deal with this and
removes code no longer needed as a result. This completes the bulk of the
changes for this PR. Some cleanup patches will follow.
---
Diffs of the changes: (+508 -354)
StackerParser.cpp.cvs | 845 +++++++++++++++++++++++++++++---------------------
StackerParser.h.cvs | 15
StackerParser.y | 1
StackerParser.y.cvs | 1
4 files changed, 508 insertions(+), 354 deletions(-)
Index: llvm-stacker/lib/compiler/StackerParser.cpp.cvs
diff -u llvm-stacker/lib/compiler/StackerParser.cpp.cvs:1.1 llvm-stacker/lib/compiler/StackerParser.cpp.cvs:1.2
--- llvm-stacker/lib/compiler/StackerParser.cpp.cvs:1.1 Wed Feb 15 01:26:07 2006
+++ llvm-stacker/lib/compiler/StackerParser.cpp.cvs Mon Feb 5 14:47:20 2007
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875c. */
+/* A Bison parser, made by GNU Bison 2.1. */
/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
@@ -36,6 +36,9 @@
/* Identify Bison output. */
#define YYBISON 1
+/* Bison version. */
+#define YYBISON_VERSION "2.1"
+
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -45,8 +48,7 @@
/* Using locations. */
#define YYLSP_NEEDED 0
-/* If NAME_PREFIX is specified substitute the variables and functions
- names. */
+/* Substitute the variable and function names. */
#define yyparse Stackerparse
#define yylex Stackerlex
#define yyerror Stackererror
@@ -137,6 +139,7 @@
OUT_CHAR = 330
};
#endif
+/* Tokens. */
#define INTEGER 258
#define STRING 259
#define IDENTIFIER 260
@@ -215,10 +218,9 @@
/* Copy the first part of user declarations. */
-#line 14 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
+#line 14 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
#include "StackerCompiler.h"
-#include "llvm/SymbolTable.h"
#include "llvm/Module.h"
#include "llvm/Instructions.h"
#include "llvm/ADT/STLExtras.h"
@@ -249,8 +251,13 @@
# define YYERROR_VERBOSE 0
#endif
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 35 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
+#line 34 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
typedef union YYSTYPE {
llvm::Module* ModuleVal;
llvm::Function* FunctionVal;
@@ -258,8 +265,8 @@
int64_t IntegerVal;
char* StringVal;
} YYSTYPE;
-/* Line 191 of yacc.c. */
-#line 263 "StackerParser.tab.c"
+/* Line 196 of yacc.c. */
+#line 270 "StackerParser.tab.c"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
@@ -270,30 +277,49 @@
/* Copy the second part of user declarations. */
-/* Line 214 of yacc.c. */
-#line 275 "StackerParser.tab.c"
+/* Line 219 of yacc.c. */
+#line 282 "StackerParser.tab.c"
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
-# ifndef YYFREE
-# define YYFREE free
+#ifndef YY_
+# if YYENABLE_NLS
+# if ENABLE_NLS
+# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+# define YY_(msgid) dgettext ("bison-runtime", msgid)
+# endif
# endif
-# ifndef YYMALLOC
-# define YYMALLOC malloc
+# ifndef YY_
+# define YY_(msgid) msgid
# endif
+#endif
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
# ifdef YYSTACK_USE_ALLOCA
# if YYSTACK_USE_ALLOCA
-# define YYSTACK_ALLOC alloca
-# endif
-# else
-# if defined (alloca) || defined (_ALLOCA_H)
-# define YYSTACK_ALLOC alloca
-# else
# ifdef __GNUC__
# define YYSTACK_ALLOC __builtin_alloca
+# else
+# define YYSTACK_ALLOC alloca
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+# define YYINCLUDED_STDLIB_H
+# endif
# endif
# endif
# endif
@@ -301,13 +327,39 @@
# ifdef YYSTACK_ALLOC
/* Pacify GCC's `empty if-body' warning. */
# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-# if defined (__STDC__) || defined (__cplusplus)
-# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
+# ifndef YYSTACK_ALLOC_MAXIMUM
+ /* The OS might guarantee only one guard page at the bottom of the stack,
+ and a page size can be as small as 4096 bytes. So we cannot safely
+ invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
+ to allow for a few compiler-allocated temporary stack slots. */
+# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
# endif
+# else
# define YYSTACK_ALLOC YYMALLOC
# define YYSTACK_FREE YYFREE
+# ifndef YYSTACK_ALLOC_MAXIMUM
+# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+# endif
+# ifdef __cplusplus
+extern "C" {
+# endif
+# ifndef YYMALLOC
+# define YYMALLOC malloc
+# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+ && (defined (__STDC__) || defined (__cplusplus)))
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+# endif
+# endif
+# ifndef YYFREE
+# define YYFREE free
+# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+ && (defined (__STDC__) || defined (__cplusplus)))
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+# endif
+# endif
+# ifdef __cplusplus
+}
+# endif
# endif
#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
@@ -319,7 +371,7 @@
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- short yyss;
+ short int yyss;
YYSTYPE yyvs;
};
@@ -329,7 +381,7 @@
/* The size of an array large to enough to hold all stacks, each with
N elements. */
# define YYSTACK_BYTES(N) \
- ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
+ ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)
/* Copy COUNT objects from FROM to TO. The source and destination do
@@ -342,7 +394,7 @@
# define YYCOPY(To, From, Count) \
do \
{ \
- register YYSIZE_T yyi; \
+ YYSIZE_T yyi; \
for (yyi = 0; yyi < (Count); yyi++) \
(To)[yyi] = (From)[yyi]; \
} \
@@ -371,7 +423,7 @@
#if defined (__STDC__) || defined (__cplusplus)
typedef signed char yysigned_char;
#else
- typedef short yysigned_char;
+ typedef short int yysigned_char;
#endif
/* YYFINAL -- State number of the termination state. */
@@ -392,7 +444,7 @@
#define YYUNDEFTOK 2
#define YYMAXUTOK 330
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
@@ -476,20 +528,20 @@
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned char yyrline[] =
{
- 0, 70, 70, 70, 74, 75, 78, 79, 80, 83,
- 86, 89, 92, 93, 99, 100, 101, 104, 105, 106,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
- 169
+ 0, 69, 69, 69, 73, 74, 77, 78, 79, 82,
+ 85, 88, 91, 92, 98, 99, 100, 103, 104, 105,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
+ 168
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
@@ -511,7 +563,7 @@
# ifdef YYPRINT
/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
token YYLEX-NUM. */
-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
@@ -578,7 +630,7 @@
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
#define YYPACT_NINF -4
-static const short yypact[] =
+static const short int yypact[] =
{
-4, 4, -4, -4, -2, 141, 52, -4, -4, -4,
-4, -4, -4, 54, -3, 70, -4, -4, -4, -4,
@@ -593,7 +645,7 @@
};
/* YYPGOTO[NTERM-NUM]. */
-static const short yypgoto[] =
+static const short int yypgoto[] =
{
-4, -4, -4, -4, -4, -4, -4, -4, 135, -4
};
@@ -659,22 +711,6 @@
63, 5, 61
};
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
#define yyerrok (yyerrstatus = 0)
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY (-2)
@@ -704,26 +740,59 @@
goto yybackup; \
} \
else \
- { \
- yyerror ("syntax error: cannot back up");\
+ { \
+ yyerror (YY_("syntax error: cannot back up")); \
YYERROR; \
} \
while (0)
+
#define YYTERROR 1
#define YYERRCODE 256
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
- are run). */
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+ If N is 0, then set CURRENT to the empty location which ends
+ the previous symbol: RHS[0] (always defined). */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- ((Current).first_line = (Rhs)[1].first_line, \
- (Current).first_column = (Rhs)[1].first_column, \
- (Current).last_line = (Rhs)[N].last_line, \
- (Current).last_column = (Rhs)[N].last_column)
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (N) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
+ while (0)
#endif
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+ This macro was not mandated originally: define only if we know
+ we won't break user code: when these are the locations we know. */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
+# else
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
/* YYLEX -- calling `yylex' with the right arguments. */
#ifdef YYLEX_PARAM
@@ -746,19 +815,13 @@
YYFPRINTF Args; \
} while (0)
-# define YYDSYMPRINT(Args) \
-do { \
- if (yydebug) \
- yysymprint Args; \
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location) \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
do { \
if (yydebug) \
{ \
YYFPRINTF (stderr, "%s ", Title); \
- yysymprint (stderr, \
- Token, Value); \
+ yysymprint (stderr, \
+ Type, Value); \
YYFPRINTF (stderr, "\n"); \
} \
} while (0)
@@ -770,12 +833,12 @@
#if defined (__STDC__) || defined (__cplusplus)
static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (short int *bottom, short int *top)
#else
static void
yy_stack_print (bottom, top)
- short *bottom;
- short *top;
+ short int *bottom;
+ short int *top;
#endif
{
YYFPRINTF (stderr, "Stack now");
@@ -805,13 +868,13 @@
#endif
{
int yyi;
- unsigned int yylno = yyrline[yyrule];
- YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+ unsigned long int yylno = yyrline[yyrule];
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
yyrule - 1, yylno);
/* 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]]);
+ YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+ YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
}
# define YY_REDUCE_PRINT(Rule) \
@@ -825,8 +888,7 @@
int yydebug;
#else /* !YYDEBUG */
# define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
# define YY_STACK_PRINT(Bottom, Top)
# define YY_REDUCE_PRINT(Rule)
#endif /* !YYDEBUG */
@@ -841,13 +903,9 @@
if the built-in stack extension method is used).
Do not make this value too large; the results are undefined if
- SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+ YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
evaluated with infinite-precision integer arithmetic. */
-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
#ifndef YYMAXDEPTH
# define YYMAXDEPTH 10000
#endif
@@ -869,7 +927,7 @@
const char *yystr;
# endif
{
- register const char *yys = yystr;
+ const char *yys = yystr;
while (*yys++ != '\0')
continue;
@@ -894,8 +952,8 @@
const char *yysrc;
# endif
{
- register char *yyd = yydest;
- register const char *yys = yysrc;
+ char *yyd = yydest;
+ const char *yys = yysrc;
while ((*yyd++ = *yys++) != '\0')
continue;
@@ -905,7 +963,55 @@
# endif
# endif
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+ quotes and backslashes, so that it's suitable for yyerror. The
+ heuristic is that double-quoting is unnecessary unless the string
+ contains an apostrophe, a comma, or backslash (other than
+ backslash-backslash). YYSTR is taken from yytname. If YYRES is
+ null, do not copy; instead, return the length of what the result
+ would have been. */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+ if (*yystr == '"')
+ {
+ size_t yyn = 0;
+ char const *yyp = yystr;
+
+ for (;;)
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
+ do_not_strip_quotes: ;
+ }
+
+ if (! yyres)
+ return yystrlen (yystr);
+
+ return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+#endif /* YYERROR_VERBOSE */
@@ -929,15 +1035,15 @@
(void) yyvaluep;
if (yytype < YYNTOKENS)
- {
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
- }
+ YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
else
YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+# ifdef YYPRINT
+ if (yytype < YYNTOKENS)
+ YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
switch (yytype)
{
default:
@@ -953,10 +1059,11 @@
#if defined (__STDC__) || defined (__cplusplus)
static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
#else
static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+ const char *yymsg;
int yytype;
YYSTYPE *yyvaluep;
#endif
@@ -964,6 +1071,10 @@
/* Pacify ``unused variable'' warnings. */
(void) yyvaluep;
+ if (!yymsg)
+ yymsg = "Deleting";
+ YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
switch (yytype)
{
@@ -991,10 +1102,10 @@
-/* The lookahead symbol. */
+/* The look-ahead symbol. */
int yychar;
-/* The semantic value of the lookahead symbol. */
+/* The semantic value of the look-ahead symbol. */
YYSTYPE yylval;
/* Number of syntax errors so far. */
@@ -1025,12 +1136,12 @@
#endif
{
- register int yystate;
- register int yyn;
+ int yystate;
+ int yyn;
int yyresult;
/* Number of tokens to shift before error messages enabled. */
int yyerrstatus;
- /* Lookahead token as an internal (translated) token number. */
+ /* Look-ahead token as an internal (translated) token number. */
int yytoken = 0;
/* Three stacks and their tools:
@@ -1042,14 +1153,14 @@
to reallocate them elsewhere. */
/* The state stack. */
- short yyssa[YYINITDEPTH];
- short *yyss = yyssa;
- register short *yyssp;
+ short int yyssa[YYINITDEPTH];
+ short int *yyss = yyssa;
+ short int *yyssp;
/* The semantic value stack. */
YYSTYPE yyvsa[YYINITDEPTH];
YYSTYPE *yyvs = yyvsa;
- register YYSTYPE *yyvsp;
+ YYSTYPE *yyvsp;
@@ -1106,14 +1217,14 @@
these so that the &'s don't force the real ones into
memory. */
YYSTYPE *yyvs1 = yyvs;
- short *yyss1 = yyss;
+ short int *yyss1 = yyss;
/* Each stack pointer address is followed by the size of the
data in use in that stack, in bytes. This used to be a
conditional around just the two extra args, but that might
be undefined if yyoverflow is a macro. */
- yyoverflow ("parser stack overflow",
+ yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
@@ -1124,21 +1235,21 @@
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
- goto yyoverflowlab;
+ goto yyexhaustedlab;
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyoverflowlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
yystacksize = YYMAXDEPTH;
{
- short *yyss1 = yyss;
+ short int *yyss1 = yyss;
union yyalloc *yyptr =
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
- goto yyoverflowlab;
+ goto yyexhaustedlab;
YYSTACK_RELOCATE (yyss);
YYSTACK_RELOCATE (yyvs);
@@ -1170,18 +1281,18 @@
yybackup:
/* Do appropriate processing given the current state. */
-/* Read a lookahead token if we need one and don't already have one. */
+/* Read a look-ahead token if we need one and don't already have one. */
/* yyresume: */
- /* First try to decide what to do without reference to lookahead token. */
+ /* First try to decide what to do without reference to look-ahead token. */
yyn = yypact[yystate];
if (yyn == YYPACT_NINF)
goto yydefault;
- /* Not known => get a lookahead token if don't already have one. */
+ /* Not known => get a look-ahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
@@ -1196,7 +1307,7 @@
else
{
yytoken = YYTRANSLATE (yychar);
- YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+ YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
}
/* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1216,8 +1327,8 @@
if (yyn == YYFINAL)
YYACCEPT;
- /* Shift the lookahead token. */
- YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+ /* Shift the look-ahead token. */
+ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
/* Discard the token being shifted unless it is eof. */
if (yychar != YYEOF)
@@ -1267,405 +1378,406 @@
switch (yyn)
{
case 2:
-#line 70 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
+#line 69 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
{ SCI->handle_module_start( ); ;}
break;
case 3:
-#line 71 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.ModuleVal = SCI->handle_module_end( yyvsp[0].ModuleVal ); ;}
+#line 70 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.ModuleVal) = SCI->handle_module_end( (yyvsp[0].ModuleVal) ); ;}
break;
case 4:
-#line 74 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.ModuleVal = SCI->handle_definition_list_end( yyvsp[-1].ModuleVal, yyvsp[0].FunctionVal ); ;}
+#line 73 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.ModuleVal) = SCI->handle_definition_list_end( (yyvsp[-1].ModuleVal), (yyvsp[0].FunctionVal) ); ;}
break;
case 5:
-#line 75 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.ModuleVal = SCI->handle_definition_list_start(); ;}
+#line 74 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.ModuleVal) = SCI->handle_definition_list_start(); ;}
break;
case 6:
-#line 78 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.FunctionVal = yyvsp[0].FunctionVal; ;}
+#line 77 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.FunctionVal) = (yyvsp[0].FunctionVal); ;}
break;
case 7:
-#line 79 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.FunctionVal = yyvsp[0].FunctionVal; ;}
+#line 78 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.FunctionVal) = (yyvsp[0].FunctionVal); ;}
break;
case 8:
-#line 80 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.FunctionVal = yyvsp[0].FunctionVal; ;}
+#line 79 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.FunctionVal) = (yyvsp[0].FunctionVal); ;}
break;
case 9:
-#line 83 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.FunctionVal = SCI->handle_forward( yyvsp[-1].StringVal ); ;}
+#line 82 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.FunctionVal) = SCI->handle_forward( (yyvsp[-1].StringVal) ); ;}
break;
case 10:
-#line 86 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.FunctionVal = SCI->handle_main_definition(yyvsp[-1].FunctionVal); ;}
+#line 85 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.FunctionVal) = SCI->handle_main_definition((yyvsp[-1].FunctionVal)); ;}
break;
case 11:
-#line 89 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.FunctionVal = SCI->handle_definition( yyvsp[-2].StringVal, yyvsp[-1].FunctionVal ); ;}
+#line 88 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.FunctionVal) = SCI->handle_definition( (yyvsp[-2].StringVal), (yyvsp[-1].FunctionVal) ); ;}
break;
case 12:
-#line 92 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.FunctionVal = SCI->handle_word_list_end( yyvsp[-1].FunctionVal, yyvsp[0].BasicBlockVal ); ;}
+#line 91 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.FunctionVal) = SCI->handle_word_list_end( (yyvsp[-1].FunctionVal), (yyvsp[0].BasicBlockVal) ); ;}
break;
case 13:
-#line 93 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.FunctionVal = SCI->handle_word_list_start(); ;}
+#line 92 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.FunctionVal) = SCI->handle_word_list_start(); ;}
break;
case 14:
-#line 99 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_if( yyvsp[-3].StringVal, yyvsp[-1].StringVal ); ;}
+#line 98 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_if( (yyvsp[-3].StringVal), (yyvsp[-1].StringVal) ); ;}
break;
case 15:
-#line 100 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_if( yyvsp[-1].StringVal ); ;}
+#line 99 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_if( (yyvsp[-1].StringVal) ); ;}
break;
case 16:
-#line 101 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_while( yyvsp[-1].StringVal ); ;}
+#line 100 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_while( (yyvsp[-1].StringVal) ); ;}
break;
case 17:
-#line 104 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_identifier( yyvsp[0].StringVal ); ;}
+#line 103 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_identifier( (yyvsp[0].StringVal) ); ;}
break;
case 18:
-#line 105 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_string( yyvsp[0].StringVal ); ;}
+#line 104 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_string( (yyvsp[0].StringVal) ); ;}
break;
case 19:
-#line 106 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_integer( yyvsp[0].IntegerVal ); ;}
+#line 105 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_integer( (yyvsp[0].IntegerVal) ); ;}
break;
case 20:
-#line 109 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( TRUETOK ); ;}
+#line 108 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( TRUETOK ); ;}
break;
case 21:
-#line 110 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( FALSETOK ); ;}
+#line 109 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( FALSETOK ); ;}
break;
case 22:
-#line 111 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( LESS ); ;}
+#line 110 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( LESS ); ;}
break;
case 23:
-#line 112 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( MORE ); ;}
+#line 111 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( MORE ); ;}
break;
case 24:
-#line 113 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( LESS_EQUAL ); ;}
+#line 112 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( LESS_EQUAL ); ;}
break;
case 25:
-#line 114 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( MORE_EQUAL ); ;}
+#line 113 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( MORE_EQUAL ); ;}
break;
case 26:
-#line 115 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( NOT_EQUAL ); ;}
+#line 114 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( NOT_EQUAL ); ;}
break;
case 27:
-#line 116 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( EQUAL ); ;}
+#line 115 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( EQUAL ); ;}
break;
case 28:
-#line 117 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( PLUS ); ;}
+#line 116 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( PLUS ); ;}
break;
case 29:
-#line 118 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( MINUS ); ;}
+#line 117 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( MINUS ); ;}
break;
case 30:
-#line 119 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( INCR ); ;}
+#line 118 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( INCR ); ;}
break;
case 31:
-#line 120 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( DECR ); ;}
+#line 119 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( DECR ); ;}
break;
case 32:
-#line 121 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( MULT ); ;}
+#line 120 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( MULT ); ;}
break;
case 33:
-#line 122 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( DIV ); ;}
+#line 121 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( DIV ); ;}
break;
case 34:
-#line 123 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( MODULUS ); ;}
+#line 122 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( MODULUS ); ;}
break;
case 35:
-#line 124 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( NEGATE ); ;}
+#line 123 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( NEGATE ); ;}
break;
case 36:
-#line 125 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( ABS ); ;}
+#line 124 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( ABS ); ;}
break;
case 37:
-#line 126 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( MIN ); ;}
+#line 125 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( MIN ); ;}
break;
case 38:
-#line 127 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( MAX ); ;}
+#line 126 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( MAX ); ;}
break;
case 39:
-#line 128 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( STAR_SLASH ); ;}
+#line 127 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( STAR_SLASH ); ;}
break;
case 40:
-#line 129 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( AND ); ;}
+#line 128 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( AND ); ;}
break;
case 41:
-#line 130 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( OR ); ;}
+#line 129 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( OR ); ;}
break;
case 42:
-#line 131 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( XOR ); ;}
+#line 130 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( XOR ); ;}
break;
case 43:
-#line 132 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( LSHIFT ); ;}
+#line 131 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( LSHIFT ); ;}
break;
case 44:
-#line 133 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( RSHIFT ); ;}
+#line 132 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( RSHIFT ); ;}
break;
case 45:
-#line 134 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( DROP ); ;}
+#line 133 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( DROP ); ;}
break;
case 46:
-#line 135 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( DROP2 ); ;}
+#line 134 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( DROP2 ); ;}
break;
case 47:
-#line 136 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( NIP ); ;}
+#line 135 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( NIP ); ;}
break;
case 48:
-#line 137 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( NIP2 ); ;}
+#line 136 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( NIP2 ); ;}
break;
case 49:
-#line 138 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( DUP ); ;}
+#line 137 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( DUP ); ;}
break;
case 50:
-#line 139 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( DUP2 ); ;}
+#line 138 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( DUP2 ); ;}
break;
case 51:
-#line 140 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( SWAP ); ;}
+#line 139 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( SWAP ); ;}
break;
case 52:
-#line 141 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( SWAP2 ); ;}
+#line 140 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( SWAP2 ); ;}
break;
case 53:
-#line 142 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( OVER ); ;}
+#line 141 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( OVER ); ;}
break;
case 54:
-#line 143 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( OVER2 ); ;}
+#line 142 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( OVER2 ); ;}
break;
case 55:
-#line 144 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( ROT ); ;}
+#line 143 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( ROT ); ;}
break;
case 56:
-#line 145 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( ROT2 ); ;}
+#line 144 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( ROT2 ); ;}
break;
case 57:
-#line 146 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( RROT ); ;}
+#line 145 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( RROT ); ;}
break;
case 58:
-#line 147 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( RROT2 ); ;}
+#line 146 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( RROT2 ); ;}
break;
case 59:
-#line 148 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( TUCK ); ;}
+#line 147 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( TUCK ); ;}
break;
case 60:
-#line 149 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( TUCK2 ); ;}
+#line 148 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( TUCK2 ); ;}
break;
case 61:
-#line 150 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( ROLL ); ;}
+#line 149 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( ROLL ); ;}
break;
case 62:
-#line 151 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( PICK ); ;}
+#line 150 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( PICK ); ;}
break;
case 63:
-#line 152 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( SELECT ); ;}
+#line 151 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( SELECT ); ;}
break;
case 64:
-#line 153 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( MALLOC ); ;}
+#line 152 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( MALLOC ); ;}
break;
case 65:
-#line 154 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( FREE ); ;}
+#line 153 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( FREE ); ;}
break;
case 66:
-#line 155 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( GET ); ;}
+#line 154 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( GET ); ;}
break;
case 67:
-#line 156 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( PUT ); ;}
+#line 155 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( PUT ); ;}
break;
case 68:
-#line 157 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( RECURSE ); ;}
+#line 156 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( RECURSE ); ;}
break;
case 69:
-#line 158 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( RETURN ); ;}
+#line 157 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( RETURN ); ;}
break;
case 70:
-#line 159 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( EXIT ); ;}
+#line 158 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( EXIT ); ;}
break;
case 71:
-#line 160 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( TAB ); ;}
+#line 159 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( TAB ); ;}
break;
case 72:
-#line 161 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( SPACE ); ;}
+#line 160 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( SPACE ); ;}
break;
case 73:
-#line 162 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( CR ); ;}
+#line 161 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( CR ); ;}
break;
case 74:
-#line 163 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( IN_STR ); ;}
+#line 162 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( IN_STR ); ;}
break;
case 75:
-#line 164 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( IN_NUM ); ;}
+#line 163 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( IN_NUM ); ;}
break;
case 76:
-#line 165 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( IN_CHAR ); ;}
+#line 164 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( IN_CHAR ); ;}
break;
case 77:
-#line 166 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( OUT_STR ); ;}
+#line 165 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( OUT_STR ); ;}
break;
case 78:
-#line 167 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( OUT_NUM ); ;}
+#line 166 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( OUT_NUM ); ;}
break;
case 79:
-#line 168 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( OUT_CHAR ); ;}
+#line 167 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( OUT_CHAR ); ;}
break;
case 80:
-#line 169 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
- { yyval.BasicBlockVal = SCI->handle_word( DUMP ); ;}
+#line 168 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
+ { (yyval.BasicBlockVal) = SCI->handle_word( DUMP ); ;}
break;
+ default: break;
}
-/* Line 1000 of yacc.c. */
-#line 1669 "StackerParser.tab.c"
+/* Line 1126 of yacc.c. */
+#line 1781 "StackerParser.tab.c"
yyvsp -= yylen;
yyssp -= yylen;
@@ -1704,12 +1816,36 @@
if (YYPACT_NINF < yyn && yyn < YYLAST)
{
- YYSIZE_T yysize = 0;
int yytype = YYTRANSLATE (yychar);
- const char* yyprefix;
- char *yymsg;
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+ YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
+ int yysize_overflow = 0;
+ char *yymsg = 0;
+# define YYERROR_VERBOSE_ARGS_MAXIMUM 5
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
int yyx;
+#if 0
+ /* This is so xgettext sees the translatable formats that are
+ constructed on the fly. */
+ YY_("syntax error, unexpected %s");
+ YY_("syntax error, unexpected %s, expecting %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#endif
+ char *yyfmt;
+ char const *yyf;
+ static char const yyunexpected[] = "syntax error, unexpected %s";
+ static char const yyexpecting[] = ", expecting %s";
+ static char const yyor[] = " or %s";
+ char yyformat[sizeof yyunexpected
+ + sizeof yyexpecting - 1
+ + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+ * (sizeof yyor - 1))];
+ char const *yyprefix = yyexpecting;
+
/* Start YYX at -YYN if negative to avoid negative indexes in
YYCHECK. */
int yyxbegin = yyn < 0 ? -yyn : 0;
@@ -1717,81 +1853,91 @@
/* Stay within bounds of both yycheck and yytname. */
int yychecklim = YYLAST - yyn;
int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 0;
+ int yycount = 1;
+
+ yyarg[0] = yytname[yytype];
+ yyfmt = yystpcpy (yyformat, yyunexpected);
- yyprefix = ", expecting ";
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
{
- yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
- yycount += 1;
- if (yycount == 5)
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
{
- yysize = 0;
+ yycount = 1;
+ yysize = yysize0;
+ yyformat[sizeof yyunexpected - 1] = '\0';
break;
}
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ yysize_overflow |= yysize1 < yysize;
+ yysize = yysize1;
+ yyfmt = yystpcpy (yyfmt, yyprefix);
+ yyprefix = yyor;
}
- yysize += (sizeof ("syntax error, unexpected ")
- + yystrlen (yytname[yytype]));
- yymsg = (char *) YYSTACK_ALLOC (yysize);
- if (yymsg != 0)
- {
- char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
- yyp = yystpcpy (yyp, yytname[yytype]);
- if (yycount < 5)
+ yyf = YY_(yyformat);
+ yysize1 = yysize + yystrlen (yyf);
+ yysize_overflow |= yysize1 < yysize;
+ yysize = yysize1;
+
+ if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
+ yymsg = (char *) YYSTACK_ALLOC (yysize);
+ if (yymsg)
+ {
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ char *yyp = yymsg;
+ int yyi = 0;
+ while ((*yyp = *yyf))
{
- yyprefix = ", expecting ";
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- yyp = yystpcpy (yyp, yyprefix);
- yyp = yystpcpy (yyp, yytname[yyx]);
- yyprefix = " or ";
- }
+ if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyf += 2;
+ }
+ else
+ {
+ yyp++;
+ yyf++;
+ }
}
yyerror (yymsg);
YYSTACK_FREE (yymsg);
}
else
- yyerror ("syntax error; also virtual memory exhausted");
+ {
+ yyerror (YY_("syntax error"));
+ goto yyexhaustedlab;
+ }
}
else
#endif /* YYERROR_VERBOSE */
- yyerror ("syntax error");
+ yyerror (YY_("syntax error"));
}
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse lookahead token after an
+ /* If just tried and failed to reuse look-ahead token after an
error, discard it. */
if (yychar <= YYEOF)
{
- /* If at end of input, pop the error token,
- then the rest of the stack, then return failure. */
+ /* Return failure if at end of input. */
if (yychar == YYEOF)
- for (;;)
- {
- YYPOPSTACK;
- if (yyssp == yyss)
- YYABORT;
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
- yydestruct (yystos[*yyssp], yyvsp);
- }
+ YYABORT;
}
else
{
- YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
- yydestruct (yytoken, &yylval);
+ yydestruct ("Error: discarding", yytoken, &yylval);
yychar = YYEMPTY;
-
}
}
- /* Else will try to reuse lookahead token after shifting the error
+ /* Else will try to reuse look-ahead token after shifting the error
token. */
goto yyerrlab1;
@@ -1801,14 +1947,13 @@
`---------------------------------------------------*/
yyerrorlab:
-#ifdef __GNUC__
- /* Pacify GCC when the user code never invokes YYERROR and the label
- yyerrorlab therefore never appears in user code. */
+ /* Pacify compilers like GCC when the user code never invokes
+ YYERROR and the label yyerrorlab therefore never appears in user
+ code. */
if (0)
goto yyerrorlab;
-#endif
- yyvsp -= yylen;
+yyvsp -= yylen;
yyssp -= yylen;
yystate = *yyssp;
goto yyerrlab1;
@@ -1838,8 +1983,8 @@
if (yyssp == yyss)
YYABORT;
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
- yydestruct (yystos[yystate], yyvsp);
+
+ yydestruct ("Error: popping", yystos[yystate], yyvsp);
YYPOPSTACK;
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -1848,11 +1993,12 @@
if (yyn == YYFINAL)
YYACCEPT;
- YYDPRINTF ((stderr, "Shifting error token, "));
-
*++yyvsp = yylval;
+ /* Shift the error token. */
+ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
yystate = yyn;
goto yynewstate;
@@ -1872,16 +2018,25 @@
goto yyreturn;
#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here. |
-`----------------------------------------------*/
-yyoverflowlab:
- yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here. |
+`-------------------------------------------------*/
+yyexhaustedlab:
+ yyerror (YY_("memory exhausted"));
yyresult = 2;
/* Fall through. */
#endif
yyreturn:
+ if (yychar != YYEOF && yychar != YYEMPTY)
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval);
+ while (yyssp != yyss)
+ {
+ yydestruct ("Cleanup: popping",
+ yystos[*yyssp], yyvsp);
+ YYPOPSTACK;
+ }
#ifndef yyoverflow
if (yyss != yyssa)
YYSTACK_FREE (yyss);
@@ -1890,7 +2045,7 @@
}
-#line 171 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
+#line 170 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
/* Handle messages a little more nicely than the default yyerror */
Index: llvm-stacker/lib/compiler/StackerParser.h.cvs
diff -u llvm-stacker/lib/compiler/StackerParser.h.cvs:1.1 llvm-stacker/lib/compiler/StackerParser.h.cvs:1.2
--- llvm-stacker/lib/compiler/StackerParser.h.cvs:1.1 Wed Feb 15 01:26:07 2006
+++ llvm-stacker/lib/compiler/StackerParser.h.cvs Mon Feb 5 14:47:20 2007
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875c. */
+/* A Bison parser, made by GNU Bison 2.1. */
/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
@@ -104,6 +104,7 @@
OUT_CHAR = 330
};
#endif
+/* Tokens. */
#define INTEGER 258
#define STRING 259
#define IDENTIFIER 260
@@ -182,7 +183,7 @@
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 35 "/proj/llvm/build/projects/Stacker/../../../llvm/projects/Stacker/lib/compiler/StackerParser.y"
+#line 34 "/proj/llvm/llvm-3/projects/llvm-stacker/lib/compiler/StackerParser.y"
typedef union YYSTYPE {
llvm::Module* ModuleVal;
llvm::Function* FunctionVal;
@@ -190,8 +191,8 @@
int64_t IntegerVal;
char* StringVal;
} YYSTYPE;
-/* Line 1275 of yacc.c. */
-#line 195 "StackerParser.tab.h"
+/* Line 1447 of yacc.c. */
+#line 196 "StackerParser.tab.h"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
Index: llvm-stacker/lib/compiler/StackerParser.y
diff -u llvm-stacker/lib/compiler/StackerParser.y:1.7 llvm-stacker/lib/compiler/StackerParser.y:1.8
--- llvm-stacker/lib/compiler/StackerParser.y:1.7 Wed Sep 1 17:55:37 2004
+++ llvm-stacker/lib/compiler/StackerParser.y Mon Feb 5 14:47:20 2007
@@ -13,7 +13,6 @@
%{
#include "StackerCompiler.h"
-#include "llvm/SymbolTable.h"
#include "llvm/Module.h"
#include "llvm/Instructions.h"
#include "llvm/ADT/STLExtras.h"
Index: llvm-stacker/lib/compiler/StackerParser.y.cvs
diff -u llvm-stacker/lib/compiler/StackerParser.y.cvs:1.1 llvm-stacker/lib/compiler/StackerParser.y.cvs:1.2
--- llvm-stacker/lib/compiler/StackerParser.y.cvs:1.1 Wed Feb 15 01:26:07 2006
+++ llvm-stacker/lib/compiler/StackerParser.y.cvs Mon Feb 5 14:47:20 2007
@@ -13,7 +13,6 @@
%{
#include "StackerCompiler.h"
-#include "llvm/SymbolTable.h"
#include "llvm/Module.h"
#include "llvm/Instructions.h"
#include "llvm/ADT/STLExtras.h"
More information about the llvm-commits
mailing list