diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-21 21:13:02 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-21 21:13:02 +0000 |
commit | 137c1d8d9edab78e7cc0f238e4898ae6adca8e11 (patch) | |
tree | e783203f7d0fa05d28feb3bc509c19bc885d2666 /main/ast_expr2.h | |
parent | 724844c2758c811b9723bb787f465e85da668f20 (diff) |
(closes issue #12467)
Reported by: atis
Tested by: murf
This upgrade adds the ~~ (concatenation) string operator to expr2.
While not needed in normal runtime pbx operation, it is needed when
raw exprs are being syntax checked. This plays into future syntax-
unification plans. By permission of atis, this addition in trunk
and the reason of why things are as they are will suffice to close
this bug.
I also added a short note about the previous addition of "sip show sched"
to the CLI in CHANGES, which I discovered I forgot in a previous commit.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@114423 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/ast_expr2.h')
-rw-r--r-- | main/ast_expr2.h | 54 |
1 files changed, 32 insertions, 22 deletions
diff --git a/main/ast_expr2.h b/main/ast_expr2.h index cd2077149..d2a560aa1 100644 --- a/main/ast_expr2.h +++ b/main/ast_expr2.h @@ -1,7 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.1a. */ +/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +/* Skeleton interface for Bison's Yacc-like parsers in C + + 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 @@ -18,10 +20,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* 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. */ +/* 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. */ /* Tokens. */ #ifndef YYTOKENTYPE @@ -46,11 +56,12 @@ TOK_DIV = 272, TOK_MULT = 273, TOK_COMPL = 274, - TOK_EQTILDE = 275, - TOK_COLON = 276, - TOK_LP = 277, - TOK_RP = 278, - TOKEN = 279 + TOK_TILDETILDE = 275, + TOK_EQTILDE = 276, + TOK_COLON = 277, + TOK_LP = 278, + TOK_RP = 279, + TOKEN = 280 }; #endif /* Tokens. */ @@ -71,24 +82,25 @@ #define TOK_DIV 272 #define TOK_MULT 273 #define TOK_COMPL 274 -#define TOK_EQTILDE 275 -#define TOK_COLON 276 -#define TOK_LP 277 -#define TOK_RP 278 -#define TOKEN 279 +#define TOK_TILDETILDE 275 +#define TOK_EQTILDE 276 +#define TOK_COLON 277 +#define TOK_LP 278 +#define TOK_RP 279 +#define TOKEN 280 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 341 "ast_expr2.y" +#line 342 "ast_expr2.y" { struct val *val; struct expr_node *arglist; } -/* Line 1536 of yacc.c. */ -#line 92 "ast_expr2.h" +/* Line 1489 of yacc.c. */ +#line 104 "ast_expr2.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -111,5 +123,3 @@ typedef struct YYLTYPE #endif - - |