- 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, 2 insertions, 2 deletions

diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex
index 280960c14..0a063b8b7 100644
--- a/pbx/ael/ael.flex
+++ b/pbx/ael/ael.flex
@@ -213,9 +213,9 @@ switches	{ STORE_POS; return KW_SWITCHES;}
 eswitches	{ STORE_POS; return KW_ESWITCHES;}
 includes	{ STORE_POS; return KW_INCLUDES;}
 
-\n		{ my_lineno++; my_col = 0; }
+\n		{ my_lineno++; my_col = 1; }
 [ ]+		{ my_col += yyleng; }
-[\t]+		{ my_col += 8-(my_col%8); }
+[\t]+		{ my_col += (yyleng*8)-(my_col%8); }
 
 [-a-zA-Z0-9'"_/.\<\>\*\+!$#\[\]][-a-zA-Z0-9'"_/.!\*\+\<\>\{\}$#\[\]]*	{
 		STORE_POS;