kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduce a simplified interface for npval and start using it

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22928 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-27 18:09:20 +00:00
parent 54616839d7
commit dadafb65cf
3 changed files with 280 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

513
pbx/ael/ael.tab.c
View File

File diff suppressed because it is too large Load Diff

2
pbx/ael/ael.tab.h
View File

@@ -115,7 +115,7 @@
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
#line 51 "ael.y" #line 53 "ael.y"
typedef union YYSTYPE { typedef union YYSTYPE {
char *str; char *str;
struct pval *pval; struct pval *pval;

20
pbx/ael/ael.y
View File

@@ -28,8 +28,10 @@
#include "asterisk/utils.h" /* ast_calloc() */ #include "asterisk/utils.h" /* ast_calloc() */
#include "asterisk/ael_structs.h" #include "asterisk/ael_structs.h"
/* create a new object with start-end marker */
static pval *npval(pvaltype type, int first_line, int last_line, static pval *npval(pvaltype type, int first_line, int last_line,
int first_column, int last_column); int first_column, int last_column);
static void linku1(pval *head, pval *tail); static void linku1(pval *head, pval *tail);
void reset_parencount(yyscan_t yyscanner); void reset_parencount(yyscan_t yyscanner);
@@ -58,6 +60,10 @@ static char *ael_token_subst(char *mess);
void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s); void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s);
int ael_yylex (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , void * yyscanner); int ael_yylex (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , void * yyscanner);
/* create a new object with start-end marker, simplified interface.
* Must be declared here because YYLTYPE is not known before
*/
static pval *npval2(pvaltype type, YYLTYPE *first, YYLTYPE *last);
%} %}
@@ -152,8 +158,7 @@ object : context {$$=$1;}
; ;
context : KW_CONTEXT word LC elements RC { context : KW_CONTEXT word LC elements RC {
$$ = npval(PV_CONTEXT, @1.first_line, @5.last_line, $$ = npval2(PV_CONTEXT, &@1, &@5);
@1.first_column, @5.last_column);
$$->u1.str = $2; $$->u1.str = $2;
$$->u2.statements = $4; } $$->u2.statements = $4; }
| KW_CONTEXT word LC RC /* empty context OK */ { | KW_CONTEXT word LC RC /* empty context OK */ {
@@ -376,8 +381,11 @@ switch_head : KW_SWITCH LP { reset_parencount(parseio->scanner); } word RP LC {
$$->u1.str = $4; } $$->u1.str = $4; }
; ;
/*
* Definition of a statememt in our language
*/
statement : LC statements RC { statement : LC statements RC {
$$=npval(PV_STATEMENTBLOCK,@1.first_line,@3.last_line, @1.first_column, @3.last_column); $$ = npval2(PV_STATEMENTBLOCK, &@1, &@3);
$$->u1.list = $2; } $$->u1.list = $2; }
| word EQ {reset_semicount(parseio->scanner);} word SEMI { | word EQ {reset_semicount(parseio->scanner);} word SEMI {
$$=npval(PV_VARDEC,@1.first_line,@5.last_line, @1.first_column, @5.last_column); $$=npval(PV_VARDEC,@1.first_line,@5.last_line, @1.first_column, @5.last_column);
@@ -890,6 +898,12 @@ static struct pval *npval(pvaltype type, int first_line, int last_line,
return z; return z;
} }
static struct pval *npval2(pvaltype type, YYLTYPE *first, YYLTYPE *last)
{
return npval(type, first->first_line, last->last_line,
first->first_column, last->last_column);
}
/* append second element to the list in the first one */ /* append second element to the list in the first one */
static void linku1(pval *head, pval *tail) static void linku1(pval *head, pval *tail)
{ {