More expression fixes (bug #1548 again)

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

ast_expr.y

@@ -340,11 +340,20 @@ ast_yylex (YYSTYPE *lvalp, YYLTYPE *yylloc, struct parser_control *karoto)
 		yylloc->last_column = t2 - karoto->argv;
 	}
 	else if( *t1 == 0 )
+	{
+		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;