[asterisk-commits] trunk r24343 - in /trunk/pbx/ael: ael.tab.c ael.y

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Tue May  2 15:44:56 2006
New Revision: 24343

URL: http://svn.digium.com/view/asterisk?rev=24343&view=rev
Log:
fix a bug previously introduced in the handling of timespec.
Fortunately we have regression tests!


Modified:
    trunk/pbx/ael/ael.tab.c
    trunk/pbx/ael/ael.y

Modified: trunk/pbx/ael/ael.tab.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael.tab.c?rev=24343&r1=24342&r2=24343&view=diff
==============================================================================
--- trunk/pbx/ael/ael.tab.c (original)
+++ trunk/pbx/ael/ael.tab.c Tue May  2 15:44:56 2006
@@ -2158,9 +2158,9 @@
 #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:

Modified: trunk/pbx/ael/ael.y
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael.y?rev=24343&r1=24342&r2=24343&view=diff
==============================================================================
--- trunk/pbx/ael/ael.y (original)
+++ trunk/pbx/ael/ael.y Tue May  2 15:44:56 2006
@@ -303,9 +303,9 @@
 /* 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 */