[asterisk-commits] tilghman: branch 1.6.1 r243058 - in /branches/1.6.1: ./ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jan 25 17:26:10 CST 2010
Author: tilghman
Date: Mon Jan 25 17:26:07 2010
New Revision: 243058
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=243058
Log:
Merged revisions 239920 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r239920 | tilghman | 2010-01-13 14:38:42 -0600 (Wed, 13 Jan 2010) | 2 lines
Flex uses fwrite incorrectly, which breaks the build. Providing a workaround.
........
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/Makefile
branches/1.6.1/main/ast_expr2.c
branches/1.6.1/main/ast_expr2.fl
branches/1.6.1/main/ast_expr2f.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/Makefile?view=diff&rev=243058&r1=243057&r2=243058
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Mon Jan 25 17:26:07 2010
@@ -290,7 +290,7 @@
MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
OTHER_SUBDIRS:=utils agi
-SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
+SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
SUBDIRS_DIST_CLEAN:=$(SUBDIRS:%=%-dist-clean)
Modified: branches/1.6.1/main/ast_expr2.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/ast_expr2.c?view=diff&rev=243058&r1=243057&r2=243058
==============================================================================
--- branches/1.6.1/main/ast_expr2.c (original)
+++ branches/1.6.1/main/ast_expr2.c Mon Jan 25 17:26:07 2010
@@ -128,7 +128,7 @@
/* Copy the first part of user declarations. */
-#line 1 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 1 "ast_expr2.y"
/* Written by Pace Willisson (pace at blitz.com)
* and placed in the public domain.
@@ -486,13 +486,13 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 345 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 345 "ast_expr2.y"
{
struct val *val;
struct expr_node *arglist;
}
/* Line 187 of yacc.c. */
-#line 496 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 496 "ast_expr2.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -514,13 +514,13 @@
/* Copy the second part of user declarations. */
-#line 350 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 350 "ast_expr2.y"
extern int ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t));
/* Line 216 of yacc.c. */
-#line 524 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 524 "ast_expr2.c"
#ifdef short
# undef short
@@ -1473,119 +1473,119 @@
switch (yytype)
{
case 4: /* "TOK_COLONCOLON" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1479 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1479 "ast_expr2.c"
break;
case 5: /* "TOK_COND" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1484 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1484 "ast_expr2.c"
break;
case 6: /* "TOK_OR" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1489 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1489 "ast_expr2.c"
break;
case 7: /* "TOK_AND" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1494 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1494 "ast_expr2.c"
break;
case 8: /* "TOK_NE" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1499 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1499 "ast_expr2.c"
break;
case 9: /* "TOK_LE" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1504 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1504 "ast_expr2.c"
break;
case 10: /* "TOK_GE" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1509 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1509 "ast_expr2.c"
break;
case 11: /* "TOK_LT" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1514 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1514 "ast_expr2.c"
break;
case 12: /* "TOK_GT" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1519 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1519 "ast_expr2.c"
break;
case 13: /* "TOK_EQ" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1524 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1524 "ast_expr2.c"
break;
case 14: /* "TOK_MINUS" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1529 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1529 "ast_expr2.c"
break;
case 15: /* "TOK_PLUS" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1534 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1534 "ast_expr2.c"
break;
case 16: /* "TOK_MOD" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1539 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1539 "ast_expr2.c"
break;
case 17: /* "TOK_DIV" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1544 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1544 "ast_expr2.c"
break;
case 18: /* "TOK_MULT" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1549 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1549 "ast_expr2.c"
break;
case 19: /* "TOK_COMPL" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1554 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1554 "ast_expr2.c"
break;
case 20: /* "TOK_TILDETILDE" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1559 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1559 "ast_expr2.c"
break;
case 21: /* "TOK_EQTILDE" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1564 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1564 "ast_expr2.c"
break;
case 22: /* "TOK_COLON" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1569 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1569 "ast_expr2.c"
break;
case 23: /* "TOK_LP" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1574 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1574 "ast_expr2.c"
break;
case 24: /* "TOK_RP" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1579 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1579 "ast_expr2.c"
break;
case 25: /* "TOKEN" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1584 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1584 "ast_expr2.c"
break;
case 29: /* "expr" */
-#line 368 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 368 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1589 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 1589 "ast_expr2.c"
break;
default:
@@ -1908,7 +1908,7 @@
switch (yyn)
{
case 2:
-#line 374 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 374 "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 )
@@ -1920,7 +1920,7 @@
break;
case 3:
-#line 382 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 382 "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("");
@@ -1928,12 +1928,12 @@
break;
case 4:
-#line 389 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 389 "ast_expr2.y"
{ (yyval.arglist) = alloc_expr_node(AST_EXPR_NODE_VAL); (yyval.arglist)->val = (yyvsp[(1) - (1)].val);;}
break;
case 5:
-#line 390 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 390 "ast_expr2.y"
{struct expr_node *x = alloc_expr_node(AST_EXPR_NODE_VAL);
struct expr_node *t;
DESTROY((yyvsp[(2) - (3)].val));
@@ -1943,7 +1943,7 @@
break;
case 6:
-#line 396 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 396 "ast_expr2.y"
{struct expr_node *x = alloc_expr_node(AST_EXPR_NODE_VAL);
struct expr_node *t; /* NULL args should OK */
DESTROY((yyvsp[(2) - (2)].val));
@@ -1953,7 +1953,7 @@
break;
case 7:
-#line 405 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 405 "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));
@@ -1963,12 +1963,12 @@
break;
case 8:
-#line 411 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 411 "ast_expr2.y"
{(yyval.val) = (yyvsp[(1) - (1)].val);;}
break;
case 9:
-#line 412 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 412 "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;
@@ -1976,7 +1976,7 @@
break;
case 10:
-#line 416 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 416 "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;
@@ -1984,7 +1984,7 @@
break;
case 11:
-#line 420 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 420 "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;
@@ -1992,7 +1992,7 @@
break;
case 12:
-#line 424 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 424 "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;
@@ -2000,7 +2000,7 @@
break;
case 13:
-#line 428 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 428 "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;
@@ -2008,7 +2008,7 @@
break;
case 14:
-#line 432 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 432 "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;
@@ -2016,7 +2016,7 @@
break;
case 15:
-#line 436 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 436 "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;
@@ -2024,7 +2024,7 @@
break;
case 16:
-#line 440 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 440 "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;
@@ -2032,7 +2032,7 @@
break;
case 17:
-#line 444 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 444 "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;
@@ -2040,7 +2040,7 @@
break;
case 18:
-#line 448 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 448 "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;
@@ -2048,7 +2048,7 @@
break;
case 19:
-#line 452 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 452 "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;
@@ -2056,7 +2056,7 @@
break;
case 20:
-#line 456 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 456 "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;
@@ -2064,7 +2064,7 @@
break;
case 21:
-#line 460 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 460 "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;
@@ -2072,7 +2072,7 @@
break;
case 22:
-#line 464 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 464 "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;
@@ -2080,7 +2080,7 @@
break;
case 23:
-#line 468 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 468 "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;
@@ -2088,7 +2088,7 @@
break;
case 24:
-#line 472 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 472 "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;
@@ -2096,7 +2096,7 @@
break;
case 25:
-#line 476 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 476 "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;
@@ -2104,7 +2104,7 @@
break;
case 26:
-#line 480 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 480 "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;
@@ -2112,7 +2112,7 @@
break;
case 27:
-#line 484 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 484 "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));
@@ -2121,7 +2121,7 @@
break;
case 28:
-#line 489 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 489 "ast_expr2.y"
{ (yyval.val) = op_tildetilde ((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;
@@ -2130,7 +2130,7 @@
/* Line 1267 of yacc.c. */
-#line 2134 "/home/murf/asterisk/1.6.1/main/ast_expr2.c"
+#line 2134 "ast_expr2.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2350,7 +2350,7 @@
}
-#line 495 "/home/murf/asterisk/1.6.1/main/ast_expr2.y"
+#line 495 "ast_expr2.y"
static struct expr_node *alloc_expr_node(enum node_type nt)
Modified: branches/1.6.1/main/ast_expr2.fl
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/ast_expr2.fl?view=diff&rev=243058&r1=243057&r2=243058
==============================================================================
--- branches/1.6.1/main/ast_expr2.fl (original)
+++ branches/1.6.1/main/ast_expr2.fl Mon Jan 25 17:26:07 2010
@@ -64,6 +64,11 @@
#include "asterisk/strings.h"
#include "asterisk/channel.h"
#endif
+
+/*!\note The latest Flex uses fwrite without checking its return value, which
+ * is a warning on some compilers. Therefore, we use this workaround, to trick
+ * the compiler into suppressing this warning. */
+#define fwrite(a,b,c,d) do { int __res = fwrite(a,b,c,d); (__res); } while (0)
enum valtype {
AST_EXPR_number, AST_EXPR_numeric_string, AST_EXPR_string
Modified: branches/1.6.1/main/ast_expr2f.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/ast_expr2f.c?view=diff&rev=243058&r1=243057&r2=243058
==============================================================================
--- branches/1.6.1/main/ast_expr2f.c (original)
+++ branches/1.6.1/main/ast_expr2f.c Mon Jan 25 17:26:07 2010
@@ -11,7 +11,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 34
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -33,7 +33,7 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
@@ -96,11 +96,12 @@
#else /* ! __cplusplus */
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
#define YY_USE_CONST
-#endif /* __STDC__ */
+#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
@@ -135,8 +136,6 @@
#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
#define yy_flex_debug yyg->yy_flex_debug_r
-
-int ast_yylex_init (yyscan_t* scanner);
/* Enter a start condition. This macro really ought to take a parameter,
* but we do it the disgusting crufty way forced on us by the ()-less
@@ -198,11 +197,13 @@
/* The following is because we cannot portably get our hands on size_t
* (without autoconf's help, which isn't available because we want
* flex-generated scanners to compile on their own).
+ * Given that the standard has decreed that size_t exists since 1989,
+ * I guess we can afford to depend on it. Manoj.
*/
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -556,6 +557,11 @@
#include "asterisk/channel.h"
#endif
+/*!\note The latest Flex uses fwrite without checking its return value, which
+ * is a warning on some compilers. Therefore, we use this workaround, to trick
+ * the compiler into suppressing this warning. */
+#define fwrite(a,b,c,d) do { int __res = fwrite(a,b,c,d); (__res); } while (0)
+
enum valtype {
AST_EXPR_number, AST_EXPR_numeric_string, AST_EXPR_string
} ;
@@ -601,7 +607,7 @@
static int curlycount = 0;
static char *expr2_token_subst(const char *mess);
-#line 603 "ast_expr2f.c"
+#line 609 "ast_expr2f.c"
#define INITIAL 0
#define var 1
@@ -665,6 +671,10 @@
# define yylloc yyg->yylloc_r
+int ast_yylex_init (yyscan_t* scanner);
+
+int ast_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
+
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
@@ -744,7 +754,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -755,7 +765,7 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- size_t n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -809,9 +819,11 @@
#ifndef YY_DECL
#define YY_DECL_IS_OURS 1
-extern int ast_yylex (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
-
-#define YY_DECL int ast_yylex (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
+extern int ast_yylex \
+ (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
+
+#define YY_DECL int ast_yylex \
+ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
#endif /* !YY_DECL */
/* Code executed at the beginning of each rule, after yytext and yyleng
@@ -838,10 +850,10 @@
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 125 "ast_expr2.fl"
-
-
-#line 843 "ast_expr2f.c"
+#line 130 "ast_expr2.fl"
+
+
+#line 855 "ast_expr2f.c"
yylval = yylval_param;
@@ -932,132 +944,132 @@
case 1:
YY_RULE_SETUP
-#line 127 "ast_expr2.fl"
+#line 132 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_OR;}
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 128 "ast_expr2.fl"
+#line 133 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_AND;}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 129 "ast_expr2.fl"
+#line 134 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQ;}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 130 "ast_expr2.fl"
+#line 135 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_OR;}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 131 "ast_expr2.fl"
+#line 136 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_AND;}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 132 "ast_expr2.fl"
+#line 137 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQ;}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 133 "ast_expr2.fl"
+#line 138 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_EQTILDE;}
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 134 "ast_expr2.fl"
+#line 139 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_TILDETILDE;}
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 135 "ast_expr2.fl"
+#line 140 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_GT;}
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 136 "ast_expr2.fl"
+#line 141 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_LT;}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 137 "ast_expr2.fl"
+#line 142 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_GE;}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 138 "ast_expr2.fl"
+#line 143 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_LE;}
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 139 "ast_expr2.fl"
+#line 144 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_NE;}
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 140 "ast_expr2.fl"
+#line 145 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_PLUS;}
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 141 "ast_expr2.fl"
+#line 146 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COMMA;}
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 142 "ast_expr2.fl"
+#line 147 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MINUS;}
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 143 "ast_expr2.fl"
+#line 148 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MULT;}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 144 "ast_expr2.fl"
+#line 149 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_DIV;}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 145 "ast_expr2.fl"
+#line 150 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_MOD;}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 146 "ast_expr2.fl"
+#line 151 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COND;}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 147 "ast_expr2.fl"
+#line 152 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COMPL;}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 148 "ast_expr2.fl"
+#line 153 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COLON;}
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 149 "ast_expr2.fl"
+#line 154 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_COLONCOLON;}
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 150 "ast_expr2.fl"
+#line 155 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_LP;}
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 151 "ast_expr2.fl"
+#line 156 "ast_expr2.fl"
{ SET_COLUMNS; SET_STRING; return TOK_RP;}
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 152 "ast_expr2.fl"
+#line 157 "ast_expr2.fl"
{
/* gather the contents of ${} expressions, with trailing stuff,
* into a single TOKEN.
@@ -1070,24 +1082,24 @@
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 162 "ast_expr2.fl"
+#line 167 "ast_expr2.fl"
{}
YY_BREAK
case 28:
/* rule 28 can match eol */
YY_RULE_SETUP
-#line 163 "ast_expr2.fl"
+#line 168 "ast_expr2.fl"
{SET_COLUMNS; SET_STRING; return TOKEN;}
YY_BREAK
case 29:
/* rule 29 can match eol */
YY_RULE_SETUP
-#line 165 "ast_expr2.fl"
+#line 170 "ast_expr2.fl"
{/* what to do with eol */}
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 166 "ast_expr2.fl"
+#line 171 "ast_expr2.fl"
{
SET_COLUMNS;
/* the original behavior of the expression parser was
@@ -1100,7 +1112,7 @@
case 31:
/* rule 31 can match eol */
YY_RULE_SETUP
-#line 175 "ast_expr2.fl"
+#line 180 "ast_expr2.fl"
{
SET_COLUMNS;
SET_STRING;
@@ -1110,7 +1122,7 @@
case 32:
/* rule 32 can match eol */
YY_RULE_SETUP
-#line 181 "ast_expr2.fl"
+#line 186 "ast_expr2.fl"
{
curlycount = 0;
BEGIN(var);
@@ -1120,7 +1132,7 @@
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
-#line 187 "ast_expr2.fl"
+#line 192 "ast_expr2.fl"
{
curlycount--;
if (curlycount < 0) {
@@ -1134,7 +1146,7 @@
case 34:
/* rule 34 can match eol */
YY_RULE_SETUP
-#line 197 "ast_expr2.fl"
+#line 202 "ast_expr2.fl"
{
curlycount++;
yymore();
@@ -1142,7 +1154,7 @@
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 203 "ast_expr2.fl"
+#line 208 "ast_expr2.fl"
{
BEGIN(0);
SET_COLUMNS;
@@ -1152,7 +1164,7 @@
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 210 "ast_expr2.fl"
+#line 215 "ast_expr2.fl"
{
curlycount = 0;
BEGIN(var);
@@ -1162,7 +1174,7 @@
case 37:
/* rule 37 can match eol */
YY_RULE_SETUP
-#line 216 "ast_expr2.fl"
+#line 221 "ast_expr2.fl"
{
char c = yytext[yyleng-1];
BEGIN(0);
@@ -1173,7 +1185,7 @@
}
YY_BREAK
case YY_STATE_EOF(trail):
-#line 225 "ast_expr2.fl"
+#line 230 "ast_expr2.fl"
{
BEGIN(0);
SET_COLUMNS;
@@ -1184,10 +1196,10 @@
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 233 "ast_expr2.fl"
+#line 238 "ast_expr2.fl"
ECHO;
YY_BREAK
-#line 1189 "ast_expr2f.c"
+#line 1201 "ast_expr2f.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(var):
yyterminate();
@@ -1421,7 +1433,7 @@
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- yyg->yy_n_chars, num_to_read );
+ yyg->yy_n_chars, (size_t) num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
}
@@ -1444,6 +1456,14 @@
else
ret_val = EOB_ACT_CONTINUE_SCAN;
+
+ if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+ /* Extend the array by 50%, plus the number we really need. */
+ yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) ast_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
+ if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+ YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+ }
yyg->yy_n_chars += number_to_move;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
@@ -1873,7 +1893,9 @@
yyg->yy_buffer_stack = (struct yy_buffer_state**)ast_yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
, yyscanner);
-
+ if ( ! yyg->yy_buffer_stack )
+ YY_FATAL_ERROR( "out of dynamic memory in ast_yyensure_buffer_stack()" );
+
memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
yyg->yy_buffer_stack_max = num_to_alloc;
@@ -1891,6 +1913,8 @@
(yyg->yy_buffer_stack,
num_to_alloc * sizeof(struct yy_buffer_state*)
, yyscanner);
+ if ( ! yyg->yy_buffer_stack )
+ YY_FATAL_ERROR( "out of dynamic memory in ast_yyensure_buffer_stack()" );
/* zero only the new slots.*/
memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -1935,7 +1959,7 @@
/** Setup the input buffer state to scan a string. The next call to ast_yylex() will
* scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
* @note If you want to scan bytes that may contain NUL values, then use
@@ -2209,6 +2233,42 @@
return yy_init_globals ( *ptr_yy_globals );
}
+/* ast_yylex_init_extra has the same functionality as ast_yylex_init, but follows the
+ * convention of taking the scanner as the last argument. Note however, that
+ * this is a *pointer* to a scanner, as it will be allocated by this call (and
+ * is the reason, too, why this function also must handle its own declaration).
+ * The user defined value in the first argument will be available to ast_yyalloc in
+ * the yyextra field.
+ */
+
+int ast_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
+
+{
+ struct yyguts_t dummy_yyguts;
+
+ ast_yyset_extra (yy_user_defined, &dummy_yyguts);
+
+ if (ptr_yy_globals == NULL){
+ errno = EINVAL;
+ return 1;
+ }
+
+ *ptr_yy_globals = (yyscan_t) ast_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
+
+ if (*ptr_yy_globals == NULL){
+ errno = ENOMEM;
+ return 1;
+ }
+
+ /* By setting to 0xAA, we expose bugs in
+ yy_init_globals. Leave at 0x00 for releases. */
+ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
+
+ ast_yyset_extra (yy_user_defined, *ptr_yy_globals);
+
+ return yy_init_globals ( *ptr_yy_globals );
+}
+
static int yy_init_globals (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
@@ -2315,7 +2375,7 @@
#define YYTABLES_NAME "yytables"
-#line 233 "ast_expr2.fl"
+#line 238 "ast_expr2.fl"
More information about the asterisk-commits
mailing list