<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/20023">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span></span><br></pre><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ael: Regenerate lexers and parsers.<br><br>Various changes to ensure that the lexers and parsers can be correctly<br>generated when REBUILD_PARSERS is enabled.<br><br>Some notes:<br><br>* Because of the version of flex we are using to generate the lexers<br> (2.5.35) some post-processing in the Makefile is still required.<br><br>* The generated lexers do not contain the problematic C99 check that<br> was being replaced by the call to sed in the respective Makefiles so<br> it was removed.<br><br>* Since these files are generated, they will include trailing<br> whitespace in some places. This does not need to be corrected.<br><br>Change-Id: Ibbd343606fcf5c0d285b1599e6e8e59f514f2e4e<br>---<br>M main/Makefile<br>M main/ast_expr2.c<br>M main/ast_expr2.h<br>M main/ast_expr2f.c<br>M res/Makefile<br>M res/ael/ael.flex<br>M res/ael/ael.tab.c<br>M res/ael/ael.tab.h<br>M res/ael/ael_lex.c<br>9 files changed, 603 insertions(+), 608 deletions(-)<br><br></pre>
<pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/Makefile b/main/Makefile</span><br><span>index ac47423..2973917 100644</span><br><span>--- a/main/Makefile</span><br><span>+++ b/main/Makefile</span><br><span>@@ -133,13 +133,10 @@</span><br><span> ast_expr2f.c:</span><br><span> endif</span><br><span> $(ECHO_PREFIX) echo " [FLEX] $< -> $@"</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) $(FLEX) -o $@ ast_expr2.fl</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix</span><br><span> $(CMD_PREFIX) echo "#define ASTMM_LIBC ASTMM_REDIRECT" > $@</span><br><span> $(CMD_PREFIX) echo "#include \"asterisk.h\"" >> $@</span><br><span> $(CMD_PREFIX) echo >> $@</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) cat $@.fix >> $@</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) rm $@.fix</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CMD_PREFIX) $(FLEX) -t ast_expr2.fl >> $@</span><br><span> </span><br><span> ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)</span><br><span> GMIMELDFLAGS+=$(GMIME_LIB)</span><br><span>diff --git a/main/ast_expr2.c b/main/ast_expr2.c</span><br><span>index 5b8f6e8..ac02037 100644</span><br><span>--- a/main/ast_expr2.c</span><br><span>+++ b/main/ast_expr2.c</span><br><span>@@ -2,20 +2,20 @@</span><br><span> /* A Bison parser, made by GNU Bison 2.4.1. */</span><br><span> </span><br><span> /* Skeleton implementation for Bison's Yacc-like parsers in C</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006</span><br><span> Free Software Foundation, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This program is free software: you can redistribute it and/or modify</span><br><span> it under the terms of the GNU General Public License as published by</span><br><span> the Free Software Foundation, either version 3 of the License, or</span><br><span> (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This program is distributed in the hope that it will be useful,</span><br><span> but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span> GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> You should have received a copy of the GNU General Public License</span><br><span> along with this program. If not, see <http://www.gnu.org/licenses/>. */</span><br><span> </span><br><span>@@ -28,7 +28,7 @@</span><br><span> special exception, which will cause the skeleton and the resulting</span><br><span> Bison output files to be licensed under the GNU General Public</span><br><span> License without this special exception.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This special exception was added by the Free Software Foundation in</span><br><span> version 2.2 of Bison. */</span><br><span> </span><br><span>@@ -413,7 +413,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 189 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 419 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 417 "ast_expr2.c"</span><br><span> </span><br><span> /* Enabling traces. */</span><br><span> #ifndef YYDEBUG</span><br><span>@@ -473,7 +473,7 @@</span><br><span> {</span><br><span> </span><br><span> /* Line 214 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 345 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 343 "ast_expr2.y"</span><br><span> </span><br><span> struct val *val;</span><br><span> struct expr_node *arglist;</span><br><span>@@ -481,7 +481,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 214 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 487 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 485 "ast_expr2.c"</span><br><span> } YYSTYPE;</span><br><span> # define YYSTYPE_IS_TRIVIAL 1</span><br><span> # define yystype YYSTYPE /* obsolescent; will be withdrawn */</span><br><span>@@ -505,13 +505,13 @@</span><br><span> /* Copy the second part of user declarations. */</span><br><span> </span><br><span> /* Line 264 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 350 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 348 "ast_expr2.y"</span><br><span> </span><br><span> extern int ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t));</span><br><span> </span><br><span> </span><br><span> /* Line 264 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 517 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 515 "ast_expr2.c"</span><br><span> </span><br><span> #ifdef short</span><br><span> # undef short</span><br><span>@@ -809,9 +809,9 @@</span><br><span> /* YYRLINE[YYN] -- source line where rule number YYN was defined. */</span><br><span> static const yytype_uint16 yyrline[] =</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 374, 374, 382, 389, 390, 396, 405, 411, 412,</span><br><span style="color: hsl(0, 100%, 40%);">- 416, 420, 424, 428, 432, 436, 440, 444, 448, 452,</span><br><span style="color: hsl(0, 100%, 40%);">- 456, 460, 464, 468, 472, 476, 480, 484, 489</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, 372, 372, 380, 387, 388, 394, 403, 409, 410,</span><br><span style="color: hsl(120, 100%, 40%);">+ 414, 418, 422, 426, 430, 434, 438, 442, 446, 450,</span><br><span style="color: hsl(120, 100%, 40%);">+ 454, 458, 462, 466, 470, 474, 478, 482, 487</span><br><span> };</span><br><span> #endif</span><br><span> </span><br><span>@@ -1226,7 +1226,7 @@</span><br><span> # define YYMAXDEPTH 10000</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> </span><br><span> #if YYERROR_VERBOSE</span><br><span> </span><br><span>@@ -1437,7 +1437,7 @@</span><br><span> }</span><br><span> }</span><br><span> #endif /* YYERROR_VERBOSE */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> </span><br><span> /*-----------------------------------------------.</span><br><span> | Release the memory associated to this symbol. |</span><br><span>@@ -1469,209 +1469,209 @@</span><br><span> case 4: /* "TOK_COLONCOLON" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1479 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1477 "ast_expr2.c"</span><br><span> break;</span><br><span> case 5: /* "TOK_COND" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1488 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1486 "ast_expr2.c"</span><br><span> break;</span><br><span> case 6: /* "TOK_OR" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1497 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1495 "ast_expr2.c"</span><br><span> break;</span><br><span> case 7: /* "TOK_AND" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1506 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1504 "ast_expr2.c"</span><br><span> break;</span><br><span> case 8: /* "TOK_NE" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1515 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1513 "ast_expr2.c"</span><br><span> break;</span><br><span> case 9: /* "TOK_LE" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1524 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1522 "ast_expr2.c"</span><br><span> break;</span><br><span> case 10: /* "TOK_GE" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1533 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1531 "ast_expr2.c"</span><br><span> break;</span><br><span> case 11: /* "TOK_LT" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1542 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1540 "ast_expr2.c"</span><br><span> break;</span><br><span> case 12: /* "TOK_GT" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1551 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1549 "ast_expr2.c"</span><br><span> break;</span><br><span> case 13: /* "TOK_EQ" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1560 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1558 "ast_expr2.c"</span><br><span> break;</span><br><span> case 14: /* "TOK_MINUS" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1569 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1567 "ast_expr2.c"</span><br><span> break;</span><br><span> case 15: /* "TOK_PLUS" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1578 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1576 "ast_expr2.c"</span><br><span> break;</span><br><span> case 16: /* "TOK_MOD" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1587 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1585 "ast_expr2.c"</span><br><span> break;</span><br><span> case 17: /* "TOK_DIV" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1596 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1594 "ast_expr2.c"</span><br><span> break;</span><br><span> case 18: /* "TOK_MULT" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1605 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1603 "ast_expr2.c"</span><br><span> break;</span><br><span> case 19: /* "TOK_COMPL" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1614 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1612 "ast_expr2.c"</span><br><span> break;</span><br><span> case 20: /* "TOK_TILDETILDE" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1623 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1621 "ast_expr2.c"</span><br><span> break;</span><br><span> case 21: /* "TOK_EQTILDE" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1632 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1630 "ast_expr2.c"</span><br><span> break;</span><br><span> case 22: /* "TOK_COLON" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1641 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1639 "ast_expr2.c"</span><br><span> break;</span><br><span> case 23: /* "TOK_LP" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1650 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1648 "ast_expr2.c"</span><br><span> break;</span><br><span> case 24: /* "TOK_RP" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1659 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1657 "ast_expr2.c"</span><br><span> break;</span><br><span> case 25: /* "TOKEN" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1668 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1666 "ast_expr2.c"</span><br><span> break;</span><br><span> case 29: /* "expr" */</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 368 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 366 "ast_expr2.y"</span><br><span> { free_value((yyvaluep->val)); };</span><br><span> </span><br><span> /* Line 1000 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1677 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1675 "ast_expr2.c"</span><br><span> break;</span><br><span> </span><br><span> default:</span><br><span>@@ -2002,7 +2002,7 @@</span><br><span> case 2:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 374 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 372 "ast_expr2.y"</span><br><span> { ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1);</span><br><span> ((struct parse_io *)parseio)->val->type = (yyvsp[(1) - (1)].val)->type;</span><br><span> if( (yyvsp[(1) - (1)].val)->type == AST_EXPR_number )</span><br><span>@@ -2016,7 +2016,7 @@</span><br><span> case 3:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 382 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 380 "ast_expr2.y"</span><br><span> {/* nothing */ ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1);</span><br><span> ((struct parse_io *)parseio)->val->type = AST_EXPR_string;</span><br><span> ((struct parse_io *)parseio)->val->u.s = strdup("");</span><br><span>@@ -2026,14 +2026,14 @@</span><br><span> case 4:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 389 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 387 "ast_expr2.y"</span><br><span> { (yyval.arglist) = alloc_expr_node(AST_EXPR_NODE_VAL); (yyval.arglist)->val = (yyvsp[(1) - (1)].val);;}</span><br><span> break;</span><br><span> </span><br><span> case 5:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 390 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 388 "ast_expr2.y"</span><br><span> {struct expr_node *x = alloc_expr_node(AST_EXPR_NODE_VAL);</span><br><span> struct expr_node *t;</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span>@@ -2045,7 +2045,7 @@</span><br><span> case 6:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 396 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 394 "ast_expr2.y"</span><br><span> {struct expr_node *x = alloc_expr_node(AST_EXPR_NODE_VAL);</span><br><span> struct expr_node *t; /* NULL args should OK */</span><br><span> DESTROY((yyvsp[(2) - (2)].val));</span><br><span>@@ -2057,7 +2057,7 @@</span><br><span> case 7:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 405 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 403 "ast_expr2.y"</span><br><span> { (yyval.val) = op_func((yyvsp[(1) - (4)].val),(yyvsp[(3) - (4)].arglist), ((struct parse_io *)parseio)->chan);</span><br><span> DESTROY((yyvsp[(2) - (4)].val));</span><br><span> DESTROY((yyvsp[(4) - (4)].val));</span><br><span>@@ -2069,14 +2069,14 @@</span><br><span> case 8:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 411 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 409 "ast_expr2.y"</span><br><span> {(yyval.val) = (yyvsp[(1) - (1)].val);;}</span><br><span> break;</span><br><span> </span><br><span> case 9:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 412 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 410 "ast_expr2.y"</span><br><span> { (yyval.val) = (yyvsp[(2) - (3)].val);</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span> (yyloc).first_line=0; (yyloc).last_line=0;</span><br><span>@@ -2086,7 +2086,7 @@</span><br><span> case 10:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 416 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 414 "ast_expr2.y"</span><br><span> { (yyval.val) = op_or ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2096,7 +2096,7 @@</span><br><span> case 11:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 420 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 418 "ast_expr2.y"</span><br><span> { (yyval.val) = op_and ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2106,7 +2106,7 @@</span><br><span> case 12:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 424 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 422 "ast_expr2.y"</span><br><span> { (yyval.val) = op_eq ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2116,7 +2116,7 @@</span><br><span> case 13:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 428 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 426 "ast_expr2.y"</span><br><span> { (yyval.val) = op_gt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2126,7 +2126,7 @@</span><br><span> case 14:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 432 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 430 "ast_expr2.y"</span><br><span> { (yyval.val) = op_lt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2136,7 +2136,7 @@</span><br><span> case 15:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 436 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 434 "ast_expr2.y"</span><br><span> { (yyval.val) = op_ge ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2146,7 +2146,7 @@</span><br><span> case 16:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 440 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 438 "ast_expr2.y"</span><br><span> { (yyval.val) = op_le ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2156,7 +2156,7 @@</span><br><span> case 17:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 444 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 442 "ast_expr2.y"</span><br><span> { (yyval.val) = op_ne ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2166,7 +2166,7 @@</span><br><span> case 18:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 448 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 446 "ast_expr2.y"</span><br><span> { (yyval.val) = op_plus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2176,7 +2176,7 @@</span><br><span> case 19:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 452 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 450 "ast_expr2.y"</span><br><span> { (yyval.val) = op_minus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2186,7 +2186,7 @@</span><br><span> case 20:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 456 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 454 "ast_expr2.y"</span><br><span> { (yyval.val) = op_negate ((yyvsp[(2) - (2)].val));</span><br><span> DESTROY((yyvsp[(1) - (2)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column;</span><br><span>@@ -2196,7 +2196,7 @@</span><br><span> case 21:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 460 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 458 "ast_expr2.y"</span><br><span> { (yyval.val) = op_compl ((yyvsp[(2) - (2)].val));</span><br><span> DESTROY((yyvsp[(1) - (2)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column;</span><br><span>@@ -2206,7 +2206,7 @@</span><br><span> case 22:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 464 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 462 "ast_expr2.y"</span><br><span> { (yyval.val) = op_times ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2216,7 +2216,7 @@</span><br><span> case 23:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 468 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 466 "ast_expr2.y"</span><br><span> { (yyval.val) = op_div ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2226,7 +2226,7 @@</span><br><span> case 24:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 472 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 470 "ast_expr2.y"</span><br><span> { (yyval.val) = op_rem ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2236,7 +2236,7 @@</span><br><span> case 25:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 476 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 474 "ast_expr2.y"</span><br><span> { (yyval.val) = op_colon ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2246,7 +2246,7 @@</span><br><span> case 26:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 480 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 478 "ast_expr2.y"</span><br><span> { (yyval.val) = op_eqtilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2256,7 +2256,7 @@</span><br><span> case 27:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 484 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 482 "ast_expr2.y"</span><br><span> { (yyval.val) = op_cond ((yyvsp[(1) - (5)].val), (yyvsp[(3) - (5)].val), (yyvsp[(5) - (5)].val));</span><br><span> DESTROY((yyvsp[(2) - (5)].val));</span><br><span> DESTROY((yyvsp[(4) - (5)].val));</span><br><span>@@ -2267,7 +2267,7 @@</span><br><span> case 28:</span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 489 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 487 "ast_expr2.y"</span><br><span> { (yyval.val) = op_tildetilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));</span><br><span> DESTROY((yyvsp[(2) - (3)].val));</span><br><span> (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column;</span><br><span>@@ -2277,7 +2277,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 1455 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 2283 "ast_expr2.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 2281 "ast_expr2.c"</span><br><span> default: break;</span><br><span> }</span><br><span> YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);</span><br><span>@@ -2496,7 +2496,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 1675 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 495 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 493 "ast_expr2.y"</span><br><span> </span><br><span> </span><br><span> static struct expr_node *alloc_expr_node(enum node_type nt)</span><br><span>@@ -3685,3 +3685,4 @@</span><br><span> </span><br><span> return v;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/main/ast_expr2.h b/main/ast_expr2.h</span><br><span>index 6282834..0b0ae69 100644</span><br><span>--- a/main/ast_expr2.h</span><br><span>+++ b/main/ast_expr2.h</span><br><span>@@ -2,20 +2,20 @@</span><br><span> /* A Bison parser, made by GNU Bison 2.4.1. */</span><br><span> </span><br><span> /* Skeleton interface for Bison's Yacc-like parsers in C</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006</span><br><span> Free Software Foundation, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This program is free software: you can redistribute it and/or modify</span><br><span> it under the terms of the GNU General Public License as published by</span><br><span> the Free Software Foundation, either version 3 of the License, or</span><br><span> (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This program is distributed in the hope that it will be useful,</span><br><span> but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span> GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> You should have received a copy of the GNU General Public License</span><br><span> along with this program. If not, see <http://www.gnu.org/licenses/>. */</span><br><span> </span><br><span>@@ -28,7 +28,7 @@</span><br><span> special exception, which will cause the skeleton and the resulting</span><br><span> Bison output files to be licensed under the GNU General Public</span><br><span> License without this special exception.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This special exception was added by the Free Software Foundation in</span><br><span> version 2.2 of Bison. */</span><br><span> </span><br><span>@@ -72,7 +72,7 @@</span><br><span> {</span><br><span> </span><br><span> /* Line 1676 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 345 "ast_expr2.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 343 "ast_expr2.y"</span><br><span> </span><br><span> struct val *val;</span><br><span> struct expr_node *arglist;</span><br><span>@@ -101,3 +101,6 @@</span><br><span> # define YYLTYPE_IS_DECLARED 1</span><br><span> # define YYLTYPE_IS_TRIVIAL 1</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c</span><br><span>index 49e2545..9819eb7 100644</span><br><span>--- a/main/ast_expr2f.c</span><br><span>+++ b/main/ast_expr2f.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L</span><br><span> </span><br><span> /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,</span><br><span style="color: hsl(0, 100%, 40%);">- * if you want the limit (max/min) macros for int types.</span><br><span style="color: hsl(120, 100%, 40%);">+ * if you want the limit (max/min) macros for int types. </span><br><span> */</span><br><span> #ifndef __STDC_LIMIT_MACROS</span><br><span> #define __STDC_LIMIT_MACROS 1</span><br><span>@@ -54,9 +54,10 @@</span><br><span> typedef signed char flex_int8_t;</span><br><span> typedef short int flex_int16_t;</span><br><span> typedef int flex_int32_t;</span><br><span style="color: hsl(0, 100%, 40%);">-typedef unsigned char flex_uint8_t;</span><br><span style="color: hsl(120, 100%, 40%);">+typedef unsigned char flex_uint8_t; </span><br><span> typedef unsigned short int flex_uint16_t;</span><br><span> typedef unsigned int flex_uint32_t;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* ! C99 */</span><br><span> </span><br><span> /* Limits of integral types. */</span><br><span> #ifndef INT8_MIN</span><br><span>@@ -87,8 +88,6 @@</span><br><span> #define UINT32_MAX (4294967295U)</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* ! C99 */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #endif /* ! FLEXINT_H */</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span>@@ -162,15 +161,7 @@</span><br><span> </span><br><span> /* Size of default input buffer. */</span><br><span> #ifndef YY_BUF_SIZE</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef __ia64__</span><br><span style="color: hsl(0, 100%, 40%);">-/* On IA-64, the buffer size is 16k, not 8k.</span><br><span style="color: hsl(0, 100%, 40%);">- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.</span><br><span style="color: hsl(0, 100%, 40%);">- * Ditto for the __ia64__ case accordingly.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-#define YY_BUF_SIZE 32768</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span> #define YY_BUF_SIZE 16384</span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* __ia64__ */</span><br><span> #endif</span><br><span> </span><br><span> /* The state buf must be large enough to hold one state per character in the main buffer.</span><br><span>@@ -187,7 +178,7 @@</span><br><span> #define EOB_ACT_LAST_MATCH 2</span><br><span> </span><br><span> #define YY_LESS_LINENO(n)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Return all but the first "n" matched characters back to the input stream. */</span><br><span> #define yyless(n) \</span><br><span> do \</span><br><span>@@ -249,7 +240,7 @@</span><br><span> </span><br><span> int yy_bs_lineno; /**< The line count. */</span><br><span> int yy_bs_column; /**< The column count. */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Whether to try to fill the input buffer when we reach the</span><br><span> * end of it.</span><br><span> */</span><br><span>@@ -602,13 +593,13 @@</span><br><span> yyscan_t scanner;</span><br><span> struct ast_channel *chan;</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> void ast_yyset_column(int column_no, yyscan_t yyscanner);</span><br><span> int ast_yyget_column(yyscan_t yyscanner);</span><br><span> static int curlycount = 0;</span><br><span> static char *expr2_token_subst(const char *mess);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#line 611 "ast_expr2f.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 600 "ast_expr2f.c"</span><br><span> </span><br><span> #define INITIAL 0</span><br><span> #define var 1</span><br><span>@@ -669,9 +660,9 @@</span><br><span> /* This must go here because YYSTYPE and YYLTYPE are included</span><br><span> * from bison output in section 1.*/</span><br><span> # define yylval yyg->yylval_r</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> # define yylloc yyg->yylloc_r</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> int ast_yylex_init (yyscan_t* scanner);</span><br><span> </span><br><span> int ast_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);</span><br><span>@@ -710,9 +701,9 @@</span><br><span> void ast_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );</span><br><span> </span><br><span> YYLTYPE *ast_yyget_lloc (yyscan_t yyscanner );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> void ast_yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Macros after this point can all be overridden by user definitions in</span><br><span> * section 1.</span><br><span> */</span><br><span>@@ -726,7 +717,7 @@</span><br><span> #endif</span><br><span> </span><br><span> static void yyunput (int c,char *buf_ptr ,yyscan_t yyscanner);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> #ifndef yytext_ptr</span><br><span> static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);</span><br><span> #endif</span><br><span>@@ -747,12 +738,7 @@</span><br><span> </span><br><span> /* Amount of stuff to slurp up with each read. */</span><br><span> #ifndef YY_READ_BUF_SIZE</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef __ia64__</span><br><span style="color: hsl(0, 100%, 40%);">-/* On IA-64, the buffer size is 16k, not 8k */</span><br><span style="color: hsl(0, 100%, 40%);">-#define YY_READ_BUF_SIZE 16384</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span> #define YY_READ_BUF_SIZE 8192</span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* __ia64__ */</span><br><span> #endif</span><br><span> </span><br><span> /* Copy whatever the last rule matched to the standard output. */</span><br><span>@@ -760,7 +746,7 @@</span><br><span> /* This used to be an fputs(), but since the string might contain NUL's,</span><br><span> * we now use fwrite().</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ECHO fwrite( yytext, yyleng, 1, yyout )</span><br><span> #endif</span><br><span> </span><br><span> /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,</span><br><span>@@ -771,7 +757,7 @@</span><br><span> if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \</span><br><span> { \</span><br><span> int c = '*'; \</span><br><span style="color: hsl(0, 100%, 40%);">- size_t n; \</span><br><span style="color: hsl(120, 100%, 40%);">+ int n; \</span><br><span> for ( n = 0; n < max_size && \</span><br><span> (c = getc( yyin )) != EOF && c != '\n'; ++n ) \</span><br><span> buf[n] = (char) c; \</span><br><span>@@ -856,10 +842,10 @@</span><br><span> register int yy_act;</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#line 130 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 128 "ast_expr2.fl"</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#line 862 "ast_expr2f.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 846 "ast_expr2f.c"</span><br><span> </span><br><span> yylval = yylval_param;</span><br><span> </span><br><span>@@ -950,132 +936,132 @@</span><br><span> </span><br><span> case 1:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 132 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 130 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_OR;}</span><br><span> YY_BREAK</span><br><span> case 2:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 133 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 131 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_AND;}</span><br><span> YY_BREAK</span><br><span> case 3:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 134 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 132 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_EQ;}</span><br><span> YY_BREAK</span><br><span> case 4:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 135 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 133 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_OR;}</span><br><span> YY_BREAK</span><br><span> case 5:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 136 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 134 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_AND;}</span><br><span> YY_BREAK</span><br><span> case 6:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 137 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 135 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_EQ;}</span><br><span> YY_BREAK</span><br><span> case 7:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 138 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 136 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_EQTILDE;}</span><br><span> YY_BREAK</span><br><span> case 8:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 139 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 137 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_TILDETILDE;}</span><br><span> YY_BREAK</span><br><span> case 9:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 140 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 138 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_GT;}</span><br><span> YY_BREAK</span><br><span> case 10:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 141 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 139 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_LT;}</span><br><span> YY_BREAK</span><br><span> case 11:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 142 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 140 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_GE;}</span><br><span> YY_BREAK</span><br><span> case 12:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 143 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 141 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_LE;}</span><br><span> YY_BREAK</span><br><span> case 13:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 144 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 142 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_NE;}</span><br><span> YY_BREAK</span><br><span> case 14:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 145 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 143 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_PLUS;}</span><br><span> YY_BREAK</span><br><span> case 15:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 146 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 144 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_COMMA;}</span><br><span> YY_BREAK</span><br><span> case 16:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 147 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 145 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_MINUS;}</span><br><span> YY_BREAK</span><br><span> case 17:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 148 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 146 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_MULT;}</span><br><span> YY_BREAK</span><br><span> case 18:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 149 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 147 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_DIV;}</span><br><span> YY_BREAK</span><br><span> case 19:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 150 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 148 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_MOD;}</span><br><span> YY_BREAK</span><br><span> case 20:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 151 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 149 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_COND;}</span><br><span> YY_BREAK</span><br><span> case 21:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 152 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 150 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_COMPL;}</span><br><span> YY_BREAK</span><br><span> case 22:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 153 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 151 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_COLON;}</span><br><span> YY_BREAK</span><br><span> case 23:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 154 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 152 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_COLONCOLON;}</span><br><span> YY_BREAK</span><br><span> case 24:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 155 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 153 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_LP;}</span><br><span> YY_BREAK</span><br><span> case 25:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 156 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 154 "ast_expr2.fl"</span><br><span> { SET_COLUMNS; SET_STRING; return TOK_RP;}</span><br><span> YY_BREAK</span><br><span> case 26:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 157 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 155 "ast_expr2.fl"</span><br><span> {</span><br><span> /* gather the contents of ${} expressions, with trailing stuff,</span><br><span> * into a single TOKEN.</span><br><span>@@ -1088,24 +1074,24 @@</span><br><span> YY_BREAK</span><br><span> case 27:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 167 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 165 "ast_expr2.fl"</span><br><span> {}</span><br><span> YY_BREAK</span><br><span> case 28:</span><br><span> /* rule 28 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 168 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 166 "ast_expr2.fl"</span><br><span> {SET_COLUMNS; SET_STRING; return TOKEN;}</span><br><span> YY_BREAK</span><br><span> case 29:</span><br><span> /* rule 29 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 168 "ast_expr2.fl"</span><br><span> {/* what to do with eol */}</span><br><span> YY_BREAK</span><br><span> case 30:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 171 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ast_expr2.fl"</span><br><span> {</span><br><span> SET_COLUMNS;</span><br><span> /* the original behavior of the expression parser was</span><br><span>@@ -1118,7 +1104,7 @@</span><br><span> case 31:</span><br><span> /* rule 31 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 180 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 178 "ast_expr2.fl"</span><br><span> {</span><br><span> SET_COLUMNS;</span><br><span> SET_STRING;</span><br><span>@@ -1128,7 +1114,7 @@</span><br><span> case 32:</span><br><span> /* rule 32 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 186 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 184 "ast_expr2.fl"</span><br><span> {</span><br><span> curlycount = 0;</span><br><span> BEGIN(var);</span><br><span>@@ -1138,7 +1124,7 @@</span><br><span> case 33:</span><br><span> /* rule 33 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 192 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 190 "ast_expr2.fl"</span><br><span> {</span><br><span> curlycount--;</span><br><span> if (curlycount < 0) {</span><br><span>@@ -1152,7 +1138,7 @@</span><br><span> case 34:</span><br><span> /* rule 34 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 202 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 200 "ast_expr2.fl"</span><br><span> {</span><br><span> curlycount++;</span><br><span> yymore();</span><br><span>@@ -1160,7 +1146,7 @@</span><br><span> YY_BREAK</span><br><span> case 35:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 208 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 206 "ast_expr2.fl"</span><br><span> {</span><br><span> BEGIN(0);</span><br><span> SET_COLUMNS;</span><br><span>@@ -1170,7 +1156,7 @@</span><br><span> YY_BREAK</span><br><span> case 36:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 215 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 213 "ast_expr2.fl"</span><br><span> {</span><br><span> curlycount = 0;</span><br><span> BEGIN(var);</span><br><span>@@ -1180,7 +1166,7 @@</span><br><span> case 37:</span><br><span> /* rule 37 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 221 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 219 "ast_expr2.fl"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> BEGIN(0);</span><br><span>@@ -1191,7 +1177,7 @@</span><br><span> }</span><br><span> YY_BREAK</span><br><span> case YY_STATE_EOF(trail):</span><br><span style="color: hsl(0, 100%, 40%);">-#line 230 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 228 "ast_expr2.fl"</span><br><span> {</span><br><span> BEGIN(0);</span><br><span> SET_COLUMNS;</span><br><span>@@ -1202,10 +1188,10 @@</span><br><span> YY_BREAK</span><br><span> case 38:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 238 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 236 "ast_expr2.fl"</span><br><span> ECHO;</span><br><span> YY_BREAK</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1208 "ast_expr2f.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1192 "ast_expr2f.c"</span><br><span> case YY_STATE_EOF(INITIAL):</span><br><span> case YY_STATE_EOF(var):</span><br><span> yyterminate();</span><br><span>@@ -1725,7 +1711,7 @@</span><br><span> YY_BUFFER_STATE ast_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner)</span><br><span> {</span><br><span> YY_BUFFER_STATE b;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> b = (YY_BUFFER_STATE) ast_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );</span><br><span> if ( ! b )</span><br><span> YY_FATAL_ERROR( "out of dynamic memory in ast_yy_create_buffer()" );</span><br><span>@@ -1769,7 +1755,7 @@</span><br><span> #ifndef __cplusplus</span><br><span> extern int isatty (int );</span><br><span> #endif /* __cplusplus */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Initializes or reinitializes a buffer.</span><br><span> * This function is sometimes called more than once on the same buffer,</span><br><span> * such as during a ast_yyrestart() or at EOF.</span><br><span>@@ -1795,7 +1781,7 @@</span><br><span> }</span><br><span> </span><br><span> b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> errno = oerrno;</span><br><span> }</span><br><span> </span><br><span>@@ -1901,9 +1887,9 @@</span><br><span> , yyscanner);</span><br><span> if ( ! yyg->yy_buffer_stack )</span><br><span> YY_FATAL_ERROR( "out of dynamic memory in ast_yyensure_buffer_stack()" );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> yyg->yy_buffer_stack_max = num_to_alloc;</span><br><span> yyg->yy_buffer_stack_top = 0;</span><br><span> return;</span><br><span>@@ -1932,12 +1918,12 @@</span><br><span> * @param base the character buffer</span><br><span> * @param size the size in bytes of the character buffer</span><br><span> * @param yyscanner The scanner object.</span><br><span style="color: hsl(0, 100%, 40%);">- * @return the newly allocated buffer state object.</span><br><span style="color: hsl(120, 100%, 40%);">+ * @return the newly allocated buffer state object. </span><br><span> */</span><br><span> YY_BUFFER_STATE ast_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)</span><br><span> {</span><br><span> YY_BUFFER_STATE b;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> if ( size < 2 ||</span><br><span> base[size-2] != YY_END_OF_BUFFER_CHAR ||</span><br><span> base[size-1] != YY_END_OF_BUFFER_CHAR )</span><br><span>@@ -1973,14 +1959,14 @@</span><br><span> */</span><br><span> YY_BUFFER_STATE ast_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> return ast_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);</span><br><span> }</span><br><span> </span><br><span> /** Setup the input buffer state to scan the given bytes. The next call to ast_yylex() will</span><br><span> * scan from a @e copy of @a bytes.</span><br><span style="color: hsl(0, 100%, 40%);">- * @param yybytes the byte buffer to scan</span><br><span style="color: hsl(0, 100%, 40%);">- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param bytes the byte buffer to scan</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param len the number of bytes in the buffer pointed to by @a bytes.</span><br><span> * @param yyscanner The scanner object.</span><br><span> * @return the newly allocated buffer state object.</span><br><span> */</span><br><span>@@ -1990,7 +1976,7 @@</span><br><span> char *buf;</span><br><span> yy_size_t n;</span><br><span> int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Get memory for full buffer, including space for trailing EOB's. */</span><br><span> n = _yybytes_len + 2;</span><br><span> buf = (char *) ast_yyalloc(n ,yyscanner );</span><br><span>@@ -2058,10 +2044,10 @@</span><br><span> int ast_yyget_lineno (yyscan_t yyscanner)</span><br><span> {</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> if (! YY_CURRENT_BUFFER)</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> return yylineno;</span><br><span> }</span><br><span> </span><br><span>@@ -2071,10 +2057,10 @@</span><br><span> int ast_yyget_column (yyscan_t yyscanner)</span><br><span> {</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> if (! YY_CURRENT_BUFFER)</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> return yycolumn;</span><br><span> }</span><br><span> </span><br><span>@@ -2135,14 +2121,14 @@</span><br><span> </span><br><span> /* lineno is only valid if an input buffer exists. */</span><br><span> if (! YY_CURRENT_BUFFER )</span><br><span style="color: hsl(0, 100%, 40%);">- yy_fatal_error( "ast_yyset_lineno called with no buffer" , yyscanner);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ yy_fatal_error( "ast_yyset_lineno called with no buffer" , yyscanner); </span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> yylineno = line_number;</span><br><span> }</span><br><span> </span><br><span> /** Set the current column.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param column_no line_number</span><br><span style="color: hsl(0, 100%, 40%);">- * \param yyscanner The scanner object.</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param line_number</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param yyscanner The scanner object.</span><br><span> */</span><br><span> void ast_yyset_column (int column_no , yyscan_t yyscanner)</span><br><span> {</span><br><span>@@ -2150,8 +2136,8 @@</span><br><span> </span><br><span> /* column is only valid if an input buffer exists. */</span><br><span> if (! YY_CURRENT_BUFFER )</span><br><span style="color: hsl(0, 100%, 40%);">- yy_fatal_error( "ast_yyset_column called with no buffer" , yyscanner);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ yy_fatal_error( "ast_yyset_column called with no buffer" , yyscanner); </span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> yycolumn = column_no;</span><br><span> }</span><br><span> </span><br><span>@@ -2204,13 +2190,13 @@</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span> return yylloc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> void ast_yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)</span><br><span> {</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span> yylloc = yylloc_param;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* User-visible API */</span><br><span> </span><br><span> /* ast_yylex_init is special because it creates the scanner itself, so it is</span><br><span>@@ -2258,20 +2244,20 @@</span><br><span> errno = EINVAL;</span><br><span> return 1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> *ptr_yy_globals = (yyscan_t) ast_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> if (*ptr_yy_globals == NULL){</span><br><span> errno = ENOMEM;</span><br><span> return 1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* By setting to 0xAA, we expose bugs in</span><br><span> yy_init_globals. Leave at 0x00 for releases. */</span><br><span> memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> ast_yyset_extra (yy_user_defined, *ptr_yy_globals);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> return yy_init_globals ( *ptr_yy_globals );</span><br><span> }</span><br><span> </span><br><span>@@ -2381,7 +2367,7 @@</span><br><span> </span><br><span> #define YYTABLES_NAME "yytables"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#line 238 "ast_expr2.fl"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 236 "ast_expr2.fl"</span><br><span> </span><br><span> </span><br><span> </span><br><span>@@ -2486,7 +2472,7 @@</span><br><span> extra_error_message[0] = 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const char * const expr2_token_equivs1[] =</span><br><span style="color: hsl(120, 100%, 40%);">+static const char * const expr2_token_equivs1[] = </span><br><span> {</span><br><span> "TOKEN",</span><br><span> "TOK_COND",</span><br><span>@@ -2512,7 +2498,7 @@</span><br><span> "TOK_LP"</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const char * const expr2_token_equivs2[] =</span><br><span style="color: hsl(120, 100%, 40%);">+static const char * const expr2_token_equivs2[] = </span><br><span> {</span><br><span> "<token>",</span><br><span> "?",</span><br><span>@@ -2623,3 +2609,4 @@</span><br><span> free(s2);</span><br><span> return(0);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/res/Makefile b/res/Makefile</span><br><span>index 0987f43..96c95a6 100644</span><br><span>--- a/res/Makefile</span><br><span>+++ b/res/Makefile</span><br><span>@@ -40,13 +40,10 @@</span><br><span> ael/ael_lex.c:</span><br><span> endif</span><br><span> $(ECHO_PREFIX) echo " [FLEX] $< -> $@"</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex)</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix</span><br><span> $(CMD_PREFIX) echo "#define ASTMM_LIBC ASTMM_REDIRECT" > $@</span><br><span> $(CMD_PREFIX) echo "#include \"asterisk.h\"" >> $@</span><br><span> $(CMD_PREFIX) echo >> $@</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) cat $@.fix >> $@</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) rm $@.fix</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CMD_PREFIX) $(FLEX) -t ael/ael.flex >> $@</span><br><span> </span><br><span> ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)</span><br><span> ael/ael.tab.c ael/ael.tab.h: ael/ael.y</span><br><span>diff --git a/res/ael/ael.flex b/res/ael/ael.flex</span><br><span>index 82a5f9e..64cc9b6 100644</span><br><span>--- a/res/ael/ael.flex</span><br><span>+++ b/res/ael/ael.flex</span><br><span>@@ -68,9 +68,6 @@</span><br><span> %option bison-locations</span><br><span> </span><br><span> %{</span><br><span style="color: hsl(0, 100%, 40%);">-#define ASTMM_LIBC ASTMM_REDIRECT</span><br><span style="color: hsl(0, 100%, 40%);">-#include "asterisk.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <sys/types.h></span><br><span> #include <sys/stat.h></span><br><span> #include <unistd.h></span><br><span>diff --git a/res/ael/ael.tab.c b/res/ael/ael.tab.c</span><br><span>index 802e78f..b10de26 100644</span><br><span>--- a/res/ael/ael.tab.c</span><br><span>+++ b/res/ael/ael.tab.c</span><br><span>@@ -1,19 +1,19 @@</span><br><span> /* A Bison parser, made by GNU Bison 2.5. */</span><br><span> </span><br><span> /* Bison implementation for Yacc-like parsers in C</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This program is free software: you can redistribute it and/or modify</span><br><span> it under the terms of the GNU General Public License as published by</span><br><span> the Free Software Foundation, either version 3 of the License, or</span><br><span> (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This program is distributed in the hope that it will be useful,</span><br><span> but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span> GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> You should have received a copy of the GNU General Public License</span><br><span> along with this program. If not, see <http://www.gnu.org/licenses/>. */</span><br><span> </span><br><span>@@ -26,7 +26,7 @@</span><br><span> special exception, which will cause the skeleton and the resulting</span><br><span> Bison output files to be licensed under the GNU General Public</span><br><span> License without this special exception.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This special exception was added by the Free Software Foundation in</span><br><span> version 2.2 of Bison. */</span><br><span> </span><br><span>@@ -132,7 +132,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 268 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 137 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 136 "ael.tab.c"</span><br><span> </span><br><span> /* Enabling traces. */</span><br><span> #ifndef YYDEBUG</span><br><span>@@ -210,7 +210,7 @@</span><br><span> {</span><br><span> </span><br><span> /* Line 293 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 59 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 58 "ael.y"</span><br><span> </span><br><span> int intval; /* integer value, typically flags */</span><br><span> char *str; /* strings */</span><br><span>@@ -219,7 +219,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 293 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 224 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 223 "ael.tab.c"</span><br><span> } YYSTYPE;</span><br><span> # define YYSTYPE_IS_TRIVIAL 1</span><br><span> # define yystype YYSTYPE /* obsolescent; will be withdrawn */</span><br><span>@@ -243,7 +243,7 @@</span><br><span> /* Copy the second part of user declarations. */</span><br><span> </span><br><span> /* Line 343 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 65 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 64 "ael.y"</span><br><span> </span><br><span> /* declaring these AFTER the union makes things a lot simpler! */</span><br><span> void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s);</span><br><span>@@ -266,7 +266,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 343 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 271 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 270 "ael.tab.c"</span><br><span> </span><br><span> #ifdef short</span><br><span> # undef short</span><br><span>@@ -618,21 +618,21 @@</span><br><span> /* YYRLINE[YYN] -- source line where rule number YYN was defined. */</span><br><span> static const yytype_uint16 yyrline[] =</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 191, 191, 194, 195, 196, 199, 200, 201, 202,</span><br><span style="color: hsl(0, 100%, 40%);">- 205, 206, 209, 218, 219, 220, 221, 222, 225, 231,</span><br><span style="color: hsl(0, 100%, 40%);">- 237, 238, 239, 242, 242, 248, 248, 255, 256, 257,</span><br><span style="color: hsl(0, 100%, 40%);">- 258, 261, 262, 263, 266, 267, 268, 269, 270, 271,</span><br><span style="color: hsl(0, 100%, 40%);">- 272, 273, 274, 277, 282, 286, 294, 299, 304, 313,</span><br><span style="color: hsl(0, 100%, 40%);">- 314, 315, 321, 331, 335, 343, 343, 347, 350, 353,</span><br><span style="color: hsl(0, 100%, 40%);">- 364, 365, 377, 378, 387, 396, 405, 416, 417, 427,</span><br><span style="color: hsl(0, 100%, 40%);">- 440, 441, 450, 461, 470, 473, 474, 475, 478, 481,</span><br><span style="color: hsl(0, 100%, 40%);">- 484, 485, 486, 484, 492, 496, 497, 498, 499, 502,</span><br><span style="color: hsl(0, 100%, 40%);">- 502, 535, 536, 537, 538, 542, 545, 546, 549, 550,</span><br><span style="color: hsl(0, 100%, 40%);">- 553, 556, 560, 564, 568, 574, 575, 579, 582, 588,</span><br><span style="color: hsl(0, 100%, 40%);">- 588, 593, 601, 601, 612, 619, 622, 623, 626, 627,</span><br><span style="color: hsl(0, 100%, 40%);">- 630, 633, 634, 637, 641, 645, 651, 652, 655, 656,</span><br><span style="color: hsl(0, 100%, 40%);">- 657, 663, 668, 673, 674, 675, 686, 689, 690, 697,</span><br><span style="color: hsl(0, 100%, 40%);">- 698, 699, 702, 705</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, 190, 190, 193, 194, 195, 198, 199, 200, 201,</span><br><span style="color: hsl(120, 100%, 40%);">+ 204, 205, 208, 217, 218, 219, 220, 221, 224, 230,</span><br><span style="color: hsl(120, 100%, 40%);">+ 236, 237, 238, 241, 241, 247, 247, 254, 255, 256,</span><br><span style="color: hsl(120, 100%, 40%);">+ 257, 260, 261, 262, 265, 266, 267, 268, 269, 270,</span><br><span style="color: hsl(120, 100%, 40%);">+ 271, 272, 273, 276, 281, 285, 293, 298, 303, 312,</span><br><span style="color: hsl(120, 100%, 40%);">+ 313, 314, 320, 330, 334, 342, 342, 346, 349, 352,</span><br><span style="color: hsl(120, 100%, 40%);">+ 363, 364, 376, 377, 386, 395, 404, 415, 416, 426,</span><br><span style="color: hsl(120, 100%, 40%);">+ 439, 440, 449, 460, 469, 472, 473, 474, 477, 480,</span><br><span style="color: hsl(120, 100%, 40%);">+ 483, 484, 485, 483, 491, 495, 496, 497, 498, 501,</span><br><span style="color: hsl(120, 100%, 40%);">+ 501, 534, 535, 536, 537, 541, 544, 545, 548, 549,</span><br><span style="color: hsl(120, 100%, 40%);">+ 552, 555, 559, 563, 567, 573, 574, 578, 581, 587,</span><br><span style="color: hsl(120, 100%, 40%);">+ 587, 592, 600, 600, 611, 618, 621, 622, 625, 626,</span><br><span style="color: hsl(120, 100%, 40%);">+ 629, 632, 633, 636, 640, 644, 650, 651, 654, 655,</span><br><span style="color: hsl(120, 100%, 40%);">+ 656, 662, 667, 672, 673, 674, 685, 688, 689, 696,</span><br><span style="color: hsl(120, 100%, 40%);">+ 697, 698, 701, 704</span><br><span> };</span><br><span> #endif</span><br><span> </span><br><span>@@ -1497,503 +1497,503 @@</span><br><span> case 43: /* "word" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1506 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1505 "ael.tab.c"</span><br><span> break;</span><br><span> case 46: /* "objects" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1518 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1517 "ael.tab.c"</span><br><span> break;</span><br><span> case 47: /* "object" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1530 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1529 "ael.tab.c"</span><br><span> break;</span><br><span> case 48: /* "context_name" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1539 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1538 "ael.tab.c"</span><br><span> break;</span><br><span> case 49: /* "context" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1551 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1550 "ael.tab.c"</span><br><span> break;</span><br><span> case 51: /* "macro" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1563 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1562 "ael.tab.c"</span><br><span> break;</span><br><span> case 52: /* "globals" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1575 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1574 "ael.tab.c"</span><br><span> break;</span><br><span> case 53: /* "global_statements" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1587 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1586 "ael.tab.c"</span><br><span> break;</span><br><span> case 54: /* "assignment" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1599 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1598 "ael.tab.c"</span><br><span> break;</span><br><span> case 56: /* "local_assignment" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1611 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1610 "ael.tab.c"</span><br><span> break;</span><br><span> case 58: /* "arglist" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1623 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1622 "ael.tab.c"</span><br><span> break;</span><br><span> case 59: /* "elements" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1635 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1634 "ael.tab.c"</span><br><span> break;</span><br><span> case 60: /* "element" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1647 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1646 "ael.tab.c"</span><br><span> break;</span><br><span> case 61: /* "ignorepat" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1659 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1658 "ael.tab.c"</span><br><span> break;</span><br><span> case 62: /* "extension" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1671 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1670 "ael.tab.c"</span><br><span> break;</span><br><span> case 63: /* "statements" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1683 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1682 "ael.tab.c"</span><br><span> break;</span><br><span> case 64: /* "timerange" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1692 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1691 "ael.tab.c"</span><br><span> break;</span><br><span> case 65: /* "timespec" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1704 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1703 "ael.tab.c"</span><br><span> break;</span><br><span> case 66: /* "test_expr" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1713 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1712 "ael.tab.c"</span><br><span> break;</span><br><span> case 68: /* "if_like_head" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1725 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1724 "ael.tab.c"</span><br><span> break;</span><br><span> case 69: /* "word_list" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1734 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1733 "ael.tab.c"</span><br><span> break;</span><br><span> case 71: /* "word3_list" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1743 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1742 "ael.tab.c"</span><br><span> break;</span><br><span> case 72: /* "goto_word" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1752 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1751 "ael.tab.c"</span><br><span> break;</span><br><span> case 73: /* "switch_statement" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1764 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1763 "ael.tab.c"</span><br><span> break;</span><br><span> case 74: /* "statement" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1776 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1775 "ael.tab.c"</span><br><span> break;</span><br><span> case 79: /* "opt_else" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1788 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1787 "ael.tab.c"</span><br><span> break;</span><br><span> case 80: /* "target" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1800 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1799 "ael.tab.c"</span><br><span> break;</span><br><span> case 81: /* "opt_pri" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1809 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1808 "ael.tab.c"</span><br><span> break;</span><br><span> case 82: /* "jumptarget" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1821 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1820 "ael.tab.c"</span><br><span> break;</span><br><span> case 83: /* "macro_call" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1833 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1832 "ael.tab.c"</span><br><span> break;</span><br><span> case 85: /* "application_call_head" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1845 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1844 "ael.tab.c"</span><br><span> break;</span><br><span> case 87: /* "application_call" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1857 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1856 "ael.tab.c"</span><br><span> break;</span><br><span> case 88: /* "opt_word" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 183 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 182 "ael.y"</span><br><span> { free((yyvaluep->str));};</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1866 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1865 "ael.tab.c"</span><br><span> break;</span><br><span> case 89: /* "eval_arglist" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1878 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1877 "ael.tab.c"</span><br><span> break;</span><br><span> case 90: /* "case_statements" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1890 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1889 "ael.tab.c"</span><br><span> break;</span><br><span> case 91: /* "case_statement" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1902 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1901 "ael.tab.c"</span><br><span> break;</span><br><span> case 92: /* "macro_statements" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1914 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1913 "ael.tab.c"</span><br><span> break;</span><br><span> case 93: /* "macro_statement" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1926 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1925 "ael.tab.c"</span><br><span> break;</span><br><span> case 94: /* "switches" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1938 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1937 "ael.tab.c"</span><br><span> break;</span><br><span> case 95: /* "eswitches" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1950 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1949 "ael.tab.c"</span><br><span> break;</span><br><span> case 96: /* "switchlist" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1962 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1961 "ael.tab.c"</span><br><span> break;</span><br><span> case 97: /* "included_entry" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1974 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1973 "ael.tab.c"</span><br><span> break;</span><br><span> case 98: /* "includeslist" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1986 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1985 "ael.tab.c"</span><br><span> break;</span><br><span> case 99: /* "includes" */</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 170 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 169 "ael.y"</span><br><span> {</span><br><span> destroy_pval((yyvaluep->pval));</span><br><span> prev_word=0;</span><br><span> };</span><br><span> </span><br><span> /* Line 1391 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 1998 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1997 "ael.tab.c"</span><br><span> break;</span><br><span> </span><br><span> default:</span><br><span>@@ -2322,77 +2322,77 @@</span><br><span> case 2:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 191 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 190 "ael.y"</span><br><span> { (yyval.pval) = parseio->pval = (yyvsp[(1) - (1)].pval); }</span><br><span> break;</span><br><span> </span><br><span> case 3:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 194 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 193 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 4:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 195 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 194 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }</span><br><span> break;</span><br><span> </span><br><span> case 5:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 196 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 195 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (2)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 6:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 199 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 198 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 7:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 200 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 199 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 8:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 201 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 200 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 9:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 202 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 201 "ael.y"</span><br><span> {(yyval.pval)=0;/* allow older docs to be read */}</span><br><span> break;</span><br><span> </span><br><span> case 10:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 205 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 204 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(1) - (1)].str); }</span><br><span> break;</span><br><span> </span><br><span> case 11:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 206 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 205 "ael.y"</span><br><span> { (yyval.str) = strdup("default"); }</span><br><span> break;</span><br><span> </span><br><span> case 12:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 209 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 208 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_CONTEXT, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(3) - (6)].str);</span><br><span>@@ -2404,42 +2404,42 @@</span><br><span> case 13:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 218 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 217 "ael.y"</span><br><span> { (yyval.intval) = 1; }</span><br><span> break;</span><br><span> </span><br><span> case 14:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 219 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 218 "ael.y"</span><br><span> { (yyval.intval) = 0; }</span><br><span> break;</span><br><span> </span><br><span> case 15:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 220 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 219 "ael.y"</span><br><span> { (yyval.intval) = 2; }</span><br><span> break;</span><br><span> </span><br><span> case 16:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 221 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 220 "ael.y"</span><br><span> { (yyval.intval)=3; }</span><br><span> break;</span><br><span> </span><br><span> case 17:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 222 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 221 "ael.y"</span><br><span> { (yyval.intval)=3; }</span><br><span> break;</span><br><span> </span><br><span> case 18:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 225 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 224 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_MACRO, &(yylsp[(1) - (8)]), &(yylsp[(8) - (8)]));</span><br><span> (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);</span><br><span>@@ -2449,7 +2449,7 @@</span><br><span> case 19:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 231 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 230 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_GLOBALS, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));</span><br><span> (yyval.pval)->u1.statements = (yyvsp[(3) - (4)].pval);</span><br><span>@@ -2459,35 +2459,35 @@</span><br><span> case 20:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 237 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 236 "ael.y"</span><br><span> { (yyval.pval) = NULL; }</span><br><span> break;</span><br><span> </span><br><span> case 21:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 238 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 237 "ael.y"</span><br><span> {(yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }</span><br><span> break;</span><br><span> </span><br><span> case 22:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 239 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 238 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(2) - (2)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 23:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 242 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 241 "ael.y"</span><br><span> { reset_semicount(parseio->scanner); }</span><br><span> break;</span><br><span> </span><br><span> case 24:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 242 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 241 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_VARDEC, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(1) - (5)].str);</span><br><span>@@ -2497,14 +2497,14 @@</span><br><span> case 25:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 248 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 247 "ael.y"</span><br><span> { reset_semicount(parseio->scanner); }</span><br><span> break;</span><br><span> </span><br><span> case 26:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 248 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 247 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_LOCALVARDEC, &(yylsp[(1) - (6)]), &(yylsp[(6) - (6)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(2) - (6)].str);</span><br><span>@@ -2514,119 +2514,119 @@</span><br><span> case 27:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 255 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 254 "ael.y"</span><br><span> { (yyval.pval) = NULL; }</span><br><span> break;</span><br><span> </span><br><span> case 28:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 256 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 255 "ael.y"</span><br><span> { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); }</span><br><span> break;</span><br><span> </span><br><span> case 29:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 257 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 256 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); }</span><br><span> break;</span><br><span> </span><br><span> case 30:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 258 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 257 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (2)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 31:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 261 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 260 "ael.y"</span><br><span> {(yyval.pval)=0;}</span><br><span> break;</span><br><span> </span><br><span> case 32:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 262 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 261 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }</span><br><span> break;</span><br><span> </span><br><span> case 33:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 263 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 262 "ael.y"</span><br><span> { (yyval.pval)=(yyvsp[(2) - (2)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 34:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 266 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 265 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 35:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 267 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 266 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 36:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 268 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 267 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 37:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 269 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 268 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 38:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 270 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 269 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 39:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 271 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 270 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 40:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 272 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 271 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 41:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 273 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 272 "ael.y"</span><br><span> {free((yyvsp[(1) - (2)].str)); (yyval.pval)=0;}</span><br><span> break;</span><br><span> </span><br><span> case 42:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 274 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 273 "ael.y"</span><br><span> {(yyval.pval)=0;/* allow older docs to be read */}</span><br><span> break;</span><br><span> </span><br><span> case 43:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 277 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 276 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_IGNOREPAT, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(3) - (4)].str);}</span><br><span>@@ -2635,7 +2635,7 @@</span><br><span> case 44:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 282 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 281 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(1) - (3)].str);</span><br><span>@@ -2645,7 +2645,7 @@</span><br><span> case 45:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 286 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 285 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (5)]), &(yylsp[(3) - (5)]));</span><br><span> (yyval.pval)->u1.str = malloc(strlen((yyvsp[(1) - (5)].str))+strlen((yyvsp[(3) - (5)].str))+2);</span><br><span>@@ -2659,7 +2659,7 @@</span><br><span> case 46:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 294 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 293 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(2) - (4)].str);</span><br><span>@@ -2670,7 +2670,7 @@</span><br><span> case 47:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 299 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 298 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (7)]), &(yylsp[(7) - (7)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(5) - (7)].str);</span><br><span>@@ -2681,7 +2681,7 @@</span><br><span> case 48:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 304 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 303 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_EXTENSION, &(yylsp[(1) - (8)]), &(yylsp[(8) - (8)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(6) - (8)].str);</span><br><span>@@ -2693,28 +2693,28 @@</span><br><span> case 49:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 313 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 312 "ael.y"</span><br><span> { (yyval.pval) = NULL; }</span><br><span> break;</span><br><span> </span><br><span> case 50:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 314 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 313 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }</span><br><span> break;</span><br><span> </span><br><span> case 51:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 315 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 314 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(2) - (2)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 52:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 321 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 320 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&(yyval.str), "%s:%s:%s", (yyvsp[(1) - (5)].str), (yyvsp[(3) - (5)].str), (yyvsp[(5) - (5)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2730,14 +2730,14 @@</span><br><span> case 53:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 331 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 330 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(1) - (1)].str); }</span><br><span> break;</span><br><span> </span><br><span> case 54:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 335 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 334 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = nword((yyvsp[(1) - (7)].str), &(yylsp[(1) - (7)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(3) - (7)].str), &(yylsp[(3) - (7)]));</span><br><span>@@ -2748,21 +2748,21 @@</span><br><span> case 55:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 343 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 342 "ael.y"</span><br><span> { reset_parencount(parseio->scanner); }</span><br><span> break;</span><br><span> </span><br><span> case 56:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 343 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 342 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(3) - (4)].str); }</span><br><span> break;</span><br><span> </span><br><span> case 57:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 347 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 346 "ael.y"</span><br><span> {</span><br><span> (yyval.pval)= npval2(PV_IF, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(2) - (2)].str); }</span><br><span>@@ -2771,7 +2771,7 @@</span><br><span> case 58:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 350 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 349 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_RANDOM, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));</span><br><span> (yyval.pval)->u1.str=(yyvsp[(2) - (2)].str);}</span><br><span>@@ -2780,7 +2780,7 @@</span><br><span> case 59:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 353 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 352 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_IFTIME, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));</span><br><span> (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval);</span><br><span>@@ -2790,14 +2790,14 @@</span><br><span> case 60:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 364 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 363 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(1) - (1)].str);}</span><br><span> break;</span><br><span> </span><br><span> case 61:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 365 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 364 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2813,14 +2813,14 @@</span><br><span> case 62:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 377 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 376 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(1) - (1)].str); }</span><br><span> break;</span><br><span> </span><br><span> case 63:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 378 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 377 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&((yyval.str)), "%s %s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2835,7 +2835,7 @@</span><br><span> case 64:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 387 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 386 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2850,7 +2850,7 @@</span><br><span> case 65:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 396 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 395 "ael.y"</span><br><span> { /* there are often '&' in hints */</span><br><span> if (asprintf(&((yyval.str)), "%s&%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2865,7 +2865,7 @@</span><br><span> case 66:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 405 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 404 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&((yyval.str)), "%s@%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2880,14 +2880,14 @@</span><br><span> case 67:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 416 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 415 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(1) - (1)].str);}</span><br><span> break;</span><br><span> </span><br><span> case 68:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 417 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 416 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2903,7 +2903,7 @@</span><br><span> case 69:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 427 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 426 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&((yyval.str)), "%s%s%s", (yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2920,14 +2920,14 @@</span><br><span> case 70:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 440 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 439 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(1) - (1)].str);}</span><br><span> break;</span><br><span> </span><br><span> case 71:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 441 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 440 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&((yyval.str)), "%s%s", (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2942,7 +2942,7 @@</span><br><span> case 72:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 450 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 449 "ael.y"</span><br><span> {</span><br><span> if (asprintf(&((yyval.str)), "%s:%s", (yyvsp[(1) - (3)].str), (yyvsp[(3) - (3)].str)) < 0) {</span><br><span> ast_log(LOG_WARNING, "asprintf() failed\n");</span><br><span>@@ -2957,7 +2957,7 @@</span><br><span> case 73:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 461 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 460 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_SWITCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(2) - (5)].str);</span><br><span>@@ -2967,7 +2967,7 @@</span><br><span> case 74:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 470 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 469 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_STATEMENTBLOCK, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));</span><br><span> (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval));}</span><br><span>@@ -2976,21 +2976,21 @@</span><br><span> case 75:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 473 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 472 "ael.y"</span><br><span> { (yyval.pval) = (yyvsp[(1) - (1)].pval); }</span><br><span> break;</span><br><span> </span><br><span> case 76:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 474 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 473 "ael.y"</span><br><span> { (yyval.pval) = (yyvsp[(1) - (1)].pval); }</span><br><span> break;</span><br><span> </span><br><span> case 77:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 475 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 474 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));</span><br><span> (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);}</span><br><span>@@ -2999,7 +2999,7 @@</span><br><span> case 78:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 478 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 477 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));</span><br><span> (yyval.pval)->u1.list = (yyvsp[(2) - (3)].pval);}</span><br><span>@@ -3008,7 +3008,7 @@</span><br><span> case 79:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 481 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 480 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_LABEL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str); }</span><br><span>@@ -3017,28 +3017,28 @@</span><br><span> case 80:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 484 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 483 "ael.y"</span><br><span> {reset_semicount(parseio->scanner);}</span><br><span> break;</span><br><span> </span><br><span> case 81:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 485 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 484 "ael.y"</span><br><span> {reset_semicount(parseio->scanner);}</span><br><span> break;</span><br><span> </span><br><span> case 82:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 486 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 485 "ael.y"</span><br><span> {reset_parencount(parseio->scanner);}</span><br><span> break;</span><br><span> </span><br><span> case 83:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 486 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 485 "ael.y"</span><br><span> { /* XXX word_list maybe ? */</span><br><span> (yyval.pval) = npval2(PV_FOR, &(yylsp[(1) - (12)]), &(yylsp[(12) - (12)]));</span><br><span> (yyval.pval)->u1.for_init = (yyvsp[(4) - (12)].str);</span><br><span>@@ -3050,7 +3050,7 @@</span><br><span> case 84:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 492 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 491 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_WHILE, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(2) - (3)].str);</span><br><span>@@ -3060,28 +3060,28 @@</span><br><span> case 85:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 496 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 495 "ael.y"</span><br><span> { (yyval.pval) = (yyvsp[(1) - (1)].pval); }</span><br><span> break;</span><br><span> </span><br><span> case 86:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 497 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 496 "ael.y"</span><br><span> { (yyval.pval) = update_last((yyvsp[(2) - (3)].pval), &(yylsp[(2) - (3)])); }</span><br><span> break;</span><br><span> </span><br><span> case 87:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 498 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 497 "ael.y"</span><br><span> { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); }</span><br><span> break;</span><br><span> </span><br><span> case 88:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 499 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 498 "ael.y"</span><br><span> {</span><br><span> (yyval.pval)= npval2(PV_APPLICATION_CALL, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(1) - (2)].str);}</span><br><span>@@ -3090,14 +3090,14 @@</span><br><span> case 89:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 502 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 501 "ael.y"</span><br><span> {reset_semicount(parseio->scanner);}</span><br><span> break;</span><br><span> </span><br><span> case 90:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 502 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 501 "ael.y"</span><br><span> {</span><br><span> char *bufx;</span><br><span> int tot=0;</span><br><span>@@ -3136,28 +3136,28 @@</span><br><span> case 91:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 535 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 534 "ael.y"</span><br><span> { (yyval.pval) = npval2(PV_BREAK, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); }</span><br><span> break;</span><br><span> </span><br><span> case 92:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 536 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 535 "ael.y"</span><br><span> { (yyval.pval) = npval2(PV_RETURN, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); }</span><br><span> break;</span><br><span> </span><br><span> case 93:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 537 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 536 "ael.y"</span><br><span> { (yyval.pval) = npval2(PV_CONTINUE, &(yylsp[(1) - (2)]), &(yylsp[(2) - (2)])); }</span><br><span> break;</span><br><span> </span><br><span> case 94:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 538 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 537 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(2) - (3)]));</span><br><span> (yyval.pval)->u2.statements = (yyvsp[(2) - (3)].pval); set_dads((yyval.pval),(yyvsp[(2) - (3)].pval));</span><br><span>@@ -3167,35 +3167,35 @@</span><br><span> case 95:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 542 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 541 "ael.y"</span><br><span> { (yyval.pval)=0; }</span><br><span> break;</span><br><span> </span><br><span> case 96:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 545 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 544 "ael.y"</span><br><span> { (yyval.pval) = (yyvsp[(2) - (2)].pval); }</span><br><span> break;</span><br><span> </span><br><span> case 97:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 546 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 545 "ael.y"</span><br><span> { (yyval.pval) = NULL ; }</span><br><span> break;</span><br><span> </span><br><span> case 98:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 549 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 548 "ael.y"</span><br><span> { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); }</span><br><span> break;</span><br><span> </span><br><span> case 99:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 550 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 549 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); }</span><br><span>@@ -3204,7 +3204,7 @@</span><br><span> case 100:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 553 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 552 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)])); }</span><br><span>@@ -3213,7 +3213,7 @@</span><br><span> case 101:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 556 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 555 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));</span><br><span>@@ -3223,7 +3223,7 @@</span><br><span> case 102:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 560 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 559 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = nword((yyvsp[(1) - (5)].str), &(yylsp[(1) - (5)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));</span><br><span>@@ -3233,7 +3233,7 @@</span><br><span> case 103:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 564 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 563 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));</span><br><span>@@ -3243,7 +3243,7 @@</span><br><span> case 104:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 568 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 567 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = nword(strdup("default"), &(yylsp[(1) - (5)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(3) - (5)].str), &(yylsp[(3) - (5)]));</span><br><span>@@ -3253,21 +3253,21 @@</span><br><span> case 105:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 574 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 573 "ael.y"</span><br><span> { (yyval.str) = strdup("1"); }</span><br><span> break;</span><br><span> </span><br><span> case 106:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 575 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 574 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(2) - (2)].str); }</span><br><span> break;</span><br><span> </span><br><span> case 107:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 579 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 578 "ael.y"</span><br><span> { /* ext[, pri] default 1 */</span><br><span> (yyval.pval) = nword((yyvsp[(1) - (2)].str), &(yylsp[(1) - (2)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(2) - (2)].str), &(yylsp[(2) - (2)])); }</span><br><span>@@ -3276,7 +3276,7 @@</span><br><span> case 108:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 582 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 581 "ael.y"</span><br><span> { /* context, ext, pri */</span><br><span> (yyval.pval) = nword((yyvsp[(4) - (4)].str), &(yylsp[(4) - (4)]));</span><br><span> (yyval.pval)->next = nword((yyvsp[(1) - (4)].str), &(yylsp[(1) - (4)]));</span><br><span>@@ -3286,14 +3286,14 @@</span><br><span> case 109:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 588 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 587 "ael.y"</span><br><span> {reset_argcount(parseio->scanner);}</span><br><span> break;</span><br><span> </span><br><span> case 110:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 588 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 587 "ael.y"</span><br><span> {</span><br><span> /* XXX original code had @2 but i think we need @5 */</span><br><span> (yyval.pval) = npval2(PV_MACRO_CALL, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));</span><br><span>@@ -3304,7 +3304,7 @@</span><br><span> case 111:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 593 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 592 "ael.y"</span><br><span> {</span><br><span> (yyval.pval)= npval2(PV_MACRO_CALL, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(1) - (3)].str); }</span><br><span>@@ -3313,14 +3313,14 @@</span><br><span> case 112:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 601 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 600 "ael.y"</span><br><span> {reset_argcount(parseio->scanner);}</span><br><span> break;</span><br><span> </span><br><span> case 113:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 601 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 600 "ael.y"</span><br><span> {</span><br><span> if (strcasecmp((yyvsp[(1) - (3)].str),"goto") == 0) {</span><br><span> (yyval.pval) = npval2(PV_GOTO, &(yylsp[(1) - (3)]), &(yylsp[(2) - (3)]));</span><br><span>@@ -3335,7 +3335,7 @@</span><br><span> case 114:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 612 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 611 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = update_last((yyvsp[(1) - (3)].pval), &(yylsp[(3) - (3)]));</span><br><span> if( (yyval.pval)->type == PV_GOTO )</span><br><span>@@ -3348,35 +3348,35 @@</span><br><span> case 115:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 619 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 618 "ael.y"</span><br><span> { (yyval.pval) = update_last((yyvsp[(1) - (2)].pval), &(yylsp[(2) - (2)])); }</span><br><span> break;</span><br><span> </span><br><span> case 116:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 622 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 621 "ael.y"</span><br><span> { (yyval.str) = (yyvsp[(1) - (1)].str) ;}</span><br><span> break;</span><br><span> </span><br><span> case 117:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 623 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 622 "ael.y"</span><br><span> { (yyval.str) = strdup(""); }</span><br><span> break;</span><br><span> </span><br><span> case 118:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 626 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 625 "ael.y"</span><br><span> { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); }</span><br><span> break;</span><br><span> </span><br><span> case 119:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 627 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 626 "ael.y"</span><br><span> {</span><br><span> (yyval.pval)= npval(PV_WORD,0/*@1.first_line*/,0/*@1.last_line*/,0/* @1.first_column*/, 0/*@1.last_column*/);</span><br><span> (yyval.pval)->u1.str = strdup(""); }</span><br><span>@@ -3385,28 +3385,28 @@</span><br><span> case 120:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 630 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 629 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), nword((yyvsp[(3) - (3)].str), &(yylsp[(3) - (3)]))); }</span><br><span> break;</span><br><span> </span><br><span> case 121:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 633 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 632 "ael.y"</span><br><span> { (yyval.pval) = NULL; }</span><br><span> break;</span><br><span> </span><br><span> case 122:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 634 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 633 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }</span><br><span> break;</span><br><span> </span><br><span> case 123:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 637 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 636 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_CASE, &(yylsp[(1) - (4)]), &(yylsp[(3) - (4)])); /* XXX 3 or 4 ? */</span><br><span> (yyval.pval)->u1.str = (yyvsp[(2) - (4)].str);</span><br><span>@@ -3416,7 +3416,7 @@</span><br><span> case 124:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 641 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 640 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_DEFAULT, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));</span><br><span> (yyval.pval)->u1.str = NULL;</span><br><span>@@ -3426,7 +3426,7 @@</span><br><span> case 125:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 645 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 644 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_PATTERN, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)])); /* XXX@3 or @4 ? */</span><br><span> (yyval.pval)->u1.str = (yyvsp[(2) - (4)].str);</span><br><span>@@ -3436,35 +3436,35 @@</span><br><span> case 126:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 651 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 650 "ael.y"</span><br><span> { (yyval.pval) = NULL; }</span><br><span> break;</span><br><span> </span><br><span> case 127:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 652 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 651 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (2)].pval), (yyvsp[(2) - (2)].pval)); }</span><br><span> break;</span><br><span> </span><br><span> case 128:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 655 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 654 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 129:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 656 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 655 "ael.y"</span><br><span> { (yyval.pval)=(yyvsp[(1) - (1)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 130:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 657 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 656 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_CATCH, &(yylsp[(1) - (5)]), &(yylsp[(5) - (5)]));</span><br><span> (yyval.pval)->u1.str = (yyvsp[(2) - (5)].str);</span><br><span>@@ -3474,7 +3474,7 @@</span><br><span> case 131:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 663 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 662 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_SWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)]));</span><br><span> (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));}</span><br><span>@@ -3483,7 +3483,7 @@</span><br><span> case 132:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 668 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 667 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_ESWITCHES, &(yylsp[(1) - (4)]), &(yylsp[(2) - (4)]));</span><br><span> (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval); set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));}</span><br><span>@@ -3492,21 +3492,21 @@</span><br><span> case 133:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 673 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 672 "ael.y"</span><br><span> { (yyval.pval) = NULL; }</span><br><span> break;</span><br><span> </span><br><span> case 134:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 674 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 673 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval),nword((yyvsp[(2) - (3)].str), &(yylsp[(2) - (3)]))); }</span><br><span> break;</span><br><span> </span><br><span> case 135:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 675 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 674 "ael.y"</span><br><span> {</span><br><span> char *x;</span><br><span> if (asprintf(&x,"%s@%s", (yyvsp[(2) - (5)].str), (yyvsp[(4) - (5)].str)) < 0) {</span><br><span>@@ -3523,21 +3523,21 @@</span><br><span> case 136:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 686 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 685 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(2) - (2)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 137:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 689 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 688 "ael.y"</span><br><span> { (yyval.pval) = nword((yyvsp[(1) - (1)].str), &(yylsp[(1) - (1)])); }</span><br><span> break;</span><br><span> </span><br><span> case 138:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 690 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 689 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = nword((yyvsp[(1) - (3)].str), &(yylsp[(1) - (3)]));</span><br><span> (yyval.pval)->u2.arglist = (yyvsp[(3) - (3)].pval);</span><br><span>@@ -3547,28 +3547,28 @@</span><br><span> case 139:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 697 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 696 "ael.y"</span><br><span> { (yyval.pval) = (yyvsp[(1) - (2)].pval); }</span><br><span> break;</span><br><span> </span><br><span> case 140:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 698 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 697 "ael.y"</span><br><span> { (yyval.pval) = linku1((yyvsp[(1) - (3)].pval), (yyvsp[(2) - (3)].pval)); }</span><br><span> break;</span><br><span> </span><br><span> case 141:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 699 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 698 "ael.y"</span><br><span> {(yyval.pval)=(yyvsp[(1) - (2)].pval);}</span><br><span> break;</span><br><span> </span><br><span> case 142:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 702 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 701 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (4)]), &(yylsp[(4) - (4)]));</span><br><span> (yyval.pval)->u1.list = (yyvsp[(3) - (4)].pval);set_dads((yyval.pval),(yyvsp[(3) - (4)].pval));}</span><br><span>@@ -3577,7 +3577,7 @@</span><br><span> case 143:</span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 705 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 704 "ael.y"</span><br><span> {</span><br><span> (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[(1) - (3)]), &(yylsp[(3) - (3)]));}</span><br><span> break;</span><br><span>@@ -3585,7 +3585,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 1806 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 3590 "ael.tab.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 3589 "ael.tab.c"</span><br><span> default: break;</span><br><span> }</span><br><span> /* User semantic actions sometimes alter yychar, and that requires</span><br><span>@@ -3823,7 +3823,7 @@</span><br><span> </span><br><span> </span><br><span> /* Line 2067 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 710 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 709 "ael.y"</span><br><span> </span><br><span> </span><br><span> static char *token_equivs1[] =</span><br><span>@@ -4005,3 +4005,4 @@</span><br><span> for(t=child_list;t;t=t->next) /* simple stuff */</span><br><span> t->dad = dad;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/res/ael/ael.tab.h b/res/ael/ael.tab.h</span><br><span>index 1647649..5ea6c0f 100644</span><br><span>--- a/res/ael/ael.tab.h</span><br><span>+++ b/res/ael/ael.tab.h</span><br><span>@@ -1,19 +1,19 @@</span><br><span> /* A Bison parser, made by GNU Bison 2.5. */</span><br><span> </span><br><span> /* Bison interface for Yacc-like parsers in C</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This program is free software: you can redistribute it and/or modify</span><br><span> it under the terms of the GNU General Public License as published by</span><br><span> the Free Software Foundation, either version 3 of the License, or</span><br><span> (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This program is distributed in the hope that it will be useful,</span><br><span> but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span> GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> You should have received a copy of the GNU General Public License</span><br><span> along with this program. If not, see <http://www.gnu.org/licenses/>. */</span><br><span> </span><br><span>@@ -26,7 +26,7 @@</span><br><span> special exception, which will cause the skeleton and the resulting</span><br><span> Bison output files to be licensed under the GNU General Public</span><br><span> License without this special exception.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> This special exception was added by the Free Software Foundation in</span><br><span> version 2.2 of Bison. */</span><br><span> </span><br><span>@@ -88,7 +88,7 @@</span><br><span> {</span><br><span> </span><br><span> /* Line 2068 of yacc.c */</span><br><span style="color: hsl(0, 100%, 40%);">-#line 59 "ael.y"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 58 "ael.y"</span><br><span> </span><br><span> int intval; /* integer value, typically flags */</span><br><span> char *str; /* strings */</span><br><span>@@ -118,3 +118,6 @@</span><br><span> # define YYLTYPE_IS_DECLARED 1</span><br><span> # define YYLTYPE_IS_TRIVIAL 1</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c</span><br><span>index 04821fe..b54a272 100644</span><br><span>--- a/res/ael/ael_lex.c</span><br><span>+++ b/res/ael/ael_lex.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L</span><br><span> </span><br><span> /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,</span><br><span style="color: hsl(0, 100%, 40%);">- * if you want the limit (max/min) macros for int types.</span><br><span style="color: hsl(120, 100%, 40%);">+ * if you want the limit (max/min) macros for int types. </span><br><span> */</span><br><span> #ifndef __STDC_LIMIT_MACROS</span><br><span> #define __STDC_LIMIT_MACROS 1</span><br><span>@@ -54,9 +54,10 @@</span><br><span> typedef signed char flex_int8_t;</span><br><span> typedef short int flex_int16_t;</span><br><span> typedef int flex_int32_t;</span><br><span style="color: hsl(0, 100%, 40%);">-typedef unsigned char flex_uint8_t;</span><br><span style="color: hsl(120, 100%, 40%);">+typedef unsigned char flex_uint8_t; </span><br><span> typedef unsigned short int flex_uint16_t;</span><br><span> typedef unsigned int flex_uint32_t;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* ! C99 */</span><br><span> </span><br><span> /* Limits of integral types. */</span><br><span> #ifndef INT8_MIN</span><br><span>@@ -87,8 +88,6 @@</span><br><span> #define UINT32_MAX (4294967295U)</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* ! C99 */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #endif /* ! FLEXINT_H */</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span>@@ -162,15 +161,7 @@</span><br><span> </span><br><span> /* Size of default input buffer. */</span><br><span> #ifndef YY_BUF_SIZE</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef __ia64__</span><br><span style="color: hsl(0, 100%, 40%);">-/* On IA-64, the buffer size is 16k, not 8k.</span><br><span style="color: hsl(0, 100%, 40%);">- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.</span><br><span style="color: hsl(0, 100%, 40%);">- * Ditto for the __ia64__ case accordingly.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-#define YY_BUF_SIZE 32768</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span> #define YY_BUF_SIZE 16384</span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* __ia64__ */</span><br><span> #endif</span><br><span> </span><br><span> /* The state buf must be large enough to hold one state per character in the main buffer.</span><br><span>@@ -187,7 +178,7 @@</span><br><span> #define EOB_ACT_LAST_MATCH 2</span><br><span> </span><br><span> #define YY_LESS_LINENO(n)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Return all but the first "n" matched characters back to the input stream. */</span><br><span> #define yyless(n) \</span><br><span> do \</span><br><span>@@ -249,7 +240,7 @@</span><br><span> </span><br><span> int yy_bs_lineno; /**< The line count. */</span><br><span> int yy_bs_column; /**< The column count. */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Whether to try to fill the input buffer when we reach the</span><br><span> * end of it.</span><br><span> */</span><br><span>@@ -828,8 +819,6 @@</span><br><span> * bison-locations is probably not needed.</span><br><span> */</span><br><span> #line 71 "ael.flex"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "asterisk.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <sys/types.h></span><br><span> #include <sys/stat.h></span><br><span> #include <unistd.h></span><br><span>@@ -967,7 +956,7 @@</span><br><span> #define STORE_POS</span><br><span> #define STORE_LOC</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">-#line 963 "ael_lex.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 957 "ael_lex.c"</span><br><span> </span><br><span> #define INITIAL 0</span><br><span> #define paren 1</span><br><span>@@ -1033,9 +1022,9 @@</span><br><span> /* This must go here because YYSTYPE and YYLTYPE are included</span><br><span> * from bison output in section 1.*/</span><br><span> # define yylval yyg->yylval_r</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> # define yylloc yyg->yylloc_r</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> int ael_yylex_init (yyscan_t* scanner);</span><br><span> </span><br><span> int ael_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);</span><br><span>@@ -1074,9 +1063,9 @@</span><br><span> void ael_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );</span><br><span> </span><br><span> YYLTYPE *ael_yyget_lloc (yyscan_t yyscanner );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> void ael_yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Macros after this point can all be overridden by user definitions in</span><br><span> * section 1.</span><br><span> */</span><br><span>@@ -1090,7 +1079,7 @@</span><br><span> #endif</span><br><span> </span><br><span> static void yyunput (int c,char *buf_ptr ,yyscan_t yyscanner);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> #ifndef yytext_ptr</span><br><span> static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);</span><br><span> #endif</span><br><span>@@ -1111,12 +1100,7 @@</span><br><span> </span><br><span> /* Amount of stuff to slurp up with each read. */</span><br><span> #ifndef YY_READ_BUF_SIZE</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef __ia64__</span><br><span style="color: hsl(0, 100%, 40%);">-/* On IA-64, the buffer size is 16k, not 8k */</span><br><span style="color: hsl(0, 100%, 40%);">-#define YY_READ_BUF_SIZE 16384</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span> #define YY_READ_BUF_SIZE 8192</span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* __ia64__ */</span><br><span> #endif</span><br><span> </span><br><span> /* Copy whatever the last rule matched to the standard output. */</span><br><span>@@ -1124,7 +1108,7 @@</span><br><span> /* This used to be an fputs(), but since the string might contain NUL's,</span><br><span> * we now use fwrite().</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)</span><br><span style="color: hsl(120, 100%, 40%);">+#define ECHO fwrite( yytext, yyleng, 1, yyout )</span><br><span> #endif</span><br><span> </span><br><span> /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,</span><br><span>@@ -1135,7 +1119,7 @@</span><br><span> if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \</span><br><span> { \</span><br><span> int c = '*'; \</span><br><span style="color: hsl(0, 100%, 40%);">- size_t n; \</span><br><span style="color: hsl(120, 100%, 40%);">+ int n; \</span><br><span> for ( n = 0; n < max_size && \</span><br><span> (c = getc( yyin )) != EOF && c != '\n'; ++n ) \</span><br><span> buf[n] = (char) c; \</span><br><span>@@ -1220,10 +1204,10 @@</span><br><span> register int yy_act;</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#line 217 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 220 "ael.flex"</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#line 1219 "ael_lex.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 1208 "ael_lex.c"</span><br><span> </span><br><span> yylval = yylval_param;</span><br><span> </span><br><span>@@ -1314,260 +1298,260 @@</span><br><span> </span><br><span> case 1:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 219 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 222 "ael.flex"</span><br><span> { STORE_POS; return LC;}</span><br><span> YY_BREAK</span><br><span> case 2:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 220 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 223 "ael.flex"</span><br><span> { STORE_POS; return RC;}</span><br><span> YY_BREAK</span><br><span> case 3:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 221 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 224 "ael.flex"</span><br><span> { STORE_POS; return LP;}</span><br><span> YY_BREAK</span><br><span> case 4:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 222 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 225 "ael.flex"</span><br><span> { STORE_POS; return RP;}</span><br><span> YY_BREAK</span><br><span> case 5:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 223 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 226 "ael.flex"</span><br><span> { STORE_POS; return SEMI;}</span><br><span> YY_BREAK</span><br><span> case 6:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 224 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 227 "ael.flex"</span><br><span> { STORE_POS; return EQ;}</span><br><span> YY_BREAK</span><br><span> case 7:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 225 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 228 "ael.flex"</span><br><span> { STORE_POS; return COMMA;}</span><br><span> YY_BREAK</span><br><span> case 8:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 226 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 229 "ael.flex"</span><br><span> { STORE_POS; return COLON;}</span><br><span> YY_BREAK</span><br><span> case 9:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 227 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 230 "ael.flex"</span><br><span> { STORE_POS; return AMPER;}</span><br><span> YY_BREAK</span><br><span> case 10:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 228 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 231 "ael.flex"</span><br><span> { STORE_POS; return BAR;}</span><br><span> YY_BREAK</span><br><span> case 11:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 229 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 232 "ael.flex"</span><br><span> { STORE_POS; return EXTENMARK;}</span><br><span> YY_BREAK</span><br><span> case 12:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 230 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 233 "ael.flex"</span><br><span> { STORE_POS; return AT;}</span><br><span> YY_BREAK</span><br><span> case 13:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 231 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 234 "ael.flex"</span><br><span> {/*comment*/}</span><br><span> YY_BREAK</span><br><span> case 14:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 232 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 235 "ael.flex"</span><br><span> { STORE_POS; return KW_CONTEXT;}</span><br><span> YY_BREAK</span><br><span> case 15:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 233 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 236 "ael.flex"</span><br><span> { STORE_POS; return KW_ABSTRACT;}</span><br><span> YY_BREAK</span><br><span> case 16:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 234 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 237 "ael.flex"</span><br><span> { STORE_POS; return KW_EXTEND;}</span><br><span> YY_BREAK</span><br><span> case 17:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 235 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 238 "ael.flex"</span><br><span> { STORE_POS; return KW_MACRO;};</span><br><span> YY_BREAK</span><br><span> case 18:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 236 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 239 "ael.flex"</span><br><span> { STORE_POS; return KW_GLOBALS;}</span><br><span> YY_BREAK</span><br><span> case 19:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 237 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 240 "ael.flex"</span><br><span> { STORE_POS; return KW_LOCAL;}</span><br><span> YY_BREAK</span><br><span> case 20:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 238 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 241 "ael.flex"</span><br><span> { STORE_POS; return KW_IGNOREPAT;}</span><br><span> YY_BREAK</span><br><span> case 21:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 239 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 242 "ael.flex"</span><br><span> { STORE_POS; return KW_SWITCH;}</span><br><span> YY_BREAK</span><br><span> case 22:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 240 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 243 "ael.flex"</span><br><span> { STORE_POS; return KW_IF;}</span><br><span> YY_BREAK</span><br><span> case 23:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 241 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 244 "ael.flex"</span><br><span> { STORE_POS; return KW_IFTIME;}</span><br><span> YY_BREAK</span><br><span> case 24:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 242 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 245 "ael.flex"</span><br><span> { STORE_POS; return KW_RANDOM;}</span><br><span> YY_BREAK</span><br><span> case 25:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 243 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 246 "ael.flex"</span><br><span> { STORE_POS; return KW_REGEXTEN;}</span><br><span> YY_BREAK</span><br><span> case 26:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 244 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 247 "ael.flex"</span><br><span> { STORE_POS; return KW_HINT;}</span><br><span> YY_BREAK</span><br><span> case 27:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 245 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 248 "ael.flex"</span><br><span> { STORE_POS; return KW_ELSE;}</span><br><span> YY_BREAK</span><br><span> case 28:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 246 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 249 "ael.flex"</span><br><span> { STORE_POS; return KW_GOTO;}</span><br><span> YY_BREAK</span><br><span> case 29:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 247 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 250 "ael.flex"</span><br><span> { STORE_POS; return KW_JUMP;}</span><br><span> YY_BREAK</span><br><span> case 30:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 248 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 251 "ael.flex"</span><br><span> { STORE_POS; return KW_RETURN;}</span><br><span> YY_BREAK</span><br><span> case 31:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 249 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 252 "ael.flex"</span><br><span> { STORE_POS; return KW_BREAK;}</span><br><span> YY_BREAK</span><br><span> case 32:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 250 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 253 "ael.flex"</span><br><span> { STORE_POS; return KW_CONTINUE;}</span><br><span> YY_BREAK</span><br><span> case 33:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 251 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 254 "ael.flex"</span><br><span> { STORE_POS; return KW_FOR;}</span><br><span> YY_BREAK</span><br><span> case 34:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 252 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 255 "ael.flex"</span><br><span> { STORE_POS; return KW_WHILE;}</span><br><span> YY_BREAK</span><br><span> case 35:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 253 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 256 "ael.flex"</span><br><span> { STORE_POS; return KW_CASE;}</span><br><span> YY_BREAK</span><br><span> case 36:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 254 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 257 "ael.flex"</span><br><span> { STORE_POS; return KW_DEFAULT;}</span><br><span> YY_BREAK</span><br><span> case 37:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 255 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 258 "ael.flex"</span><br><span> { STORE_POS; return KW_PATTERN;}</span><br><span> YY_BREAK</span><br><span> case 38:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 256 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 259 "ael.flex"</span><br><span> { STORE_POS; return KW_CATCH;}</span><br><span> YY_BREAK</span><br><span> case 39:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 257 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 260 "ael.flex"</span><br><span> { STORE_POS; return KW_SWITCHES;}</span><br><span> YY_BREAK</span><br><span> case 40:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 258 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 261 "ael.flex"</span><br><span> { STORE_POS; return KW_ESWITCHES;}</span><br><span> YY_BREAK</span><br><span> case 41:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 259 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 262 "ael.flex"</span><br><span> { STORE_POS; return KW_INCLUDES;}</span><br><span> YY_BREAK</span><br><span> case 42:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 260 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 263 "ael.flex"</span><br><span> { BEGIN(comment); my_col += 2; }</span><br><span> YY_BREAK</span><br><span> case 43:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 262 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 265 "ael.flex"</span><br><span> { my_col += yyleng; }</span><br><span> YY_BREAK</span><br><span> case 44:</span><br><span> /* rule 44 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 263 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 266 "ael.flex"</span><br><span> { ++my_lineno; my_col=1;}</span><br><span> YY_BREAK</span><br><span> case 45:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 264 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 267 "ael.flex"</span><br><span> { my_col += yyleng; }</span><br><span> YY_BREAK</span><br><span> case 46:</span><br><span> /* rule 46 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 265 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 268 "ael.flex"</span><br><span> { ++my_lineno; my_col=1;}</span><br><span> YY_BREAK</span><br><span> case 47:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 266 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 269 "ael.flex"</span><br><span> { my_col += 2; BEGIN(INITIAL); } /* the nice thing about comments is that you know exactly what ends them */</span><br><span> YY_BREAK</span><br><span> case 48:</span><br><span> /* rule 48 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 268 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 271 "ael.flex"</span><br><span> { my_lineno++; my_col = 1; }</span><br><span> YY_BREAK</span><br><span> case 49:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 269 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 272 "ael.flex"</span><br><span> { my_col += yyleng; }</span><br><span> YY_BREAK</span><br><span> case 50:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 270 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 273 "ael.flex"</span><br><span> { my_col += (yyleng*8)-(my_col%8); }</span><br><span> YY_BREAK</span><br><span> case 51:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 272 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 275 "ael.flex"</span><br><span> {</span><br><span> /* boy did I open a can of worms when I changed the lexical token "word".</span><br><span> all the above keywords can be used as a beginning to a "word".-</span><br><span>@@ -1596,22 +1580,22 @@</span><br><span> YY_BREAK</span><br><span> case 52:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 298 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 301 "ael.flex"</span><br><span> { yymore(); /* Keep going */ }</span><br><span> YY_BREAK</span><br><span> case 53:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 299 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 302 "ael.flex"</span><br><span> { yymore(); /* Keep going */ }</span><br><span> YY_BREAK</span><br><span> case 54:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 300 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 303 "ael.flex"</span><br><span> { yymore(); /* Keep Going */ }</span><br><span> YY_BREAK</span><br><span> case 55:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 301 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 304 "ael.flex"</span><br><span> { /* the beginning of a ${} construct. prepare and pop into curlystate */</span><br><span> parencount2 = 0;</span><br><span> pbcpos2 = 0;</span><br><span>@@ -1622,7 +1606,7 @@</span><br><span> YY_BREAK</span><br><span> case 56:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 308 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 311 "ael.flex"</span><br><span> { /* the beginning of a $[] construct. prepare and pop into brackstate */</span><br><span> parencount3 = 0;</span><br><span> pbcpos3 = 0;</span><br><span>@@ -1634,7 +1618,7 @@</span><br><span> case 57:</span><br><span> /* rule 57 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 315 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 318 "ael.flex"</span><br><span> {</span><br><span> /* a non-word constituent char, like a space, tab, curly, paren, etc */</span><br><span> char c = yytext[yyleng-1];</span><br><span>@@ -1650,7 +1634,7 @@</span><br><span> case 58:</span><br><span> /* rule 58 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 328 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 331 "ael.flex"</span><br><span> {</span><br><span> if ( pbcpop2('}') ) { /* error */</span><br><span> STORE_LOC;</span><br><span>@@ -1673,7 +1657,7 @@</span><br><span> case 59:</span><br><span> /* rule 59 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 347 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 350 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if (c == '{')</span><br><span>@@ -1685,7 +1669,7 @@</span><br><span> case 60:</span><br><span> /* rule 60 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 355 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 358 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if ( pbcpop2(c)) { /* error */</span><br><span>@@ -1704,7 +1688,7 @@</span><br><span> case 61:</span><br><span> /* rule 61 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 371 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 374 "ael.flex"</span><br><span> {</span><br><span> if ( pbcpop3(']') ) { /* error */</span><br><span> STORE_LOC;</span><br><span>@@ -1727,7 +1711,7 @@</span><br><span> case 62:</span><br><span> /* rule 62 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 390 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 393 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if (c == '[')</span><br><span>@@ -1739,7 +1723,7 @@</span><br><span> case 63:</span><br><span> /* rule 63 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 398 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 401 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if ( pbcpop3(c)) { /* error */</span><br><span>@@ -1765,7 +1749,7 @@</span><br><span> case 64:</span><br><span> /* rule 64 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 421 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 424 "ael.flex"</span><br><span> {</span><br><span> if ( pbcpop(')') ) { /* error */</span><br><span> STORE_LOC;</span><br><span>@@ -1794,7 +1778,7 @@</span><br><span> case 65:</span><br><span> /* rule 65 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 446 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 449 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if (c == '(')</span><br><span>@@ -1806,7 +1790,7 @@</span><br><span> case 66:</span><br><span> /* rule 66 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 454 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 457 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if ( pbcpop(c)) { /* error */</span><br><span>@@ -1833,7 +1817,7 @@</span><br><span> case 67:</span><br><span> /* rule 67 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 478 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 481 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if (c == '(')</span><br><span>@@ -1845,7 +1829,7 @@</span><br><span> case 68:</span><br><span> /* rule 68 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 486 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 489 "ael.flex"</span><br><span> {</span><br><span> if ( pbcpop(')') ) { /* error */</span><br><span> STORE_LOC;</span><br><span>@@ -1876,7 +1860,7 @@</span><br><span> case 69:</span><br><span> /* rule 69 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 513 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 516 "ael.flex"</span><br><span> {</span><br><span> if( parencount != 0) { /* ast_log(LOG_NOTICE,"Folding in a comma!\n"); */</span><br><span> yymore();</span><br><span>@@ -1895,7 +1879,7 @@</span><br><span> case 70:</span><br><span> /* rule 70 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 528 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 531 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if ( pbcpop(c) ) { /* error */</span><br><span>@@ -1918,7 +1902,7 @@</span><br><span> case 71:</span><br><span> /* rule 71 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 547 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 550 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> yymore();</span><br><span>@@ -1928,7 +1912,7 @@</span><br><span> case 72:</span><br><span> /* rule 72 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 553 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 556 "ael.flex"</span><br><span> {</span><br><span> char c = yytext[yyleng-1];</span><br><span> if ( pbcpop(c) ) { /* error */</span><br><span>@@ -1946,7 +1930,7 @@</span><br><span> case 73:</span><br><span> /* rule 73 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 567 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 570 "ael.flex"</span><br><span> {</span><br><span> STORE_LOC;</span><br><span> yylval->str = malloc(yyleng);</span><br><span>@@ -1960,7 +1944,7 @@</span><br><span> case 74:</span><br><span> /* rule 74 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 577 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 580 "ael.flex"</span><br><span> {</span><br><span> char fnamebuf[1024],*p1,*p2;</span><br><span> int glob_ret;</span><br><span>@@ -2013,7 +1997,7 @@</span><br><span> case YY_STATE_EOF(curlystate):</span><br><span> case YY_STATE_EOF(wordstate):</span><br><span> case YY_STATE_EOF(brackstate):</span><br><span style="color: hsl(0, 100%, 40%);">-#line 622 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 625 "ael.flex"</span><br><span> {</span><br><span> char fnamebuf[2048];</span><br><span> if (include_stack_index > 0 && include_stack[include_stack_index-1].globbuf_pos < include_stack[include_stack_index-1].globbuf.gl_pathc-1) {</span><br><span>@@ -2049,15 +2033,15 @@</span><br><span> case 75:</span><br><span> /* rule 75 can match eol */</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 654 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 657 "ael.flex"</span><br><span> { /* default rule */ ast_log(LOG_ERROR,"Unhandled char(s): %s\n", yytext); }</span><br><span> YY_BREAK</span><br><span> case 76:</span><br><span> YY_RULE_SETUP</span><br><span style="color: hsl(0, 100%, 40%);">-#line 656 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 659 "ael.flex"</span><br><span> YY_FATAL_ERROR( "flex scanner jammed" );</span><br><span> YY_BREAK</span><br><span style="color: hsl(0, 100%, 40%);">-#line 2053 "ael_lex.c"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 2042 "ael_lex.c"</span><br><span> </span><br><span> case YY_END_OF_BUFFER:</span><br><span> {</span><br><span>@@ -2574,7 +2558,7 @@</span><br><span> YY_BUFFER_STATE ael_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner)</span><br><span> {</span><br><span> YY_BUFFER_STATE b;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> b = (YY_BUFFER_STATE) ael_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );</span><br><span> if ( ! b )</span><br><span> YY_FATAL_ERROR( "out of dynamic memory in ael_yy_create_buffer()" );</span><br><span>@@ -2618,7 +2602,7 @@</span><br><span> #ifndef __cplusplus</span><br><span> extern int isatty (int );</span><br><span> #endif /* __cplusplus */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Initializes or reinitializes a buffer.</span><br><span> * This function is sometimes called more than once on the same buffer,</span><br><span> * such as during a ael_yyrestart() or at EOF.</span><br><span>@@ -2644,7 +2628,7 @@</span><br><span> }</span><br><span> </span><br><span> b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> errno = oerrno;</span><br><span> }</span><br><span> </span><br><span>@@ -2750,9 +2734,9 @@</span><br><span> , yyscanner);</span><br><span> if ( ! yyg->yy_buffer_stack )</span><br><span> YY_FATAL_ERROR( "out of dynamic memory in ael_yyensure_buffer_stack()" );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> yyg->yy_buffer_stack_max = num_to_alloc;</span><br><span> yyg->yy_buffer_stack_top = 0;</span><br><span> return;</span><br><span>@@ -2781,12 +2765,12 @@</span><br><span> * @param base the character buffer</span><br><span> * @param size the size in bytes of the character buffer</span><br><span> * @param yyscanner The scanner object.</span><br><span style="color: hsl(0, 100%, 40%);">- * @return the newly allocated buffer state object.</span><br><span style="color: hsl(120, 100%, 40%);">+ * @return the newly allocated buffer state object. </span><br><span> */</span><br><span> YY_BUFFER_STATE ael_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)</span><br><span> {</span><br><span> YY_BUFFER_STATE b;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> if ( size < 2 ||</span><br><span> base[size-2] != YY_END_OF_BUFFER_CHAR ||</span><br><span> base[size-1] != YY_END_OF_BUFFER_CHAR )</span><br><span>@@ -2822,14 +2806,14 @@</span><br><span> */</span><br><span> YY_BUFFER_STATE ael_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> return ael_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);</span><br><span> }</span><br><span> </span><br><span> /** Setup the input buffer state to scan the given bytes. The next call to ael_yylex() will</span><br><span> * scan from a @e copy of @a bytes.</span><br><span style="color: hsl(0, 100%, 40%);">- * @param yybytes the byte buffer to scan</span><br><span style="color: hsl(0, 100%, 40%);">- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param bytes the byte buffer to scan</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param len the number of bytes in the buffer pointed to by @a bytes.</span><br><span> * @param yyscanner The scanner object.</span><br><span> * @return the newly allocated buffer state object.</span><br><span> */</span><br><span>@@ -2839,7 +2823,7 @@</span><br><span> char *buf;</span><br><span> yy_size_t n;</span><br><span> int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* Get memory for full buffer, including space for trailing EOB's. */</span><br><span> n = _yybytes_len + 2;</span><br><span> buf = (char *) ael_yyalloc(n ,yyscanner );</span><br><span>@@ -2907,10 +2891,10 @@</span><br><span> int ael_yyget_lineno (yyscan_t yyscanner)</span><br><span> {</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> if (! YY_CURRENT_BUFFER)</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> return yylineno;</span><br><span> }</span><br><span> </span><br><span>@@ -2920,10 +2904,10 @@</span><br><span> int ael_yyget_column (yyscan_t yyscanner)</span><br><span> {</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> if (! YY_CURRENT_BUFFER)</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> return yycolumn;</span><br><span> }</span><br><span> </span><br><span>@@ -2984,13 +2968,13 @@</span><br><span> </span><br><span> /* lineno is only valid if an input buffer exists. */</span><br><span> if (! YY_CURRENT_BUFFER )</span><br><span style="color: hsl(0, 100%, 40%);">- yy_fatal_error( "ael_yyset_lineno called with no buffer" , yyscanner);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ yy_fatal_error( "ael_yyset_lineno called with no buffer" , yyscanner); </span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> yylineno = line_number;</span><br><span> }</span><br><span> </span><br><span> /** Set the current column.</span><br><span style="color: hsl(0, 100%, 40%);">- * @param column_no</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param line_number</span><br><span> * @param yyscanner The scanner object.</span><br><span> */</span><br><span> void ael_yyset_column (int column_no , yyscan_t yyscanner)</span><br><span>@@ -2999,8 +2983,8 @@</span><br><span> </span><br><span> /* column is only valid if an input buffer exists. */</span><br><span> if (! YY_CURRENT_BUFFER )</span><br><span style="color: hsl(0, 100%, 40%);">- yy_fatal_error( "ael_yyset_column called with no buffer" , yyscanner);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ yy_fatal_error( "ael_yyset_column called with no buffer" , yyscanner); </span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> yycolumn = column_no;</span><br><span> }</span><br><span> </span><br><span>@@ -3053,13 +3037,13 @@</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span> return yylloc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> void ael_yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner)</span><br><span> {</span><br><span> struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;</span><br><span> yylloc = yylloc_param;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* User-visible API */</span><br><span> </span><br><span> /* ael_yylex_init is special because it creates the scanner itself, so it is</span><br><span>@@ -3107,20 +3091,20 @@</span><br><span> errno = EINVAL;</span><br><span> return 1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> *ptr_yy_globals = (yyscan_t) ael_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> if (*ptr_yy_globals == NULL){</span><br><span> errno = ENOMEM;</span><br><span> return 1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> /* By setting to 0xAA, we expose bugs in</span><br><span> yy_init_globals. Leave at 0x00 for releases. */</span><br><span> memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> ael_yyset_extra (yy_user_defined, *ptr_yy_globals);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> return yy_init_globals ( *ptr_yy_globals );</span><br><span> }</span><br><span> </span><br><span>@@ -3230,7 +3214,7 @@</span><br><span> </span><br><span> #define YYTABLES_NAME "yytables"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#line 656 "ael.flex"</span><br><span style="color: hsl(120, 100%, 40%);">+#line 659 "ael.flex"</span><br><span> </span><br><span> </span><br><span> </span><br><span>@@ -3492,3 +3476,4 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/20023">change 20023</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/20023"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ibbd343606fcf5c0d285b1599e6e8e59f514f2e4e </div>
<div style="display:none"> Gerrit-Change-Number: 20023 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>