fix a bug previously introduced in the handling of timespec.

Fortunately we have regression tests!

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24343 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index cbcc8b45347889761c1006a19957125a2840da8c..52e4444605eda3e5bbcbee43aecfeb583125f57f 100644 (file)
--- a/pbx/ael/ael.tab.c
+++ b/pbx/ael/ael.tab.c
@@ -2158,9 +2158,9 @@ yyreduce:
 #line 304 "ael.y"
     {
                (yyval.pval) = nword((yyvsp[-6].str), &(yylsp[-6]));
-               (yyval.pval)->u1.list = nword((yyvsp[-4].str), &(yylsp[-4]));
-               (yyval.pval)->u1.list->next = nword((yyvsp[-2].str), &(yylsp[-2]));
-               (yyval.pval)->u1.list->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
+               (yyval.pval)->next = nword((yyvsp[-4].str), &(yylsp[-4]));
+               (yyval.pval)->next->next = nword((yyvsp[-2].str), &(yylsp[-2]));
+               (yyval.pval)->next->next->next = nword((yyvsp[0].str), &(yylsp[0])); ;}
     break;
 
   case 52:

diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index 6c0a56f3f31df128445c450ac0187a6d1dce62ed..5e1b41708f30d386ddada48a3a2e9458c4915751 100644 (file)
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -303,9 +303,9 @@ timerange: word3_list COLON word3_list COLON word3_list {
 /* full time specification range|dow|*|* */
 timespec : timerange BAR word3_list BAR word3_list BAR word3_list {
                $$ = nword($1, &@1);
-               $$->u1.list = nword($3, &@3);
-               $$->u1.list->next = nword($5, &@5);
-               $$->u1.list->next->next = nword($7, &@7); }
+               $$->next = nword($3, &@3);
+               $$->next->next = nword($5, &@5);
+               $$->next->next->next = nword($7, &@7); }
        ;
 
 /* expression used in if, random, while, switch */