mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-24 22:58:21 +00:00
Merged revisions 179807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 I had some work to do to port these changes to trunk; the check_expr stuff hasn't been updated here for quite some time, it appears. I added some more tests to the check_expr2 suite. I had to play around with the makefile a bit, etc. I added STANDALONE2 #ifdefs to ast_expr2.y so as not to conflict structure with aelparse. ........ r179807 | murf | 2009-03-03 11:11:34 -0700 (Tue, 03 Mar 2009) | 19 lines These changes allow AEL to better check ${} constructs within $[...], that are concatenated with text. I modified and added rules in ast_expr2.fl to better handle the concatenations. I added some default routines to ast_expr2.y so the standalone would compile. It also looks like I haven't run this thru bison since 2.1, so it's good to get this updated. The Makefile has comments added now for check_expr2 and check_expr to explain what they are for, and how to run them. The testexpr2s stuff has been removed, in favor of check_expr2. expr2.testinput has been updated to include the two expressions that inspired these changes (from mcnobody on #asterisk this morning) The regression has been run and all looks well. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@179973 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
231
main/ast_expr2.c
231
main/ast_expr2.c
@@ -148,7 +148,8 @@
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#if !defined(STANDALONE)
|
||||
#if !defined(STANDALONE) && !defined(STANDALONE2) \
|
||||
|
||||
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#else
|
||||
#ifndef __USE_ISOC99
|
||||
@@ -343,7 +344,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
|
||||
#include "asterisk/ast_expr.h"
|
||||
#include "asterisk/logger.h"
|
||||
#ifndef STANDALONE
|
||||
#if !defined(STANDALONE) && !defined(STANDALONE2)
|
||||
#include "asterisk/pbx.h"
|
||||
#endif
|
||||
|
||||
@@ -371,7 +372,7 @@ enum valtype {
|
||||
AST_EXPR_number, AST_EXPR_numeric_string, AST_EXPR_string
|
||||
} ;
|
||||
|
||||
#ifdef STANDALONE
|
||||
#if defined(STANDALONE) || defined(STANDALONE2)
|
||||
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6)));
|
||||
#endif
|
||||
|
||||
@@ -485,13 +486,13 @@ int ast_yyerror(const char *,YYLTYPE *, struct parse_io *);
|
||||
|
||||
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
|
||||
typedef union YYSTYPE
|
||||
#line 344 "ast_expr2.y"
|
||||
#line 345 "ast_expr2.y"
|
||||
{
|
||||
struct val *val;
|
||||
struct expr_node *arglist;
|
||||
}
|
||||
/* Line 187 of yacc.c. */
|
||||
#line 495 "ast_expr2.c"
|
||||
#line 496 "ast_expr2.c"
|
||||
YYSTYPE;
|
||||
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
||||
# define YYSTYPE_IS_DECLARED 1
|
||||
@@ -513,13 +514,13 @@ typedef struct YYLTYPE
|
||||
|
||||
|
||||
/* Copy the second part of user declarations. */
|
||||
#line 349 "ast_expr2.y"
|
||||
#line 350 "ast_expr2.y"
|
||||
|
||||
extern int ast_yylex __P((YYSTYPE *, YYLTYPE *, yyscan_t));
|
||||
|
||||
|
||||
/* Line 216 of yacc.c. */
|
||||
#line 523 "ast_expr2.c"
|
||||
#line 524 "ast_expr2.c"
|
||||
|
||||
#ifdef short
|
||||
# undef short
|
||||
@@ -817,9 +818,9 @@ static const yytype_int8 yyrhs[] =
|
||||
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
|
||||
static const yytype_uint16 yyrline[] =
|
||||
{
|
||||
0, 373, 373, 381, 388, 389, 395, 404, 410, 411,
|
||||
415, 419, 423, 427, 431, 435, 439, 443, 447, 451,
|
||||
455, 459, 463, 467, 471, 475, 479, 483, 488
|
||||
0, 374, 374, 382, 389, 390, 396, 405, 411, 412,
|
||||
416, 420, 424, 428, 432, 436, 440, 444, 448, 452,
|
||||
456, 460, 464, 468, 472, 476, 480, 484, 489
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -1472,119 +1473,119 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp)
|
||||
switch (yytype)
|
||||
{
|
||||
case 4: /* "TOK_COLONCOLON" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1478 "ast_expr2.c"
|
||||
#line 1479 "ast_expr2.c"
|
||||
break;
|
||||
case 5: /* "TOK_COND" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1483 "ast_expr2.c"
|
||||
#line 1484 "ast_expr2.c"
|
||||
break;
|
||||
case 6: /* "TOK_OR" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1488 "ast_expr2.c"
|
||||
#line 1489 "ast_expr2.c"
|
||||
break;
|
||||
case 7: /* "TOK_AND" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1493 "ast_expr2.c"
|
||||
#line 1494 "ast_expr2.c"
|
||||
break;
|
||||
case 8: /* "TOK_NE" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1498 "ast_expr2.c"
|
||||
#line 1499 "ast_expr2.c"
|
||||
break;
|
||||
case 9: /* "TOK_LE" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1503 "ast_expr2.c"
|
||||
#line 1504 "ast_expr2.c"
|
||||
break;
|
||||
case 10: /* "TOK_GE" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1508 "ast_expr2.c"
|
||||
#line 1509 "ast_expr2.c"
|
||||
break;
|
||||
case 11: /* "TOK_LT" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1513 "ast_expr2.c"
|
||||
#line 1514 "ast_expr2.c"
|
||||
break;
|
||||
case 12: /* "TOK_GT" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1518 "ast_expr2.c"
|
||||
#line 1519 "ast_expr2.c"
|
||||
break;
|
||||
case 13: /* "TOK_EQ" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1523 "ast_expr2.c"
|
||||
#line 1524 "ast_expr2.c"
|
||||
break;
|
||||
case 14: /* "TOK_MINUS" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1528 "ast_expr2.c"
|
||||
#line 1529 "ast_expr2.c"
|
||||
break;
|
||||
case 15: /* "TOK_PLUS" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1533 "ast_expr2.c"
|
||||
#line 1534 "ast_expr2.c"
|
||||
break;
|
||||
case 16: /* "TOK_MOD" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1538 "ast_expr2.c"
|
||||
#line 1539 "ast_expr2.c"
|
||||
break;
|
||||
case 17: /* "TOK_DIV" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1543 "ast_expr2.c"
|
||||
#line 1544 "ast_expr2.c"
|
||||
break;
|
||||
case 18: /* "TOK_MULT" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1548 "ast_expr2.c"
|
||||
#line 1549 "ast_expr2.c"
|
||||
break;
|
||||
case 19: /* "TOK_COMPL" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1553 "ast_expr2.c"
|
||||
#line 1554 "ast_expr2.c"
|
||||
break;
|
||||
case 20: /* "TOK_TILDETILDE" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1558 "ast_expr2.c"
|
||||
#line 1559 "ast_expr2.c"
|
||||
break;
|
||||
case 21: /* "TOK_EQTILDE" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1563 "ast_expr2.c"
|
||||
#line 1564 "ast_expr2.c"
|
||||
break;
|
||||
case 22: /* "TOK_COLON" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1568 "ast_expr2.c"
|
||||
#line 1569 "ast_expr2.c"
|
||||
break;
|
||||
case 23: /* "TOK_LP" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1573 "ast_expr2.c"
|
||||
#line 1574 "ast_expr2.c"
|
||||
break;
|
||||
case 24: /* "TOK_RP" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1578 "ast_expr2.c"
|
||||
#line 1579 "ast_expr2.c"
|
||||
break;
|
||||
case 25: /* "TOKEN" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1583 "ast_expr2.c"
|
||||
#line 1584 "ast_expr2.c"
|
||||
break;
|
||||
case 29: /* "expr" */
|
||||
#line 367 "ast_expr2.y"
|
||||
#line 368 "ast_expr2.y"
|
||||
{ free_value((yyvaluep->val)); };
|
||||
#line 1588 "ast_expr2.c"
|
||||
#line 1589 "ast_expr2.c"
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -1907,7 +1908,7 @@ yyreduce:
|
||||
switch (yyn)
|
||||
{
|
||||
case 2:
|
||||
#line 373 "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 )
|
||||
@@ -1919,7 +1920,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 3:
|
||||
#line 381 "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("");
|
||||
@@ -1927,12 +1928,12 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 4:
|
||||
#line 388 "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 389 "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));
|
||||
@@ -1942,7 +1943,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 6:
|
||||
#line 395 "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));
|
||||
@@ -1952,7 +1953,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 7:
|
||||
#line 404 "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));
|
||||
@@ -1962,12 +1963,12 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 8:
|
||||
#line 410 "ast_expr2.y"
|
||||
#line 411 "ast_expr2.y"
|
||||
{(yyval.val) = (yyvsp[(1) - (1)].val);;}
|
||||
break;
|
||||
|
||||
case 9:
|
||||
#line 411 "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;
|
||||
@@ -1975,7 +1976,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 10:
|
||||
#line 415 "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;
|
||||
@@ -1983,7 +1984,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 11:
|
||||
#line 419 "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;
|
||||
@@ -1991,7 +1992,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 12:
|
||||
#line 423 "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;
|
||||
@@ -1999,7 +2000,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 13:
|
||||
#line 427 "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;
|
||||
@@ -2007,7 +2008,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 14:
|
||||
#line 431 "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;
|
||||
@@ -2015,7 +2016,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 15:
|
||||
#line 435 "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;
|
||||
@@ -2023,7 +2024,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 16:
|
||||
#line 439 "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;
|
||||
@@ -2031,7 +2032,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 17:
|
||||
#line 443 "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;
|
||||
@@ -2039,7 +2040,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 18:
|
||||
#line 447 "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;
|
||||
@@ -2047,7 +2048,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 19:
|
||||
#line 451 "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;
|
||||
@@ -2055,7 +2056,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 20:
|
||||
#line 455 "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;
|
||||
@@ -2063,7 +2064,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 21:
|
||||
#line 459 "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;
|
||||
@@ -2071,7 +2072,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 22:
|
||||
#line 463 "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;
|
||||
@@ -2079,7 +2080,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 23:
|
||||
#line 467 "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;
|
||||
@@ -2087,7 +2088,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 24:
|
||||
#line 471 "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;
|
||||
@@ -2095,7 +2096,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 25:
|
||||
#line 475 "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;
|
||||
@@ -2103,7 +2104,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 26:
|
||||
#line 479 "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;
|
||||
@@ -2111,7 +2112,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 27:
|
||||
#line 483 "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));
|
||||
@@ -2120,7 +2121,7 @@ yyreduce:
|
||||
break;
|
||||
|
||||
case 28:
|
||||
#line 488 "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;
|
||||
@@ -2129,7 +2130,7 @@ yyreduce:
|
||||
|
||||
|
||||
/* Line 1267 of yacc.c. */
|
||||
#line 2133 "ast_expr2.c"
|
||||
#line 2134 "ast_expr2.c"
|
||||
default: break;
|
||||
}
|
||||
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
|
||||
@@ -2349,7 +2350,7 @@ yyreturn:
|
||||
}
|
||||
|
||||
|
||||
#line 494 "ast_expr2.y"
|
||||
#line 495 "ast_expr2.y"
|
||||
|
||||
|
||||
static struct expr_node *alloc_expr_node(enum node_type nt)
|
||||
@@ -2515,6 +2516,62 @@ is_zero_or_null (struct val *vp)
|
||||
/* NOTREACHED */
|
||||
}
|
||||
|
||||
#ifdef STANDALONE2
|
||||
|
||||
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
|
||||
{
|
||||
va_list vars;
|
||||
va_start(vars,fmt);
|
||||
|
||||
printf("LOG: lev:%d file:%s line:%d func: %s ",
|
||||
level, file, line, function);
|
||||
vprintf(fmt, vars);
|
||||
fflush(stdout);
|
||||
va_end(vars);
|
||||
}
|
||||
|
||||
|
||||
int main(int argc,char **argv) {
|
||||
char s[4096];
|
||||
char out[4096];
|
||||
FILE *infile;
|
||||
|
||||
if( !argv[1] )
|
||||
exit(20);
|
||||
|
||||
if( access(argv[1],F_OK)== 0 )
|
||||
{
|
||||
int ret;
|
||||
|
||||
infile = fopen(argv[1],"r");
|
||||
if( !infile )
|
||||
{
|
||||
printf("Sorry, couldn't open %s for reading!\n", argv[1]);
|
||||
exit(10);
|
||||
}
|
||||
while( fgets(s,sizeof(s),infile) )
|
||||
{
|
||||
if( s[strlen(s)-1] == '\n' )
|
||||
s[strlen(s)-1] = 0;
|
||||
|
||||
ret = ast_expr(s, out, sizeof(out), NULL);
|
||||
printf("Expression: %s Result: [%d] '%s'\n",
|
||||
s, ret, out);
|
||||
}
|
||||
fclose(infile);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (ast_expr(argv[1], s, sizeof(s), NULL))
|
||||
printf("=====%s======\n",s);
|
||||
else
|
||||
printf("No result\n");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#undef ast_yyerror
|
||||
#define ast_yyerror(x) ast_yyerror(x, YYLTYPE *yylloc, struct parse_io *parseio)
|
||||
|
||||
@@ -2539,7 +2596,7 @@ static void destroy_arglist(struct expr_node *arglist)
|
||||
}
|
||||
}
|
||||
|
||||
#if !defined(STANDALONE)
|
||||
#if !defined(STANDALONE) && !defined(STANDALONE2)
|
||||
static char *compose_func_args(struct expr_node *arglist)
|
||||
{
|
||||
struct expr_node *t = arglist;
|
||||
@@ -2833,7 +2890,7 @@ static struct val *op_func(struct val *funcname, struct expr_node *arglist, stru
|
||||
#endif
|
||||
} else {
|
||||
/* is this a custom function we should execute and collect the results of? */
|
||||
#ifndef STANDALONE
|
||||
#if !defined(STANDALONE) && !defined(STANDALONE2)
|
||||
struct ast_custom_function *f = ast_custom_function_find(funcname->u.s);
|
||||
if (!chan)
|
||||
ast_log(LOG_WARNING,"Hey! chan is NULL.\n");
|
||||
|
||||
Reference in New Issue
Block a user