More expression fixes (bug #1548 again)
authorMark Spencer <markster@digium.com>
Tue, 4 May 2004 03:23:35 +0000 (03:23 +0000)
committerMark Spencer <markster@digium.com>
Tue, 4 May 2004 03:23:35 +0000 (03:23 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2883 65c4cc65-6c06-0410-ace0-fbb531ad65f3

ast_expr.y

index 4f4bc23..17ac1e9 100755 (executable)
@@ -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;