From: Mark Spencer <markster@digium.com>
Date: Tue, 4 May 2004 03:23:35 +0000 (+0000)
Subject: More expression fixes (bug #1548 again)
X-Git-Tag: 1.0.0-rc1~562
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf0659f7afc5049ec5eedb711da3862ba09ca1c2;p=thirdparty%2Fasterisk.git

More expression fixes (bug #1548 again)


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

diff --git a/ast_expr.y b/ast_expr.y
index 4f4bc2375e..17ac1e9f95 100755
--- a/ast_expr.y
+++ b/ast_expr.y
@@ -341,9 +341,18 @@ ast_yylex (YYSTYPE *lvalp, YYLTYPE *yylloc, struct parser_control *karoto)
 	}
 	else if( *t1 == 0 )
 	{
-		/* we are done. That was quick */
-		p = karoto->ptrptr;
-		yylloc->last_column = t1 - karoto->argv;
+		if( t1 != karoto->ptrptr )
+		{
+			/* this is the last token */
+			p = karoto->ptrptr;
+			karoto->ptrptr = t1;
+		}
+		else
+		{
+			/* we are done. That was quick */
+			p = karoto->ptrptr;
+			yylloc->last_column = t1 - karoto->argv;
+		}
 	}
 	if( *p == 0 )
 		p = 0;