- fix miscalculation in column numbers when multiple tabs

  or empty lines are involved;
- change linku1() to return the head of the list (unused at the moment);
- ignore the source line number in runtests as they change with the
  source and cause mismatches in the comparison with the reference output.



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

1 files changed, 5 insertions, 2 deletions

diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c
index a238eb990..962c27854 100644
--- a/pbx/ael/ael.tab.c
+++ b/pbx/ael/ael.tab.c
@@ -185,7 +185,7 @@
 static pval *npval(pvaltype type, int first_line, int last_line,
 	int first_column, int last_column);
 
-static void linku1(pval *head, pval *tail);
+static pval * linku1(pval *head, pval *tail);
 
 void reset_parencount(yyscan_t yyscanner);
 void reset_semicount(yyscan_t yyscanner);
@@ -3521,14 +3521,17 @@ static struct pval *npval2(pvaltype type, YYLTYPE *first, YYLTYPE *last)
 }
 
 /* append second element to the list in the first one */
-static void linku1(pval *head, pval *tail)
+static pval * linku1(pval *head, pval *tail)
 {
+	if (!head)
+		return tail;
 	if (!head->next) {
 		head->next = tail;
 	} else {
 		head->u1_last->next = tail;
 	}
 	head->u1_last = tail;
+	return head;
 }