sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify updating the token position markers 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo 2006-04-30 12:12:39 +00:00
parent 7343d311f1
commit 36a26a9197
2 changed files with 314 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

53
pbx/ael/ael.y
View File

@ -64,6 +64,9 @@ int ael_yylex (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , void * yyscanner
* Must be declared here because YYLTYPE is not known before * Must be declared here because YYLTYPE is not known before
*/ */
static pval *npval2(pvaltype type, YYLTYPE *first, YYLTYPE *last); static pval *npval2(pvaltype type, YYLTYPE *first, YYLTYPE *last);
/* update end position of an object, return the object */
static pval *update_last(pval *, YYLTYPE *);
%} %}
@ -441,22 +444,14 @@ statement : LC statements RC {
$$->u1.str = $4; $$->u1.str = $4;
$$->u2.statements = $6; } $$->u2.statements = $6; }
| switch_head RC /* empty list OK */ { | switch_head RC /* empty list OK */ {
$$=$1; $$ = update_last($1, &@2); }
$$->endline = @2.last_line;
$$->endcol = @2.last_column;}
| switch_head case_statements RC { | switch_head case_statements RC {
$$=$1; $$ = update_last($1, &@3);
$$->u2.statements = $2; $$->u2.statements = $2;}
$$->endline = @3.last_line;
$$->endcol = @3.last_column;}
| AMPER macro_call SEMI { | AMPER macro_call SEMI {
$$ = $2; $$ = update_last($2, &@2); }
$$->endline = @2.last_line;
$$->endcol = @2.last_column;}
| application_call SEMI { | application_call SEMI {
$$ = $1; $$ = update_last($1, &@2); }
$$->endline = @2.last_line;
$$->endcol = @2.last_column;}
| word SEMI { | word SEMI {
$$= npval2(PV_APPLICATION_CALL, &@1, &@2); $$= npval2(PV_APPLICATION_CALL, &@1, &@2);
$$->u1.str = $1;} $$->u1.str = $1;}
@ -497,11 +492,9 @@ statement : LC statements RC {
| KW_RETURN SEMI { $$ = npval2(PV_RETURN, &@1, &@2); } | KW_RETURN SEMI { $$ = npval2(PV_RETURN, &@1, &@2); }
| KW_CONTINUE SEMI { $$ = npval2(PV_CONTINUE, &@1, &@2); } | KW_CONTINUE SEMI { $$ = npval2(PV_CONTINUE, &@1, &@2); }
| random_head statement opt_else { | random_head statement opt_else {
$$=$1; $$ = update_last($1, &@2); /* XXX probably @3... */
$$->u2.statements = $2; $$->u2.statements = $2;
$$->endline = @2.last_line; $$->u3.else_statements = $3;}
$$->u3.else_statements = $3;
$$->endcol = @2.last_column;}
/* /*
| random_head statement KW_ELSE statement { | random_head statement KW_ELSE statement {
$$=$1; $$=$1;
@ -511,11 +504,9 @@ statement : LC statements RC {
$$->u3.else_statements = $4;} $$->u3.else_statements = $4;}
*/ */
| if_head statement opt_else { | if_head statement opt_else {
$$=$1; $$ = update_last($1, &@2); /* XXX probably @3... */
$$->u2.statements = $2; $$->u2.statements = $2;
$$->endline = @2.last_line; $$->u3.else_statements = $3;}
$$->u3.else_statements = $3;
$$->endcol = @2.last_column;}
/* /*
| if_head statement KW_ELSE statement { | if_head statement KW_ELSE statement {
$$=$1; $$=$1;
@ -525,11 +516,9 @@ statement : LC statements RC {
$$->u3.else_statements = $4;} $$->u3.else_statements = $4;}
*/ */
| iftime_head statement opt_else { | iftime_head statement opt_else {
$$=$1; $$ = update_last($1, &@2); /* XXX probably @3... */
$$->u2.statements = $2; $$->u2.statements = $2;
$$->endline = @2.last_line; $$->u3.else_statements = $3;}
$$->u3.else_statements = $3;
$$->endcol = @2.last_column;}
/* /*
| iftime_head statement KW_ELSE statement { | iftime_head statement KW_ELSE statement {
$$=$1; $$=$1;
@ -649,13 +638,14 @@ application_call_head: word {reset_argcount(parseio->scanner);} LP {
$$->u1.str = $1; } $$->u1.str = $1; }
; ;
application_call : application_call_head eval_arglist RP {$$ = $1; application_call : application_call_head eval_arglist RP {
$$ = update_last($1, &@3);
if( $$->type == PV_GOTO ) if( $$->type == PV_GOTO )
$$->u1.list = $2; $$->u1.list = $2;
else else
$$->u2.arglist = $2; $$->u2.arglist = $2;
$$->endline = @3.last_line; $$->endcol = @3.last_column;} }
| application_call_head RP {$$=$1;$$->endline = @2.last_line; $$->endcol = @2.last_column;} | application_call_head RP { $$ = update_last($1, &@2); }
; ;
opt_word : word { $$ = $1 } opt_word : word { $$ = $1 }
@ -993,6 +983,13 @@ static struct pval *npval2(pvaltype type, YYLTYPE *first, YYLTYPE *last)
first->first_column, last->last_column); first->first_column, last->last_column);
} }
static struct pval *update_last(pval *obj, YYLTYPE *last)
{
obj->endline = last->last_line;
obj->endcol = last->last_column;
return obj;
}
/* append second element to the list in the first one */ /* append second element to the list in the first one */
static pval * linku1(pval *head, pval *tail) static pval * linku1(pval *head, pval *tail)
{ {