From 3173305448f1f58306e776857d58cdd9c5021bb5 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Tue, 2 May 2006 18:45:18 +0000 Subject: rename the rule for context names properly git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24256 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- pbx/ael/ael.tab.c | 42 +++++++++++++++++++++--------------------- pbx/ael/ael.y | 13 ++++++------- 2 files changed, 27 insertions(+), 28 deletions(-) (limited to 'pbx/ael') diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c index cebb9993d..a672e28e7 100644 --- a/pbx/ael/ael.tab.c +++ b/pbx/ael/ael.tab.c @@ -569,7 +569,7 @@ static const unsigned short int yyrline[] = 519, 524, 532, 532, 543, 550, 553, 554, 557, 558, 561, 564, 565, 568, 572, 576, 580, 583, 586, 591, 592, 595, 596, 602, 607, 612, 613, 616, 617, 618, - 622, 623, 630, 631, 632, 635, 638 + 621, 622, 629, 630, 631, 634, 637 }; #endif @@ -585,17 +585,17 @@ static const char *const yytname[] = "KW_RETURN", "KW_BREAK", "KW_CONTINUE", "KW_REGEXTEN", "KW_HINT", "KW_FOR", "KW_WHILE", "KW_CASE", "KW_PATTERN", "KW_DEFAULT", "KW_CATCH", "KW_SWITCHES", "KW_ESWITCHES", "KW_INCLUDES", "word", "$accept", "file", - "objects", "object", "word_or_default", "context", "opt_abstract", - "macro", "globals", "global_statements", "global_statement", "@1", - "arglist", "elements_block", "elements", "element", "@2", "ignorepat", - "extension", "statements", "timerange", "timespec", "if_like_head", "@3", - "@4", "word_list", "word3_list", "goto_word", "switch_head", "@5", - "statement", "@6", "@7", "@8", "@9", "@10", "@11", "opt_else", "target", - "jumptarget", "macro_call", "@12", "application_call_head", "@13", - "application_call", "opt_word", "eval_arglist", "case_statements", - "case_statement", "macro_statements", "macro_statement", "switches", - "eswitches", "switchlist_block", "switchlist", "included_entry", - "includeslist", "includes", 0 + "objects", "object", "context_name", "context", "opt_abstract", "macro", + "globals", "global_statements", "global_statement", "@1", "arglist", + "elements_block", "elements", "element", "@2", "ignorepat", "extension", + "statements", "timerange", "timespec", "if_like_head", "@3", "@4", + "word_list", "word3_list", "goto_word", "switch_head", "@5", "statement", + "@6", "@7", "@8", "@9", "@10", "@11", "opt_else", "target", "jumptarget", + "macro_call", "@12", "application_call_head", "@13", "application_call", + "opt_word", "eval_arglist", "case_statements", "case_statement", + "macro_statements", "macro_statement", "switches", "eswitches", + "switchlist_block", "switchlist", "included_entry", "includeslist", + "includes", 0 }; #endif @@ -1277,7 +1277,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp) }; #line 1279 "ael.tab.c" break; - case 46: /* "word_or_default" */ + case 46: /* "context_name" */ #line 172 "ael.y" { free((yyvaluep->str));}; #line 1284 "ael.tab.c" @@ -2797,12 +2797,12 @@ yyreduce: break; case 140: -#line 622 "ael.y" +#line 621 "ael.y" { (yyval.pval) = nword((yyvsp[-1].str), &(yylsp[-1])); ;} break; case 141: -#line 623 "ael.y" +#line 622 "ael.y" { (yyval.pval) = nword((yyvsp[-3].str), &(yylsp[-3])); (yyval.pval)->u2.arglist = (yyvsp[-1].pval); @@ -2810,29 +2810,29 @@ yyreduce: break; case 142: -#line 630 "ael.y" +#line 629 "ael.y" { (yyval.pval) = (yyvsp[0].pval); ;} break; case 143: -#line 631 "ael.y" +#line 630 "ael.y" { (yyval.pval) = linku1((yyvsp[-1].pval), (yyvsp[0].pval)); ;} break; case 144: -#line 632 "ael.y" +#line 631 "ael.y" {(yyval.pval)=(yyvsp[-1].pval);;} break; case 145: -#line 635 "ael.y" +#line 634 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-3]), &(yylsp[0])); (yyval.pval)->u1.list = (yyvsp[-1].pval);;} break; case 146: -#line 638 "ael.y" +#line 637 "ael.y" { (yyval.pval) = npval2(PV_INCLUDES, &(yylsp[-2]), &(yylsp[0]));;} break; @@ -3117,7 +3117,7 @@ yyreturn: } -#line 643 "ael.y" +#line 642 "ael.y" static char *token_equivs1[] = diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index 2a58b732a..18e20484c 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -123,7 +123,7 @@ static pval *update_last(pval *, YYLTYPE *); %type included_entry %type opt_word -%type word_or_default +%type context_name %type timerange %type goto_word @@ -169,7 +169,7 @@ static pval *update_last(pval *, YYLTYPE *); elements_block switchlist_block timespec included_entry -%destructor { free($$);} word word_list goto_word word3_list opt_word word_or_default +%destructor { free($$);} word word_list goto_word word3_list opt_word context_name timerange @@ -189,11 +189,11 @@ object : context {$$=$1;} | SEMI {$$=0;/* allow older docs to be read */} ; -word_or_default : word { $$ = $1; } +context_name : word { $$ = $1; } | KW_DEFAULT { $$ = strdup("default"); } ; -context : opt_abstract KW_CONTEXT word_or_default elements_block { +context : opt_abstract KW_CONTEXT context_name elements_block { $$ = npval2(PV_CONTEXT, &@1, &@4); $$->u1.str = $3; $$->u2.statements = $4; @@ -618,9 +618,8 @@ switchlist : word SEMI { $$ = nword($1, &@1); } | switchlist error {$$=$1;} ; - -included_entry : word_or_default SEMI { $$ = nword($1, &@1); } - | word_or_default BAR timespec SEMI { +included_entry : context_name SEMI { $$ = nword($1, &@1); } + | context_name BAR timespec SEMI { $$ = nword($1, &@1); $$->u2.arglist = $3; prev_word=0; /* XXX sure ? */ } -- cgit v1.2.3