[asterisk-commits] murf: branch group/newcdr r171522 - /team/group/newcdr/main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jan 26 22:20:02 CST 2009
Author: murf
Date: Mon Jan 26 22:20:01 2009
New Revision: 171522
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=171522
Log:
Bring ast_expr2 into alignment with trunk
Modified:
team/group/newcdr/main/ast_expr2.c
team/group/newcdr/main/ast_expr2.h
Modified: team/group/newcdr/main/ast_expr2.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/newcdr/main/ast_expr2.c?view=diff&rev=171522&r1=171521&r2=171522
==============================================================================
--- team/group/newcdr/main/ast_expr2.c (original)
+++ team/group/newcdr/main/ast_expr2.c Mon Jan 26 22:20:01 2009
@@ -128,7 +128,7 @@
/* Copy the first part of user declarations. */
-#line 1 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 1 "ast_expr2.y"
/* Written by Pace Willisson (pace at blitz.com)
* and placed in the public domain.
@@ -485,13 +485,13 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 344 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 344 "ast_expr2.y"
{
struct val *val;
struct expr_node *arglist;
}
/* Line 187 of yacc.c. */
-#line 495 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 495 "ast_expr2.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -513,13 +513,13 @@
/* Copy the second part of user declarations. */
-#line 349 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 349 "ast_expr2.y"
extern int ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t));
/* Line 216 of yacc.c. */
-#line 523 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 523 "ast_expr2.c"
#ifdef short
# undef short
@@ -1472,119 +1472,119 @@
switch (yytype)
{
case 4: /* "TOK_COLONCOLON" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1478 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1478 "ast_expr2.c"
break;
case 5: /* "TOK_COND" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1483 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1483 "ast_expr2.c"
break;
case 6: /* "TOK_OR" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1488 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1488 "ast_expr2.c"
break;
case 7: /* "TOK_AND" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1493 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1493 "ast_expr2.c"
break;
case 8: /* "TOK_NE" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1498 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1498 "ast_expr2.c"
break;
case 9: /* "TOK_LE" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1503 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1503 "ast_expr2.c"
break;
case 10: /* "TOK_GE" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1508 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1508 "ast_expr2.c"
break;
case 11: /* "TOK_LT" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1513 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1513 "ast_expr2.c"
break;
case 12: /* "TOK_GT" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1518 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1518 "ast_expr2.c"
break;
case 13: /* "TOK_EQ" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1523 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1523 "ast_expr2.c"
break;
case 14: /* "TOK_MINUS" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1528 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1528 "ast_expr2.c"
break;
case 15: /* "TOK_PLUS" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1533 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1533 "ast_expr2.c"
break;
case 16: /* "TOK_MOD" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1538 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1538 "ast_expr2.c"
break;
case 17: /* "TOK_DIV" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1543 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1543 "ast_expr2.c"
break;
case 18: /* "TOK_MULT" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1548 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1548 "ast_expr2.c"
break;
case 19: /* "TOK_COMPL" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1553 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1553 "ast_expr2.c"
break;
case 20: /* "TOK_TILDETILDE" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1558 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1558 "ast_expr2.c"
break;
case 21: /* "TOK_EQTILDE" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1563 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1563 "ast_expr2.c"
break;
case 22: /* "TOK_COLON" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1568 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1568 "ast_expr2.c"
break;
case 23: /* "TOK_LP" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1573 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1573 "ast_expr2.c"
break;
case 24: /* "TOK_RP" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1578 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1578 "ast_expr2.c"
break;
case 25: /* "TOKEN" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1583 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1583 "ast_expr2.c"
break;
case 29: /* "expr" */
-#line 367 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 367 "ast_expr2.y"
{ free_value((yyvaluep->val)); };
-#line 1588 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 1588 "ast_expr2.c"
break;
default:
@@ -1907,7 +1907,7 @@
switch (yyn)
{
case 2:
-#line 373 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 373 "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 )
@@ -1919,7 +1919,7 @@
break;
case 3:
-#line 381 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 381 "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("");
@@ -1927,12 +1927,12 @@
break;
case 4:
-#line 388 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 388 "ast_expr2.y"
{ (yyval.arglist) = alloc_expr_node(AST_EXPR_NODE_VAL); (yyval.arglist)->val = (yyvsp[(1) - (1)].val);;}
break;
case 5:
-#line 389 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 389 "ast_expr2.y"
{struct expr_node *x = alloc_expr_node(AST_EXPR_NODE_VAL);
struct expr_node *t;
DESTROY((yyvsp[(2) - (3)].val));
@@ -1942,7 +1942,7 @@
break;
case 6:
-#line 395 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 395 "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));
@@ -1952,7 +1952,7 @@
break;
case 7:
-#line 404 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 404 "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));
@@ -1962,12 +1962,12 @@
break;
case 8:
-#line 410 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 410 "ast_expr2.y"
{(yyval.val) = (yyvsp[(1) - (1)].val);;}
break;
case 9:
-#line 411 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 411 "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;
@@ -1975,7 +1975,7 @@
break;
case 10:
-#line 415 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 415 "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;
@@ -1983,7 +1983,7 @@
break;
case 11:
-#line 419 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 419 "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;
@@ -1991,7 +1991,7 @@
break;
case 12:
-#line 423 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 423 "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;
@@ -1999,7 +1999,7 @@
break;
case 13:
-#line 427 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 427 "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;
@@ -2007,7 +2007,7 @@
break;
case 14:
-#line 431 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 431 "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;
@@ -2015,7 +2015,7 @@
break;
case 15:
-#line 435 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 435 "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;
@@ -2023,7 +2023,7 @@
break;
case 16:
-#line 439 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 439 "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;
@@ -2031,7 +2031,7 @@
break;
case 17:
-#line 443 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 443 "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;
@@ -2039,7 +2039,7 @@
break;
case 18:
-#line 447 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 447 "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;
@@ -2047,7 +2047,7 @@
break;
case 19:
-#line 451 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 451 "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;
@@ -2055,7 +2055,7 @@
break;
case 20:
-#line 455 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 455 "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;
@@ -2063,7 +2063,7 @@
break;
case 21:
-#line 459 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 459 "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;
@@ -2071,7 +2071,7 @@
break;
case 22:
-#line 463 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 463 "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;
@@ -2079,7 +2079,7 @@
break;
case 23:
-#line 467 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 467 "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;
@@ -2087,7 +2087,7 @@
break;
case 24:
-#line 471 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 471 "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;
@@ -2095,7 +2095,7 @@
break;
case 25:
-#line 475 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 475 "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;
@@ -2103,7 +2103,7 @@
break;
case 26:
-#line 479 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 479 "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;
@@ -2111,7 +2111,7 @@
break;
case 27:
-#line 483 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 483 "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));
@@ -2120,7 +2120,7 @@
break;
case 28:
-#line 488 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 488 "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;
@@ -2129,7 +2129,7 @@
/* Line 1267 of yacc.c. */
-#line 2133 "/home/murf/asterisk/newcdr/main/ast_expr2.c"
+#line 2133 "ast_expr2.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2349,7 +2349,7 @@
}
-#line 494 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 494 "ast_expr2.y"
static struct expr_node *alloc_expr_node(enum node_type nt)
Modified: team/group/newcdr/main/ast_expr2.h
URL: http://svn.digium.com/svn-view/asterisk/team/group/newcdr/main/ast_expr2.h?view=diff&rev=171522&r1=171521&r2=171522
==============================================================================
--- team/group/newcdr/main/ast_expr2.h (original)
+++ team/group/newcdr/main/ast_expr2.h Mon Jan 26 22:20:01 2009
@@ -94,13 +94,13 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 344 "/home/murf/asterisk/newcdr/main/ast_expr2.y"
+#line 344 "ast_expr2.y"
{
struct val *val;
struct expr_node *arglist;
}
/* Line 1489 of yacc.c. */
-#line 104 "/home/murf/asterisk/newcdr/main/ast_expr2.h"
+#line 104 "ast_expr2.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
More information about the asterisk-commits
mailing list