[Asterisk-cvs] asterisk ast_expr.y,1.5,1.6

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv25418

Modified Files:
	ast_expr.y 
Log Message:
More expression fixes (bug #1548 again)


Index: ast_expr.y
===================================================================
RCS file: /usr/cvsroot/asterisk/ast_expr.y,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ast_expr.y	4 May 2004 01:45:00 -0000	1.5
+++ ast_expr.y	4 May 2004 03:23:35 -0000	1.6
@@ -341,9 +341,18 @@
 	}
 	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;