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

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Thu Apr 27 12:39:55 2006
New Revision: 22902

URL: http://svn.digium.com/view/asterisk?rev=22902&view=rev
Log:
fix a couple of bugs in arguments to npval


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=22902&r1=22901&r2=22902&view=diff
==============================================================================
--- trunk/pbx/ael/ael.tab.c (original)
+++ trunk/pbx/ael/ael.tab.c Thu Apr 27 12:39:55 2006
@@ -2109,7 +2109,7 @@
   case 47:
 #line 269 "ael.y"
     {
-		(yyval.pval) = npval(PV_EXTENSION,(yylsp[-3]).first_line,(yylsp[-1]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column);
+		(yyval.pval) = npval(PV_EXTENSION,(yylsp[-3]).first_line,(yylsp[0]).last_line, (yylsp[-3]).first_column, (yylsp[0]).last_column);
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
 		(yyval.pval)->u2.statements = (yyvsp[0].pval);
 		(yyval.pval)->u4.regexten=1;;}
@@ -2127,7 +2127,7 @@
   case 49:
 #line 279 "ael.y"
     {
-		(yyval.pval) = npval(PV_EXTENSION,(yylsp[-7]).first_line,(yylsp[-4]).last_line, (yylsp[-7]).first_column, (yylsp[0]).last_column);
+		(yyval.pval) = npval(PV_EXTENSION,(yylsp[-7]).first_line,(yylsp[0]).last_line, (yylsp[-7]).first_column, (yylsp[0]).last_column);
 		(yyval.pval)->u1.str = (yyvsp[-2].str);
 		(yyval.pval)->u2.statements = (yyvsp[0].pval);
 		(yyval.pval)->u4.regexten=1;
@@ -3327,7 +3327,8 @@
 	parseio->syntax_error_count++;
 }
 
-static struct pval *npval(pvaltype type,int first_line, int last_line, int first_column, int last_column)
+static struct pval *npval(pvaltype type, int first_line, int last_line,
+	int first_column, int last_column)
 {
 	extern char *my_file;
 	pval *z = (pval *)calloc(sizeof(struct pval),1);

Modified: trunk/pbx/ael/ael.y
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael.y?rev=22902&r1=22901&r2=22902&view=diff
==============================================================================
--- trunk/pbx/ael/ael.y (original)
+++ trunk/pbx/ael/ael.y Thu Apr 27 12:39:55 2006
@@ -267,7 +267,7 @@
 		$$->u1.str = $1;
 		$$->u2.statements = $3; }
 	| KW_REGEXTEN word EXTENMARK statement {
-		$$ = npval(PV_EXTENSION, at 1.first_line, at 3.last_line, @1.first_column, @4.last_column);
+		$$ = npval(PV_EXTENSION, at 1.first_line, at 4.last_line, @1.first_column, @4.last_column);
 		$$->u1.str = $2;
 		$$->u2.statements = $4;
 		$$->u4.regexten=1;}
@@ -277,7 +277,7 @@
 		$$->u2.statements = $7;
 		$$->u3.hints = $3;}
 	| KW_REGEXTEN KW_HINT LP word3_list RP word EXTENMARK statement {
-		$$ = npval(PV_EXTENSION, at 1.first_line, at 4.last_line, @1.first_column, @8.last_column);
+		$$ = npval(PV_EXTENSION, at 1.first_line, at 8.last_line, @1.first_column, @8.last_column);
 		$$->u1.str = $6;
 		$$->u2.statements = $8;
 		$$->u4.regexten=1;
@@ -839,7 +839,8 @@
 	parseio->syntax_error_count++;
 }
 
-static struct pval *npval(pvaltype type,int first_line, int last_line, int first_column, int last_column)
+static struct pval *npval(pvaltype type, int first_line, int last_line,
+	int first_column, int last_column)
 {
 	extern char *my_file;
 	pval *z = (pval *)calloc(sizeof(struct pval),1);