diff options
| -rw-r--r-- | main/ast_expr2.c | 228 | ||||
| -rw-r--r-- | main/ast_expr2.y | 1 | ||||
| -rw-r--r-- | res/res_config_sqlite.c | 1 |
3 files changed, 111 insertions, 119 deletions
diff --git a/main/ast_expr2.c b/main/ast_expr2.c index 111f471c9..1ef1b1d7a 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -1,9 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 2.1a. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. +/* Skeleton parser for Yacc-like parsing with Bison, + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,18 +18,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ @@ -47,7 +37,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.3" +#define YYBISON_VERSION "2.1a" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -126,7 +116,7 @@ /* Copy the first part of user declarations. */ -#line 1 "../main/ast_expr2.y" +#line 1 "ast_expr2.y" /* Written by Pace Willisson (pace@blitz.com) * and placed in the public domain. @@ -144,6 +134,7 @@ #include <sys/types.h> #include <stdio.h> #include "asterisk.h" +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define FP___PRINTF "%.18Lg" #define FP___TYPE long double @@ -469,13 +460,13 @@ int ast_yyerror(const char *,YYLTYPE *, struct parse_io *); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 330 "../main/ast_expr2.y" +#line 331 "ast_expr2.y" { struct val *val; struct expr_node *arglist; } -/* Line 187 of yacc.c. */ -#line 479 "../main/ast_expr2.c" +/* Line 198 of yacc.c. */ +#line 470 "ast_expr2.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -497,13 +488,13 @@ typedef struct YYLTYPE /* Copy the second part of user declarations. */ -#line 335 "../main/ast_expr2.y" +#line 336 "ast_expr2.y" extern int ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t)); -/* Line 216 of yacc.c. */ -#line 507 "../main/ast_expr2.c" +/* Line 221 of yacc.c. */ +#line 498 "ast_expr2.c" #ifdef short # undef short @@ -633,13 +624,8 @@ YYID (i) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif +# ifdef __cplusplus +extern "C" { # endif # ifndef YYMALLOC # define YYMALLOC malloc @@ -655,6 +641,9 @@ void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif +# ifdef __cplusplus +} +# endif # endif #endif /* ! defined yyoverflow || YYERROR_VERBOSE */ @@ -799,9 +788,9 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 361, 361, 369, 376, 377, 386, 392, 393, 397, - 401, 405, 409, 413, 417, 421, 425, 429, 433, 437, - 441, 445, 449, 453, 457, 461, 465 + 0, 362, 362, 370, 377, 378, 387, 393, 394, 398, + 402, 406, 410, 414, 418, 422, 426, 430, 434, 438, + 442, 446, 450, 454, 458, 462, 466 }; #endif @@ -1064,14 +1053,14 @@ do { \ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) +yy_symbol_value_print (FILE *yyoutput, int yytype, const YYSTYPE * const yyvaluep, const YYLTYPE * const yylocationp) #else static void yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) FILE *yyoutput; int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; + const YYSTYPE * const yyvaluep; + const YYLTYPE * const yylocationp; #endif { if (!yyvaluep) @@ -1098,14 +1087,14 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp) #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp) +yy_symbol_print (FILE *yyoutput, int yytype, const YYSTYPE * const yyvaluep, const YYLTYPE * const yylocationp) #else static void yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp) FILE *yyoutput; int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; + const YYSTYPE * const yyvaluep; + const YYLTYPE * const yylocationp; #endif { if (yytype < YYNTOKENS) @@ -1158,7 +1147,8 @@ static void yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule) #else static void -yy_reduce_print (yyvsp, yylsp, yyrule) +yy_reduce_print (yyvsp, yylsp, yyrule + ) YYSTYPE *yyvsp; YYLTYPE *yylsp; int yyrule; @@ -1281,7 +1271,7 @@ yytnamerr (char *yyres, const char *yystr) { if (*yystr == '"') { - YYSIZE_T yyn = 0; + size_t yyn = 0; char const *yyp = yystr; for (;;) @@ -1328,7 +1318,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar) { int yyn = yypact[yystate]; - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + if (! (YYPACT_NINF < yyn && yyn < YYLAST)) return 0; else { @@ -1366,7 +1356,7 @@ yysyntax_error (char *yyresult, int yystate, int yychar) int yyxbegin = yyn < 0 ? -yyn : 0; /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; + int yychecklim = YYLAST - yyn; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; int yycount = 1; @@ -1454,114 +1444,114 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) switch (yytype) { case 4: /* "TOK_COLONCOLON" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1460 "../main/ast_expr2.c" +#line 1450 "ast_expr2.c" break; case 5: /* "TOK_COND" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1465 "../main/ast_expr2.c" +#line 1455 "ast_expr2.c" break; case 6: /* "TOK_OR" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1470 "../main/ast_expr2.c" +#line 1460 "ast_expr2.c" break; case 7: /* "TOK_AND" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1475 "../main/ast_expr2.c" +#line 1465 "ast_expr2.c" break; case 8: /* "TOK_NE" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1480 "../main/ast_expr2.c" +#line 1470 "ast_expr2.c" break; case 9: /* "TOK_LE" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1485 "../main/ast_expr2.c" +#line 1475 "ast_expr2.c" break; case 10: /* "TOK_GE" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1490 "../main/ast_expr2.c" +#line 1480 "ast_expr2.c" break; case 11: /* "TOK_LT" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1495 "../main/ast_expr2.c" +#line 1485 "ast_expr2.c" break; case 12: /* "TOK_GT" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1500 "../main/ast_expr2.c" +#line 1490 "ast_expr2.c" break; case 13: /* "TOK_EQ" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1505 "../main/ast_expr2.c" +#line 1495 "ast_expr2.c" break; case 14: /* "TOK_MINUS" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1510 "../main/ast_expr2.c" +#line 1500 "ast_expr2.c" break; case 15: /* "TOK_PLUS" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1515 "../main/ast_expr2.c" +#line 1505 "ast_expr2.c" break; case 16: /* "TOK_MOD" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1520 "../main/ast_expr2.c" +#line 1510 "ast_expr2.c" break; case 17: /* "TOK_DIV" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1525 "../main/ast_expr2.c" +#line 1515 "ast_expr2.c" break; case 18: /* "TOK_MULT" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1530 "../main/ast_expr2.c" +#line 1520 "ast_expr2.c" break; case 19: /* "TOK_COMPL" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1535 "../main/ast_expr2.c" +#line 1525 "ast_expr2.c" break; case 20: /* "TOK_EQTILDE" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1540 "../main/ast_expr2.c" +#line 1530 "ast_expr2.c" break; case 21: /* "TOK_COLON" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1545 "../main/ast_expr2.c" +#line 1535 "ast_expr2.c" break; case 22: /* "TOK_LP" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1550 "../main/ast_expr2.c" +#line 1540 "ast_expr2.c" break; case 23: /* "TOK_RP" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1555 "../main/ast_expr2.c" +#line 1545 "ast_expr2.c" break; case 24: /* "TOKEN" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1560 "../main/ast_expr2.c" +#line 1550 "ast_expr2.c" break; case 28: /* "expr" */ -#line 355 "../main/ast_expr2.y" +#line 356 "ast_expr2.y" { free_value((yyvaluep->val)); }; -#line 1565 "../main/ast_expr2.c" +#line 1555 "ast_expr2.c" break; default: @@ -1884,7 +1874,7 @@ yyreduce: switch (yyn) { case 2: -#line 361 "../main/ast_expr2.y" +#line 362 "ast_expr2.y" { ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1); ((struct parse_io *)parseio)->val->type = (yyvsp[(1) - (1)].val)->type; if( (yyvsp[(1) - (1)].val)->type == AST_EXPR_number ) @@ -1896,7 +1886,7 @@ yyreduce: break; case 3: -#line 369 "../main/ast_expr2.y" +#line 370 "ast_expr2.y" {/* nothing */ ((struct parse_io *)parseio)->val = (struct val *)calloc(sizeof(struct val),1); ((struct parse_io *)parseio)->val->type = AST_EXPR_string; ((struct parse_io *)parseio)->val->u.s = strdup(""); @@ -1904,12 +1894,12 @@ yyreduce: break; case 4: -#line 376 "../main/ast_expr2.y" +#line 377 "ast_expr2.y" { (yyval.arglist) = alloc_expr_node(AST_EXPR_NODE_VAL); (yyval.arglist)->val = (yyvsp[(1) - (1)].val);;} break; case 5: -#line 377 "../main/ast_expr2.y" +#line 378 "ast_expr2.y" {struct expr_node *x = alloc_expr_node(AST_EXPR_NODE_VAL); struct expr_node *t; DESTROY((yyvsp[(2) - (3)].val)); @@ -1919,7 +1909,7 @@ yyreduce: break; case 6: -#line 386 "../main/ast_expr2.y" +#line 387 "ast_expr2.y" { (yyval.val) = op_func((yyvsp[(1) - (4)].val),(yyvsp[(3) - (4)].arglist), ((struct parse_io *)parseio)->chan); DESTROY((yyvsp[(2) - (4)].val)); DESTROY((yyvsp[(4) - (4)].val)); @@ -1929,12 +1919,12 @@ yyreduce: break; case 7: -#line 392 "../main/ast_expr2.y" +#line 393 "ast_expr2.y" {(yyval.val) = (yyvsp[(1) - (1)].val);;} break; case 8: -#line 393 "../main/ast_expr2.y" +#line 394 "ast_expr2.y" { (yyval.val) = (yyvsp[(2) - (3)].val); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; (yyloc).first_line=0; (yyloc).last_line=0; @@ -1942,7 +1932,7 @@ yyreduce: break; case 9: -#line 397 "../main/ast_expr2.y" +#line 398 "ast_expr2.y" { (yyval.val) = op_or ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1950,7 +1940,7 @@ yyreduce: break; case 10: -#line 401 "../main/ast_expr2.y" +#line 402 "ast_expr2.y" { (yyval.val) = op_and ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1958,7 +1948,7 @@ yyreduce: break; case 11: -#line 405 "../main/ast_expr2.y" +#line 406 "ast_expr2.y" { (yyval.val) = op_eq ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1966,7 +1956,7 @@ yyreduce: break; case 12: -#line 409 "../main/ast_expr2.y" +#line 410 "ast_expr2.y" { (yyval.val) = op_gt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1974,7 +1964,7 @@ yyreduce: break; case 13: -#line 413 "../main/ast_expr2.y" +#line 414 "ast_expr2.y" { (yyval.val) = op_lt ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1982,7 +1972,7 @@ yyreduce: break; case 14: -#line 417 "../main/ast_expr2.y" +#line 418 "ast_expr2.y" { (yyval.val) = op_ge ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1990,7 +1980,7 @@ yyreduce: break; case 15: -#line 421 "../main/ast_expr2.y" +#line 422 "ast_expr2.y" { (yyval.val) = op_le ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -1998,7 +1988,7 @@ yyreduce: break; case 16: -#line 425 "../main/ast_expr2.y" +#line 426 "ast_expr2.y" { (yyval.val) = op_ne ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -2006,7 +1996,7 @@ yyreduce: break; case 17: -#line 429 "../main/ast_expr2.y" +#line 430 "ast_expr2.y" { (yyval.val) = op_plus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -2014,7 +2004,7 @@ yyreduce: break; case 18: -#line 433 "../main/ast_expr2.y" +#line 434 "ast_expr2.y" { (yyval.val) = op_minus ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -2022,7 +2012,7 @@ yyreduce: break; case 19: -#line 437 "../main/ast_expr2.y" +#line 438 "ast_expr2.y" { (yyval.val) = op_negate ((yyvsp[(2) - (2)].val)); DESTROY((yyvsp[(1) - (2)].val)); (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column; @@ -2030,7 +2020,7 @@ yyreduce: break; case 20: -#line 441 "../main/ast_expr2.y" +#line 442 "ast_expr2.y" { (yyval.val) = op_compl ((yyvsp[(2) - (2)].val)); DESTROY((yyvsp[(1) - (2)].val)); (yyloc).first_column = (yylsp[(1) - (2)]).first_column; (yyloc).last_column = (yylsp[(2) - (2)]).last_column; @@ -2038,7 +2028,7 @@ yyreduce: break; case 21: -#line 445 "../main/ast_expr2.y" +#line 446 "ast_expr2.y" { (yyval.val) = op_times ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -2046,7 +2036,7 @@ yyreduce: break; case 22: -#line 449 "../main/ast_expr2.y" +#line 450 "ast_expr2.y" { (yyval.val) = op_div ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -2054,7 +2044,7 @@ yyreduce: break; case 23: -#line 453 "../main/ast_expr2.y" +#line 454 "ast_expr2.y" { (yyval.val) = op_rem ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -2062,7 +2052,7 @@ yyreduce: break; case 24: -#line 457 "../main/ast_expr2.y" +#line 458 "ast_expr2.y" { (yyval.val) = op_colon ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -2070,7 +2060,7 @@ yyreduce: break; case 25: -#line 461 "../main/ast_expr2.y" +#line 462 "ast_expr2.y" { (yyval.val) = op_eqtilde ((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); DESTROY((yyvsp[(2) - (3)].val)); (yyloc).first_column = (yylsp[(1) - (3)]).first_column; (yyloc).last_column = (yylsp[(3) - (3)]).last_column; @@ -2078,7 +2068,7 @@ yyreduce: break; case 26: -#line 465 "../main/ast_expr2.y" +#line 466 "ast_expr2.y" { (yyval.val) = op_cond ((yyvsp[(1) - (5)].val), (yyvsp[(3) - (5)].val), (yyvsp[(5) - (5)].val)); DESTROY((yyvsp[(2) - (5)].val)); DESTROY((yyvsp[(4) - (5)].val)); @@ -2087,8 +2077,8 @@ yyreduce: break; -/* Line 1267 of yacc.c. */ -#line 2092 "../main/ast_expr2.c" +/* Line 1270 of yacc.c. */ +#line 2082 "ast_expr2.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2303,12 +2293,11 @@ yyreturn: if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } -#line 472 "../main/ast_expr2.y" +#line 473 "ast_expr2.y" static struct expr_node *alloc_expr_node(enum node_type nt) @@ -3447,3 +3436,4 @@ op_eqtilde (struct val *a, struct val *b) return v; } + diff --git a/main/ast_expr2.y b/main/ast_expr2.y index d910987d6..cb46aeb2b 100644 --- a/main/ast_expr2.y +++ b/main/ast_expr2.y @@ -15,6 +15,7 @@ #include <sys/types.h> #include <stdio.h> #include "asterisk.h" +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define FP___PRINTF "%.18Lg" #define FP___TYPE long double diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index 4cbed3685..ae44caf8f 100644 --- a/res/res_config_sqlite.c +++ b/res/res_config_sqlite.c @@ -82,6 +82,7 @@ ***/ #include "asterisk.h" +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <stdio.h> #include <stdarg.h> |