summaryrefslogtreecommitdiff
path: root/res/ael
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2012-03-24 02:42:42 +0000
committerRussell Bryant <russell@russellbryant.com>2012-03-24 02:42:42 +0000
commitcad07b3800b7212c363e2753d6d7540b585c3449 (patch)
tree80c307b11a35f91200f8b091d0f7e44715942339 /res/ael
parent721f92058f53b87a70872ec87dd1a35866280eee (diff)
Multiple revisions 360356-360357
........ r360356 | russell | 2012-03-23 22:33:36 -0400 (Fri, 23 Mar 2012) | 6 lines expression parser: Fix (theoretical) memory leak. Fix a memory leak that is very unlikely to actually happen. If a malloc() succeeded, but the following strdup() failed, the memory from the original malloc() would be leaked. ........ r360357 | russell | 2012-03-23 22:34:39 -0400 (Fri, 23 Mar 2012) | 6 lines Rebuild parsers. This is needed to include the last fix to main/ast_expr2.y. The changes look much bigger as this regeneration of the code was done with newer versions of flex and bison. ........ Merged revisions 360356-360357 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 360358 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/ael')
-rw-r--r--res/ael/ael.tab.c1292
-rw-r--r--res/ael/ael.tab.h14
-rw-r--r--res/ael/ael_lex.c32
3 files changed, 692 insertions, 646 deletions
diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c
index 803049ed6..c838d797c 100644
--- a/res/ael/ael.tab.c
+++ b/res/ael/ael.tab.c
@@ -1,10 +1,8 @@
+/* A Bison parser, made by GNU Bison 2.5. */
-/* A Bison parser, made by GNU Bison 2.4.1. */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -46,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.5"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -75,7 +73,7 @@
/* Copy the first part of user declarations. */
-/* Line 189 of yacc.c */
+/* Line 268 of yacc.c */
#line 1 "ael.y"
/*
@@ -134,8 +132,8 @@ static char *ael_token_subst(const char *mess);
-/* Line 189 of yacc.c */
-#line 139 "ael.tab.c"
+/* Line 268 of yacc.c */
+#line 137 "ael.tab.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -212,7 +210,7 @@ static char *ael_token_subst(const char *mess);
typedef union YYSTYPE
{
-/* Line 214 of yacc.c */
+/* Line 293 of yacc.c */
#line 59 "ael.y"
int intval; /* integer value, typically flags */
@@ -221,8 +219,8 @@ typedef union YYSTYPE
-/* Line 214 of yacc.c */
-#line 226 "ael.tab.c"
+/* Line 293 of yacc.c */
+#line 224 "ael.tab.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -245,7 +243,7 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
+/* Line 343 of yacc.c */
#line 65 "ael.y"
/* declaring these AFTER the union makes things a lot simpler! */
@@ -268,8 +266,8 @@ static pval *nword(char *string, YYLTYPE *pos);
static pval *update_last(pval *, YYLTYPE *);
-/* Line 264 of yacc.c */
-#line 273 "ael.tab.c"
+/* Line 343 of yacc.c */
+#line 271 "ael.tab.c"
#ifdef short
# undef short
@@ -319,7 +317,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -372,11 +370,11 @@ YYID (yyi)
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -399,24 +397,24 @@ YYID (yyi)
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
&& (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
@@ -447,23 +445,7 @@ union yyalloc
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+ 2 * YYSTACK_GAP_MAXIMUM)
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (YYID (0))
-# endif
-# endif
+# define YYCOPY_NEEDED 1
/* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -483,6 +465,26 @@ union yyalloc
#endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (YYID (0))
+# endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 17
/* YYLAST -- Last index in YYTABLE. */
@@ -714,8 +716,8 @@ static const yytype_uint8 yyr2[] =
3, 2, 4, 3
};
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE doesn't specify something else to do. Zero
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
@@ -810,8 +812,7 @@ static const yytype_int16 yypgoto[] =
/* 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, syntax error. */
+ number is the opposite. If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -134
static const yytype_int16 yytable[] =
{
@@ -855,6 +856,12 @@ static const yytype_int16 yytable[] =
164, 100
};
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-211))
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
static const yytype_uint16 yycheck[] =
{
62, 20, 84, 117, 214, 5, 216, 1, 7, 37,
@@ -944,9 +951,18 @@ static const yytype_uint8 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
+ Once GCC version 2 has supplanted version 1, this can go. However,
+ YYFAIL appears to be in use. Nevertheless, it is formally deprecated
+ in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+ discussed. */
#define YYFAIL goto yyerrlab
+#if defined YYFAIL
+ /* This is here to suppress warnings from the GCC cpp's
+ -Wunused-macros. Normally we don't worry about that warning, but
+ some users do, and we want to make it easy for users to remove
+ YYFAIL uses, which will produce warnings from Bison 2.5. */
+#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -956,7 +972,6 @@ do \
{ \
yychar = (Token); \
yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
YYPOPSTACK (1); \
goto yybackup; \
} \
@@ -1003,7 +1018,7 @@ while (YYID (0))
we won't break user code: when these are the locations we know. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -1212,7 +1227,6 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-
#if YYERROR_VERBOSE
@@ -1315,115 +1329,142 @@ yytnamerr (char *yyres, const char *yystr)
}
# endif
-/* Copy into YYRESULT an error message about the unexpected token
- YYCHAR while in state YYSTATE. Return the number of bytes copied,
- including the terminating null byte. If YYRESULT is null, do not
- copy anything; just return the number of bytes that would be
- copied. As a special case, return 0 if an ordinary "syntax error"
- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
- size calculation. */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
- int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN for the state stack whose top is
+ YYSSP.
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
- {
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- int yysize_overflow = 0;
- enum { 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;
-
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
-
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- 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;
- }
+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
+ not large enough to hold the message. In that case, also set
+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
+ required number of bytes is too large to store. */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+ yytype_int16 *yyssp, int yytoken)
+{
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+ YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = 0;
+ /* Arguments of yyformat. */
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ /* Number of reported tokens (one for the "unexpected", one per
+ "expected"). */
+ int yycount = 0;
+
+ /* There are many possibilities here to consider:
+ - Assume YYFAIL is not used. It's too flawed to consider. See
+ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+ for details. YYERROR is fine as it does not invoke this
+ function.
+ - If this state is a consistent state with a default action, then
+ the only way this function was invoked is if the default action
+ is an error action. In that case, don't check for expected
+ tokens because there are none.
+ - The only way there can be no lookahead present (in yychar) is if
+ this state is a consistent state with a default action. Thus,
+ detecting the absence of a lookahead is sufficient to determine
+ that there is no unexpected or expected token to report. In that
+ case, just report a simple "syntax error".
+ - Don't assume there isn't a lookahead just because this state is a
+ consistent state with a default action. There might have been a
+ previous inconsistent state, consistent state with a non-default
+ action, or user semantic action that manipulated yychar.
+ - Of course, the expected token list depends on states to have
+ correct lookahead information, and it depends on the parser not
+ to perform extra reductions after fetching a lookahead from the
+ scanner and before detecting a syntax error. Thus, state merging
+ (from LALR or IELR) and default reductions corrupt the expected
+ token list. However, the list is correct for canonical LR with
+ one exception: it will still contain any token that will not be
+ accepted due to an error action in a later state.
+ */
+ if (yytoken != YYEMPTY)
+ {
+ int yyn = yypact[*yyssp];
+ yyarg[yycount++] = yytname[yytoken];
+ if (!yypact_value_is_default (yyn))
+ {
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. In other words, skip the first -YYN actions for
+ this state because they are default actions. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yyx;
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
+ }
+ }
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
+ switch (yycount)
+ {
+# define YYCASE_(N, S) \
+ case N: \
+ yyformat = S; \
+ break
+ YYCASE_(0, YY_("syntax error"));
+ YYCASE_(1, YY_("syntax error, unexpected %s"));
+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+ }
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
- if (yyresult)
- {
- /* 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 = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
- return yysize;
+ if (*yymsg_alloc < yysize)
+ {
+ *yymsg_alloc = 2 * yysize;
+ if (! (yysize <= *yymsg_alloc
+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+ return 1;
}
+
+ /* 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 = *yyformat) != '\0')
+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyformat += 2;
+ }
+ else
+ {
+ yyp++;
+ yyformat++;
+ }
+ }
+ return 0;
}
#endif /* YYERROR_VERBOSE */
-
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
@@ -1456,504 +1497,504 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio)
{
case 43: /* "word" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1465 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1506 "ael.tab.c"
break;
case 46: /* "objects" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1477 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1518 "ael.tab.c"
break;
case 47: /* "object" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1489 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1530 "ael.tab.c"
break;
case 48: /* "context_name" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1498 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1539 "ael.tab.c"
break;
case 49: /* "context" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1510 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1551 "ael.tab.c"
break;
case 51: /* "macro" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1522 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1563 "ael.tab.c"
break;
case 52: /* "globals" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1534 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1575 "ael.tab.c"
break;
case 53: /* "global_statements" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1546 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1587 "ael.tab.c"
break;
case 54: /* "assignment" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1558 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1599 "ael.tab.c"
break;
case 56: /* "local_assignment" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1570 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1611 "ael.tab.c"
break;
case 58: /* "arglist" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1582 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1623 "ael.tab.c"
break;
case 59: /* "elements" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1594 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1635 "ael.tab.c"
break;
case 60: /* "element" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1606 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1647 "ael.tab.c"
break;
case 61: /* "ignorepat" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1618 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1659 "ael.tab.c"
break;
case 62: /* "extension" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1630 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1671 "ael.tab.c"
break;
case 63: /* "statements" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1642 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1683 "ael.tab.c"
break;
case 64: /* "timerange" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1651 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1692 "ael.tab.c"
break;
case 65: /* "timespec" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1663 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1704 "ael.tab.c"
break;
case 66: /* "test_expr" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1672 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1713 "ael.tab.c"
break;
case 68: /* "if_like_head" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1684 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1725 "ael.tab.c"
break;
case 69: /* "word_list" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1693 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1734 "ael.tab.c"
break;
case 71: /* "word3_list" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1702 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1743 "ael.tab.c"
break;
case 72: /* "goto_word" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1711 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1752 "ael.tab.c"
break;
case 73: /* "switch_statement" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1723 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1764 "ael.tab.c"
break;
case 74: /* "statement" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1735 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1776 "ael.tab.c"
break;
case 79: /* "opt_else" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1747 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1788 "ael.tab.c"
break;
case 80: /* "target" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1759 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1800 "ael.tab.c"
break;
case 81: /* "opt_pri" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1768 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1809 "ael.tab.c"
break;
case 82: /* "jumptarget" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1780 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1821 "ael.tab.c"
break;
case 83: /* "macro_call" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1792 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1833 "ael.tab.c"
break;
case 85: /* "application_call_head" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1804 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1845 "ael.tab.c"
break;
case 87: /* "application_call" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1816 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1857 "ael.tab.c"
break;
case 88: /* "opt_word" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 183 "ael.y"
{ free((yyvaluep->str));};
-/* Line 1000 of yacc.c */
-#line 1825 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1866 "ael.tab.c"
break;
case 89: /* "eval_arglist" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1837 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1878 "ael.tab.c"
break;
case 90: /* "case_statements" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1849 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1890 "ael.tab.c"
break;
case 91: /* "case_statement" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1861 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1902 "ael.tab.c"
break;
case 92: /* "macro_statements" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1873 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1914 "ael.tab.c"
break;
case 93: /* "macro_statement" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1885 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1926 "ael.tab.c"
break;
case 94: /* "switches" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1897 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1938 "ael.tab.c"
break;
case 95: /* "eswitches" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1909 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1950 "ael.tab.c"
break;
case 96: /* "switchlist" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1921 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1962 "ael.tab.c"
break;
case 97: /* "included_entry" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1933 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1974 "ael.tab.c"
break;
case 98: /* "includeslist" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1945 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1986 "ael.tab.c"
break;
case 99: /* "includes" */
-/* Line 1000 of yacc.c */
+/* Line 1391 of yacc.c */
#line 170 "ael.y"
{
destroy_pval((yyvaluep->pval));
prev_word=0;
};
-/* Line 1000 of yacc.c */
-#line 1957 "ael.tab.c"
+/* Line 1391 of yacc.c */
+#line 1998 "ael.tab.c"
break;
default:
@@ -1961,6 +2002,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, parseio)
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
@@ -1977,12 +2019,9 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -2046,7 +2085,7 @@ YYLTYPE yylloc;
YYLTYPE *yylsp;
/* The locations where the error started and ended. */
- YYLTYPE yyerror_range[2];
+ YYLTYPE yyerror_range[3];
YYSIZE_T yystacksize;
@@ -2093,7 +2132,7 @@ YYLTYPE yylloc;
yyvsp = yyvs;
yylsp = yyls;
-#if YYLTYPE_IS_TRIVIAL
+#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
/* Initialize the default location before parsing starts. */
yylloc.first_line = yylloc.last_line = 1;
yylloc.first_column = yylloc.last_column = 1;
@@ -2195,7 +2234,7 @@ yybackup:
/* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
+ if (yypact_value_is_default (yyn))
goto yydefault;
/* Not known => get a lookahead token if don't already have one. */
@@ -2226,8 +2265,8 @@ yybackup:
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ if (yytable_value_is_error (yyn))
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
@@ -2283,330 +2322,330 @@ yyreduce:
{
case 2:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 191 "ael.y"
- { (yyval.pval) = parseio->pval = (yyvsp[(1) - (1)].pval); ;}
+ { (yyval.pval) = parseio->pval = (yyvsp[(1) - (1)].pval); }
break;
case 3:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 194 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 4:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 195 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }
break;
case 5:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 196 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (2)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (2)].pval);}
break;
case 6:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 199 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 7:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 200 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 8:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 201 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 9:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 202 "ael.y"
- {(yyval.pval)=0;/* allow older docs to be read */;}
+ {(yyval.pval)=0;/* allow older docs to be read */}
break;
case 10:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 205 "ael.y"
- { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
+ { (yyval.str) = (yyvsp[(1) - (1)].str); }
break;
case 11:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 206 "ael.y"
- { (yyval.str) = strdup("default"); ;}
+ { (yyval.str) = strdup("default"); }
break;
case 12:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 209 "ael.y"
{
(yyval.pval) = npval2(PV_CONTEXT, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)]));
(yyval.pval)->u1.str = (yyvsp[(3) - (6)].str);
(yyval.pval)->u2.statements = (yyvsp[(5) - (6)].pval);
set_dads((yyval.pval),(yyvsp[(5) - (6)].pval));
- (yyval.pval)->u3.abstract = (yyvsp[(1) - (6)].intval);;}
+ (yyval.pval)->u3.abstract = (yyvsp[(1) - (6)].intval);}
break;
case 13:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 218 "ael.y"
- { (yyval.intval) = 1; ;}
+ { (yyval.intval) = 1; }
break;
case 14:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 219 "ael.y"
- { (yyval.intval) = 0; ;}
+ { (yyval.intval) = 0; }
break;
case 15:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 220 "ael.y"
- { (yyval.intval) = 2; ;}
+ { (yyval.intval) = 2; }
break;
case 16:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 221 "ael.y"
- { (yyval.intval)=3; ;}
+ { (yyval.intval)=3; }
break;
case 17:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 222 "ael.y"
- { (yyval.intval)=3; ;}
+ { (yyval.intval)=3; }
break;
case 18:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 225 "ael.y"
{
(yyval.pval) = npval2(PV_MACRO, &(yylsp[(1) - (8)]), &(yylsp[(8) - (8)]));
(yyval.pval)->u1.str = (yyvsp[(2) - (8)].str); (yyval.pval)->u2.arglist = (yyvsp[(4) - (8)].pval); (yyval.pval)->u3.macro_statements = (yyvsp[(7) - (8)].pval);
- set_dads((yyval.pval),(yyvsp[(7) - (8)].pval));;}
+ set_dads((yyval.pval),(yyvsp[(7) - (8)].pval));}
break;
case 19:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 231 "ael.y"
{
(yyval.pval) = npval2(PV_GLOBALS, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));
(yyval.pval)->u1.statements = (yyvsp[(3) - (4)].pval);
- set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;}
+ set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));}
break;
case 20:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 237 "ael.y"
- { (yyval.pval) = NULL; ;}
+ { (yyval.pval) = NULL; }
break;
case 21:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 238 "ael.y"
- {(yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;}
+ {(yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }
break;
case 22:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 239 "ael.y"
- {(yyval.pval)=(yyvsp[(2) - (2)].pval);;}
+ {(yyval.pval)=(yyvsp[(2) - (2)].pval);}
break;
case 23:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 242 "ael.y"
- { reset_semicount(parseio->scanner); ;}
+ { reset_semicount(parseio->scanner); }
break;
case 24:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 242 "ael.y"
{
(yyval.pval) = npval2(PV_VARDEC, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));
(yyval.pval)->u1.str = (yyvsp[(1) - (5)].str);
- (yyval.pval)->u2.val = (yyvsp[(4) - (5)].str); ;}
+ (yyval.pval)->u2.val = (yyvsp[(4) - (5)].str); }
break;
case 25:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 248 "ael.y"
- { reset_semicount(parseio->scanner); ;}
+ { reset_semicount(parseio->scanner); }
break;
case 26:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 248 "ael.y"
{
(yyval.pval) = npval2(PV_LOCALVARDEC, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)]));
(yyval.pval)->u1.str = (yyvsp[(2) - (6)].str);
- (yyval.pval)->u2.val = (yyvsp[(5) - (6)].str); ;}
+ (yyval.pval)->u2.val = (yyvsp[(5) - (6)].str); }
break;
case 27:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 255 "ael.y"
- { (yyval.pval) = NULL; ;}
+ { (yyval.pval) = NULL; }
break;
case 28:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 256 "ael.y"
- { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;}
+ { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); }
break;
case 29:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 257 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); }
break;
case 30:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 258 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (2)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (2)].pval);}
break;
case 31:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 261 "ael.y"
- {(yyval.pval)=0;;}
+ {(yyval.pval)=0;}
break;
case 32:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 262 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }
break;
case 33:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 263 "ael.y"
- { (yyval.pval)=(yyvsp[(2) - (2)].pval);;}
+ { (yyval.pval)=(yyvsp[(2) - (2)].pval);}
break;
case 34:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 266 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 35:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 267 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 36:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 268 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 37:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 269 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 38:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 270 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 39:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 271 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 40:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 272 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 41:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 273 "ael.y"
- {free((yyvsp[(1) - (2)].str)); (yyval.pval)=0;;}
+ {free((yyvsp[(1) - (2)].str)); (yyval.pval)=0;}
break;
case 42:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 274 "ael.y"
- {(yyval.pval)=0;/* allow older docs to be read */;}
+ {(yyval.pval)=0;/* allow older docs to be read */}
break;
case 43:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 277 "ael.y"
{
(yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));
- (yyval.pval)->u1.str = (yyvsp[(3) - (4)].str);;}
+ (yyval.pval)->u1.str = (yyvsp[(3) - (4)].str);}
break;
case 44:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 282 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
(yyval.pval)->u1.str = (yyvsp[(1) - (3)].str);
- (yyval.pval)->u2.statements = (yyvsp[(3) - (3)].pval); set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));;}
+ (yyval.pval)->u2.statements = (yyvsp[(3) - (3)].pval); set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));}
break;
case 45:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 286 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (5)]), &(yylsp[(3) - (5)]));
@@ -2615,67 +2654,67 @@ yyreduce:
strcat((yyval.pval)->u1.str,"@");
strcat((yyval.pval)->u1.str,(yyvsp[(3) - (5)].str));
free((yyvsp[(1) - (5)].str));
- (yyval.pval)->u2.statements = (yyvsp[(5) - (5)].pval); set_dads((yyval.pval),(yyvsp[(5) - (5)].pval));;}
+ (yyval.pval)->u2.statements = (yyvsp[(5) - (5)].pval); set_dads((yyval.pval),(yyvsp[(5) - (5)].pval));}
break;
case 46:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 294 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));
(yyval.pval)->u1.str = (yyvsp[(2) - (4)].str);
(yyval.pval)->u2.statements = (yyvsp[(4) - (4)].pval); set_dads((yyval.pval),(yyvsp[(4) - (4)].pval));
- (yyval.pval)->u4.regexten=1;;}
+ (yyval.pval)->u4.regexten=1;}
break;
case 47:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 299 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (7)]), &(yylsp[(7) - (7)]));
(yyval.pval)->u1.str = (yyvsp[(5) - (7)].str);
(yyval.pval)->u2.statements = (yyvsp[(7) - (7)].pval); set_dads((yyval.pval),(yyvsp[(7) - (7)].pval));
- (yyval.pval)->u3.hints = (yyvsp[(3) - (7)].str);;}
+ (yyval.pval)->u3.hints = (yyvsp[(3) - (7)].str);}
break;
case 48:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 304 "ael.y"
{
(yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (8)]), &(yylsp[(8) - (8)]));
(yyval.pval)->u1.str = (yyvsp[(6) - (8)].str);
(yyval.pval)->u2.statements = (yyvsp[(8) - (8)].pval); set_dads((yyval.pval),(yyvsp[(8) - (8)].pval));
(yyval.pval)->u4.regexten=1;
- (yyval.pval)->u3.hints = (yyvsp[(4) - (8)].str);;}
+ (yyval.pval)->u3.hints = (yyvsp[(4) - (8)].str);}
break;
case 49:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 313 "ael.y"
- { (yyval.pval) = NULL; ;}
+ { (yyval.pval) = NULL; }
break;
case 50:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 314 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }
break;
case 51:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 315 "ael.y"
- {(yyval.pval)=(yyvsp[(2) - (2)].pval);;}
+ {(yyval.pval)=(yyvsp[(2) - (2)].pval);}
break;
case 52:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 321 "ael.y"
{
if (asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[(1) - (5)].str), (yyvsp[(3) - (5)].str), (yyvsp[(5) - (5)].str)) < 0) {
@@ -2686,79 +2725,79 @@ yyreduce:
free((yyvsp[(3) - (5)].str));
free((yyvsp[(5) - (5)].str));
}
- ;}
+ }
break;
case 53:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 331 "ael.y"
- { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
+ { (yyval.str) = (yyvsp[(1) - (1)].str); }
break;
case 54:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 335 "ael.y"
{
(yyval.pval) = nword((yyvsp[(1) - (7)].str), &(yylsp[(1) - (7)]));
(yyval.pval)->next = nword((yyvsp[(3) - (7)].str), &(yylsp[(3) - (7)]));
(yyval.pval)->next->next = nword((yyvsp[(5) - (7)].str), &(yylsp[(5) - (7)]));
- (yyval.pval)->next->next->next = nword((yyvsp[(7) - (7)].str), &(yylsp[(7) - (7)])); ;}
+ (yyval.pval)->next->next->next = nword((yyvsp[(7) - (7)].str), &(yylsp[(7) - (7)])); }
break;
case 55:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 343 "ael.y"
- { reset_parencount(parseio->scanner); ;}
+ { reset_parencount(parseio->scanner); }
break;
case 56:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 343 "ael.y"
- { (yyval.str) = (yyvsp[(3) - (4)].str); ;}
+ { (yyval.str) = (yyvsp[(3) - (4)].str); }
break;
case 57:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 347 "ael.y"
{
(yyval.pval)= npval2(PV_IF, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));
- (yyval.pval)->u1.str = (yyvsp[(2) - (2)].str); ;}
+ (yyval.pval)->u1.str = (yyvsp[(2) - (2)].str); }
break;
case 58:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 350 "ael.y"
{
(yyval.pval) = npval2(PV_RANDOM, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));
- (yyval.pval)->u1.str=(yyvsp[(2) - (2)].str);;}
+ (yyval.pval)->u1.str=(yyvsp[(2) - (2)].str);}
break;
case 59:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 353 "ael.y"
{
(yyval.pval) = npval2(PV_IFTIME, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));
(yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval);
- prev_word = 0; ;}
+ prev_word = 0; }
break;
case 60:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 364 "ael.y"
- { (yyval.str) = (yyvsp[(1) - (1)].str);;}
+ { (yyval.str) = (yyvsp[(1) - (1)].str);}
break;
case 61:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 365 "ael.y"
{
if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {
@@ -2769,19 +2808,19 @@ yyreduce:
free((yyvsp[(2) - (2)].str));
prev_word = (yyval.str);
}
- ;}
+ }
break;
case 62:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 377 "ael.y"
- { (yyval.str) = (yyvsp[(1) - (1)].str); ;}
+ { (yyval.str) = (yyvsp[(1) - (1)].str); }
break;
case 63:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 378 "ael.y"
{
if (asprintf(&((yyval.str)), "%s %s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {
@@ -2791,12 +2830,12 @@ yyreduce:
free((yyvsp[(1) - (2)].str));
free((yyvsp[(2) - (2)].str));
}
- ;}
+ }
break;
case 64:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 387 "ael.y"
{
if (asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
@@ -2806,12 +2845,12 @@ yyreduce:
free((yyvsp[(1) - (3)].str));
free((yyvsp[(3) - (3)].str));
}
- ;}
+ }
break;
case 65:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 396 "ael.y"
{ /* there are often '&' in hints */
if (asprintf(&((yyval.str)), "%s&%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
@@ -2821,12 +2860,12 @@ yyreduce:
free((yyvsp[(1) - (3)].str));
free((yyvsp[(3) - (3)].str));
}
- ;}
+ }
break;
case 66:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 405 "ael.y"
{
if (asprintf(&((yyval.str)), "%s@%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
@@ -2836,19 +2875,19 @@ yyreduce:
free((yyvsp[(1) - (3)].str));
free((yyvsp[(3) - (3)].str));
}
- ;}
+ }
break;
case 67:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 416 "ael.y"
- { (yyval.str) = (yyvsp[(1) - (1)].str);;}
+ { (yyval.str) = (yyvsp[(1) - (1)].str);}
break;
case 68:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 417 "ael.y"
{
if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {
@@ -2859,12 +2898,12 @@ yyreduce:
free((yyvsp[(2) - (2)].str));
prev_word = (yyval.str);
}
- ;}
+ }
break;
case 69:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 427 "ael.y"
{
if (asprintf(&((yyval.str)), "%s%s%s", (yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
@@ -2876,19 +2915,19 @@ yyreduce:
free((yyvsp[(3) - (3)].str));
prev_word=(yyval.str);
}
- ;}
+ }
break;
case 70:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 440 "ael.y"
- { (yyval.str) = (yyvsp[(1) - (1)].str);;}
+ { (yyval.str) = (yyvsp[(1) - (1)].str);}
break;
case 71:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 441 "ael.y"
{
if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {
@@ -2898,12 +2937,12 @@ yyreduce:
free((yyvsp[(1) - (2)].str));
free((yyvsp[(2) - (2)].str));
}
- ;}
+ }
break;
case 72:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 450 "ael.y"
{
if (asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {
@@ -2913,152 +2952,152 @@ yyreduce:
free((yyvsp[(1) - (3)].str));
free((yyvsp[(3) - (3)].str));
}
- ;}
+ }
break;
case 73:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 461 "ael.y"
{
(yyval.pval) = npval2(PV_SWITCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));
(yyval.pval)->u1.str = (yyvsp[(2) - (5)].str);
- (yyval.pval)->u2.statements = (yyvsp[(4) - (5)].pval); set_dads((yyval.pval),(yyvsp[(4) - (5)].pval));;}
+ (yyval.pval)->u2.statements = (yyvsp[(4) - (5)].pval); set_dads((yyval.pval),(yyvsp[(4) - (5)].pval));}
break;
case 74:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 470 "ael.y"
{
(yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
- (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval));;}
+ (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval));}
break;
case 75:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 473 "ael.y"
- { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;}
+ { (yyval.pval) = (yyvsp[(1) - (1)].pval); }
break;
case 76:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 474 "ael.y"
- { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;}
+ { (yyval.pval) = (yyvsp[(1) - (1)].pval); }
break;
case 77:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 475 "ael.y"
{
(yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
- (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);;}
+ (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);}
break;
case 78:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 478 "ael.y"
{
(yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
- (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);;}
+ (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);}
break;
case 79:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 481 "ael.y"
{
(yyval.pval) = npval2(PV_LABEL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));
- (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str); ;}
+ (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str); }
break;
case 80:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 484 "ael.y"
- {reset_semicount(parseio->scanner);;}
+ {reset_semicount(parseio->scanner);}
break;
case 81:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 485 "ael.y"
- {reset_semicount(parseio->scanner);;}
+ {reset_semicount(parseio->scanner);}
break;
case 82:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 486 "ael.y"
- {reset_parencount(parseio->scanner);;}
+ {reset_parencount(parseio->scanner);}
break;
case 83:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 486 "ael.y"
{ /* XXX word_list maybe ? */
(yyval.pval) = npval2(PV_FOR, &(yylsp[(1) - (12)]), &(yylsp[(12) - (12)]));
(yyval.pval)->u1.for_init = (yyvsp[(4) - (12)].str);
(yyval.pval)->u2.for_test=(yyvsp[(7) - (12)].str);
(yyval.pval)->u3.for_inc = (yyvsp[(10) - (12)].str);
- (yyval.pval)->u4.for_statements = (yyvsp[(12) - (12)].pval); set_dads((yyval.pval),(yyvsp[(12) - (12)].pval));;}
+ (yyval.pval)->u4.for_statements = (yyvsp[(12) - (12)].pval); set_dads((yyval.pval),(yyvsp[(12) - (12)].pval));}
break;
case 84:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 492 "ael.y"
{
(yyval.pval) = npval2(PV_WHILE, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
(yyval.pval)->u1.str = (yyvsp[(2) - (3)].str);
- (yyval.pval)->u2.statements = (yyvsp[(3) - (3)].pval); set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));;}
+ (yyval.pval)->u2.statements = (yyvsp[(3) - (3)].pval); set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));}
break;
case 85:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 496 "ael.y"
- { (yyval.pval) = (yyvsp[(1) - (1)].pval); ;}
+ { (yyval.pval) = (yyvsp[(1) - (1)].pval); }
break;
case 86:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 497 "ael.y"
- { (yyval.pval) = update_last((yyvsp[(2) - (3)].pval), &(yylsp[(2) - (3)])); ;}
+ { (yyval.pval) = update_last((yyvsp[(2) - (3)].pval), &(yylsp[(2) - (3)])); }
break;
case 87:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 498 "ael.y"
- { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;}
+ { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); }
break;
case 88:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 499 "ael.y"
{
(yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));
- (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str);;}
+ (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str);}
break;
case 89:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 502 "ael.y"
- {reset_semicount(parseio->scanner);;}
+ {reset_semicount(parseio->scanner);}
break;
case 90:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 502 "ael.y"
{
char *bufx;
@@ -3092,196 +3131,196 @@ yyreduce:
(yyval.pval)->u1.str = bufx;
destroy_pval((yyvsp[(1) - (5)].pval)); /* the app call it is not, get rid of that chain */
prev_word = 0;
- ;}
+ }
break;
case 91:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 535 "ael.y"
- { (yyval.pval) = npval2(PV_BREAK, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;}
+ { (yyval.pval) = npval2(PV_BREAK, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); }
break;
case 92:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 536 "ael.y"
- { (yyval.pval) = npval2(PV_RETURN, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;}
+ { (yyval.pval) = npval2(PV_RETURN, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); }
break;
case 93:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 537 "ael.y"
- { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); ;}
+ { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); }
break;
case 94:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 538 "ael.y"
{
(yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(2) - (3)]));
(yyval.pval)->u2.statements = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval));
- (yyval.pval)->u3.else_statements = (yyvsp[(3) - (3)].pval);set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));;}
+ (yyval.pval)->u3.else_statements = (yyvsp[(3) - (3)].pval);set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));}
break;
case 95:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 542 "ael.y"
- { (yyval.pval)=0; ;}
+ { (yyval.pval)=0; }
break;
case 96:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 545 "ael.y"
- { (yyval.pval) = (yyvsp[(2) - (2)].pval); ;}
+ { (yyval.pval) = (yyvsp[(2) - (2)].pval); }
break;
case 97:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 546 "ael.y"
- { (yyval.pval) = NULL ; ;}
+ { (yyval.pval) = NULL ; }
break;
case 98:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 549 "ael.y"
- { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;}
+ { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); }
break;
case 99:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 550 "ael.y"
{
(yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));
- (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); ;}
+ (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); }
break;
case 100:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 553 "ael.y"
{
(yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));
- (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); ;}
+ (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); }
break;
case 101:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 556 "ael.y"
{
(yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)]));
(yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));
- (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); ;}
+ (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); }
break;
case 102:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 560 "ael.y"
{
(yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)]));
(yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));
- (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); ;}
+ (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); }
break;
case 103:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 564 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)]));
(yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));
- (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); ;}
+ (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); }
break;
case 104:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 568 "ael.y"
{
(yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)]));
(yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));
- (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); ;}
+ (yyval.pval)->next->next = nword((yyvsp[(5) - (5)].str), &(yylsp[(5) - (5)])); }
break;
case 105:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 574 "ael.y"
- { (yyval.str) = strdup("1"); ;}
+ { (yyval.str) = strdup("1"); }
break;
case 106:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 575 "ael.y"
- { (yyval.str) = (yyvsp[(2) - (2)].str); ;}
+ { (yyval.str) = (yyvsp[(2) - (2)].str); }
break;
case 107:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 579 "ael.y"
{ /* ext[, pri] default 1 */
(yyval.pval) = nword((yyvsp[(1) - (2)].str), &(yylsp[(1) - (2)]));
- (yyval.pval)->next = nword((yyvsp[(2) - (2)].str), &(yylsp[(2) - (2)])); ;}
+ (yyval.pval)->next = nword((yyvsp[(2) - (2)].str), &(yylsp[(2) - (2)])); }
break;
case 108:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 582 "ael.y"
{ /* context, ext, pri */
(yyval.pval) = nword((yyvsp[(4) - (4)].str), &(yylsp[(4) - (4)]));
(yyval.pval)->next = nword((yyvsp[(1) - (4)].str), &(yylsp[(1) - (4)]));
- (yyval.pval)->next->next = nword((yyvsp[(2) - (4)].str), &(yylsp[(2) - (4)])); ;}
+ (yyval.pval)->next->next = nword((yyvsp[(2) - (4)].str), &(yylsp[(2) - (4)])); }
break;
case 109:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 588 "ael.y"
- {reset_argcount(parseio->scanner);;}
+ {reset_argcount(parseio->scanner);}
break;
case 110:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 588 "ael.y"
{
/* XXX original code had @2 but i think we need @5 */
(yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));
(yyval.pval)->u1.str = (yyvsp[(1) - (5)].str);
- (yyval.pval)->u2.arglist = (yyvsp[(4) - (5)].pval);;}
+ (yyval.pval)->u2.arglist = (yyvsp[(4) - (5)].pval);}
break;
case 111:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 593 "ael.y"
{
(yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
- (yyval.pval)->u1.str = (yyvsp[(1) - (3)].str); ;}
+ (yyval.pval)->u1.str = (yyvsp[(1) - (3)].str); }
break;
case 112:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 601 "ael.y"
- {reset_argcount(parseio->scanner);;}
+ {reset_argcount(parseio->scanner);}
break;
case 113:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 601 "ael.y"
{
if (strcasecmp((yyvsp[(1) - (3)].str),"goto") == 0) {
@@ -3291,12 +3330,12 @@ yyreduce:
} else {
(yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[(1) - (3)]), &(yylsp[(2) - (3)]));
(yyval.pval)->u1.str = (yyvsp[(1) - (3)].str);
- } ;}
+ } }
break;
case 114:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 612 "ael.y"
{
(yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(3) - (3)]));
@@ -3304,170 +3343,170 @@ yyreduce:
(yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);
else
(yyval.pval)->u2.arglist = (yyvsp[(2) - (3)].pval);
- ;}
+ }
break;
case 115:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 619 "ael.y"
- { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); ;}
+ { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); }
break;
case 116:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 622 "ael.y"
{ (yyval.str) = (yyvsp[(1) - (1)].str) ;}
break;
case 117:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 623 "ael.y"
- { (yyval.str) = strdup(""); ;}
+ { (yyval.str) = strdup(""); }
break;
case 118:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 626 "ael.y"
- { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;}
+ { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); }
break;
case 119:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 627 "ael.y"
{
(yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);
- (yyval.pval)->u1.str = strdup(""); ;}
+ (yyval.pval)->u1.str = strdup(""); }
break;
case 120:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 630 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); }
break;
case 121:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 633 "ael.y"
- { (yyval.pval) = NULL; ;}
+ { (yyval.pval) = NULL; }
break;
case 122:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 634 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }
break;
case 123:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 637 "ael.y"
{
(yyval.pval) = npval2(PV_CASE, &(yylsp[(1) - (4)]), &(yylsp[(3) - (4)])); /* XXX 3 or 4 ? */
(yyval.pval)->u1.str = (yyvsp[(2) - (4)].str);
- (yyval.pval)->u2.statements = (yyvsp[(4) - (4)].pval); set_dads((yyval.pval),(yyvsp[(4) - (4)].pval));;}
+ (yyval.pval)->u2.statements = (yyvsp[(4) - (4)].pval); set_dads((yyval.pval),(yyvsp[(4) - (4)].pval));}
break;
case 124:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 641 "ael.y"
{
(yyval.pval) = npval2(PV_DEFAULT, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));
(yyval.pval)->u1.str = NULL;
- (yyval.pval)->u2.statements = (yyvsp[(3) - (3)].pval);set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));;}
+ (yyval.pval)->u2.statements = (yyvsp[(3) - (3)].pval);set_dads((yyval.pval),(yyvsp[(3) - (3)].pval));}
break;
case 125:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 645 "ael.y"
{
(yyval.pval) = npval2(PV_PATTERN, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); /* XXX@3 or @4 ? */
(yyval.pval)->u1.str = (yyvsp[(2) - (4)].str);
- (yyval.pval)->u2.statements = (yyvsp[(4) - (4)].pval);set_dads((yyval.pval),(yyvsp[(4) - (4)].pval));;}
+ (yyval.pval)->u2.statements = (yyvsp[(4) - (4)].pval);set_dads((yyval.pval),(yyvsp[(4) - (4)].pval));}
break;
case 126:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 651 "ael.y"
- { (yyval.pval) = NULL; ;}
+ { (yyval.pval) = NULL; }
break;
case 127:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 652 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }
break;
case 128:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 655 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 129:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 656 "ael.y"
- { (yyval.pval)=(yyvsp[(1) - (1)].pval);;}
+ { (yyval.pval)=(yyvsp[(1) - (1)].pval);}
break;
case 130:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 657 "ael.y"
{
(yyval.pval) = npval2(PV_CATCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));
(yyval.pval)->u1.str = (yyvsp[(2) - (5)].str);
- (yyval.pval)->u2.statements = (yyvsp[(4) - (5)].pval); set_dads((yyval.pval),(yyvsp[(4) - (5)].pval));;}
+ (yyval.pval)->u2.statements = (yyvsp[(4) - (5)].pval); set_dads((yyval.pval),(yyvsp[(4) - (5)].pval));}
break;
case 131:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 663 "ael.y"
{
(yyval.pval) = npval2(PV_SWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)]));
- (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;}
+ (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));}
break;
case 132:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 668 "ael.y"
{
(yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)]));
- (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;}
+ (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));}
break;
case 133:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 673 "ael.y"
- { (yyval.pval) = NULL; ;}
+ { (yyval.pval) = NULL; }
break;
case 134:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 674 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval),nword((yyvsp[(2) - (3)].str), &(yylsp[(2) - (3)]))); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval),nword((yyvsp[(2) - (3)].str), &(yylsp[(2) - (3)]))); }
break;
case 135:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 675 "ael.y"
{
char *x;
@@ -3479,77 +3518,88 @@ yyreduce:
free((yyvsp[(4) - (5)].str));
(yyval.pval) = linku1((yyvsp[(1) - (5)].pval),nword(x, &(yylsp[(2) - (5)])));
}
- ;}
+ }
break;
case 136:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 686 "ael.y"
- {(yyval.pval)=(yyvsp[(2) - (2)].pval);;}
+ {(yyval.pval)=(yyvsp[(2) - (2)].pval);}
break;
case 137:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 689 "ael.y"
- { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); ;}
+ { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); }
break;
case 138:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 690 "ael.y"
{
(yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));
(yyval.pval)->u2.arglist = (yyvsp[(3) - (3)].pval);
- prev_word=0; /* XXX sure ? */ ;}
+ prev_word=0; /* XXX sure ? */ }
break;
case 139:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 697 "ael.y"
- { (yyval.pval) = (yyvsp[(1) - (2)].pval); ;}
+ { (yyval.pval) = (yyvsp[(1) - (2)].pval); }
break;
case 140:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 698 "ael.y"
- { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), (yyvsp[(2) - (3)].pval)); ;}
+ { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), (yyvsp[(2) - (3)].pval)); }
break;
case 141:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 699 "ael.y"
- {(yyval.pval)=(yyvsp[(1) - (2)].pval);;}
+ {(yyval.pval)=(yyvsp[(1) - (2)].pval);}
break;
case 142:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 702 "ael.y"
{
(yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));
- (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval);set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));;}
+ (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval);set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));}
break;
case 143:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 705 "ael.y"
{
- (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));;}
+ (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));}
break;
-/* Line 1455 of yacc.c */
-#line 3551 "ael.tab.c"
+/* Line 1806 of yacc.c */
+#line 3590 "ael.tab.c"
default: break;
}
+ /* User semantic actions sometimes alter yychar, and that requires
+ that yytoken be updated with the new translation. We take the
+ approach of translating immediately before every use of yytoken.
+ One alternative is translating here after every semantic action,
+ but that translation would be missed if the semantic action invokes
+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
+ incorrect destructor might then be invoked immediately. In the
+ case of YYERROR or YYBACKUP, subsequent parser actions might lead
+ to an incorrect destructor call or verbose syntax error message
+ before the lookahead is translated. */
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen);
@@ -3578,6 +3628,10 @@ yyreduce:
| yyerrlab -- here on detecting error |
`------------------------------------*/
yyerrlab:
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
/* If not already recovering from an error, report this error. */
if (!yyerrstatus)
{
@@ -3585,41 +3639,40 @@ yyerrlab:
#if ! YYERROR_VERBOSE
yyerror (&yylloc, parseio, YY_("syntax error"));
#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+ yyssp, yytoken)
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
- {
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- }
- }
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (&yylloc, parseio, yymsg);
- }
- else
- {
- yyerror (&yylloc, parseio, YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ char const *yymsgp = YY_("syntax error");
+ int yysyntax_error_status;
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ if (yysyntax_error_status == 0)
+ yymsgp = yymsg;
+ else if (yysyntax_error_status == 1)
+ {
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+ if (!yymsg)
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ yysyntax_error_status = 2;
+ }
+ else
+ {
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ yymsgp = yymsg;
+ }
+ }
+ yyerror (&yylloc, parseio, yymsgp);
+ if (yysyntax_error_status == 2)
+ goto yyexhaustedlab;
}
+# undef YYSYNTAX_ERROR
#endif
}
- yyerror_range[0] = yylloc;
+ yyerror_range[1] = yylloc;
if (yyerrstatus == 3)
{
@@ -3656,7 +3709,7 @@ yyerrorlab:
if (/*CONSTCOND*/ 0)
goto yyerrorlab;
- yyerror_range[0] = yylsp[1-yylen];
+ yyerror_range[1] = yylsp[1-yylen];
/* Do not reclaim the symbols of the rule which action triggered
this YYERROR. */
YYPOPSTACK (yylen);
@@ -3675,7 +3728,7 @@ yyerrlab1:
for (;;)
{
yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
+ if (!yypact_value_is_default (yyn))
{
yyn += YYTERROR;
if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -3690,7 +3743,7 @@ yyerrlab1:
if (yyssp == yyss)
YYABORT;
- yyerror_range[0] = *yylsp;
+ yyerror_range[1] = *yylsp;
yydestruct ("Error: popping",
yystos[yystate], yyvsp, yylsp, parseio);
YYPOPSTACK (1);
@@ -3700,10 +3753,10 @@ yyerrlab1:
*++yyvsp = yylval;
- yyerror_range[1] = yylloc;
+ yyerror_range[2] = yylloc;
/* Using YYLLOC is tempting, but would change the location of
the lookahead. YYLOC is available though. */
- YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+ YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
*++yylsp = yyloc;
/* Shift the error token. */
@@ -3739,8 +3792,13 @@ yyexhaustedlab:
yyreturn:
if (yychar != YYEMPTY)
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval, &yylloc, parseio);
+ {
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = YYTRANSLATE (yychar);
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval, &yylloc, parseio);
+ }
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -3765,7 +3823,7 @@ yyreturn:
-/* Line 1675 of yacc.c */
+/* Line 2067 of yacc.c */
#line 710 "ael.y"
diff --git a/res/ael/ael.tab.h b/res/ael/ael.tab.h
index 0f517c66f..93fc23d0c 100644
--- a/res/ael/ael.tab.h
+++ b/res/ael/ael.tab.h
@@ -1,10 +1,8 @@
+/* A Bison parser, made by GNU Bison 2.5. */
-/* A Bison parser, made by GNU Bison 2.4.1. */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -89,7 +87,7 @@
typedef union YYSTYPE
{
-/* Line 1676 of yacc.c */
+/* Line 2068 of yacc.c */
#line 59 "ael.y"
int intval; /* integer value, typically flags */
@@ -98,8 +96,8 @@ typedef union YYSTYPE
-/* Line 1676 of yacc.c */
-#line 103 "ael.tab.h"
+/* Line 2068 of yacc.c */
+#line 101 "ael.tab.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c
index bd61064c4..7fba129b7 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -56,6 +56,7 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -86,8 +87,6 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
-#endif /* ! C99 */
-
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -161,15 +160,7 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -961,7 +952,7 @@ static void pbcwhere(const char *text, int *line, int *col )
#define STORE_POS
#define STORE_LOC
#endif
-#line 963 "ael_lex.c"
+#line 954 "ael_lex.c"
#define INITIAL 0
#define paren 1
@@ -1063,6 +1054,10 @@ int ael_yyget_lineno (yyscan_t yyscanner );
void ael_yyset_lineno (int line_number ,yyscan_t yyscanner );
+int ael_yyget_column (yyscan_t yyscanner );
+
+void ael_yyset_column (int column_no ,yyscan_t yyscanner );
+
YYSTYPE * ael_yyget_lval (yyscan_t yyscanner );
void ael_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@ -1105,12 +1100,7 @@ static int input (yyscan_t yyscanner );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -1129,7 +1119,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- size_t n; \
+ unsigned n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -1217,7 +1207,7 @@ YY_DECL
#line 217 "ael.flex"
-#line 1219 "ael_lex.c"
+#line 1209 "ael_lex.c"
yylval = yylval_param;
@@ -2051,7 +2041,7 @@ YY_RULE_SETUP
#line 656 "ael.flex"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
-#line 2053 "ael_lex.c"
+#line 2043 "ael_lex.c"
case YY_END_OF_BUFFER:
{
@@ -2822,8 +2812,8 @@ YY_BUFFER_STATE ael_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
/** Setup the input buffer state to scan the given bytes. The next call to ael_yylex() will
* scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 07:57:20 +0000