Fix filtered_base_yylex() to save and restore base_yylval and base_yylloc

properly when doing a lookahead.  The lack of this was causing various
interesting misbehaviors when one tries to use "with" as a plain identifier.

diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index dd11c1d4cedea6d17223ccd6ca5503f6d71dd511..9d1a260588ea64e68206ba36b42fa33d475f326d 100644 (file)
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -28,8 +28,10 @@
 
 List      *parsetree;                  /* result of parsing is left here */
 
-static int     lookahead_token;        /* one-token lookahead */
-static bool have_lookahead;            /* lookahead_token set? */
+static bool have_lookahead;                    /* is lookahead info valid? */
+static int     lookahead_token;                /* one-token lookahead */
+static YYSTYPE lookahead_yylval;       /* yylval for lookahead token */
+static YYLTYPE lookahead_yylloc;       /* yylloc for lookahead token */
 
 
 /*
@@ -77,11 +79,16 @@ int
 filtered_base_yylex(void)
 {
        int                     cur_token;
+       int                     next_token;
+       YYSTYPE         cur_yylval;
+       YYLTYPE         cur_yylloc;
 
        /* Get next token --- we might already have it */
        if (have_lookahead)
        {
                cur_token = lookahead_token;
+               base_yylval = lookahead_yylval;
+               base_yylloc = lookahead_yylloc;
                have_lookahead = false;
        }
        else
@@ -102,8 +109,10 @@ filtered_base_yylex(void)
                         * (perhaps for SQL99 recursive queries), come back and simplify
                         * this code.
                         */
-                       lookahead_token = base_yylex();
-                       switch (lookahead_token)
+                       cur_yylval = base_yylval;
+                       cur_yylloc = base_yylloc;
+                       next_token = base_yylex();
+                       switch (next_token)
                        {
                                case CASCADED:
                                        cur_token = WITH_CASCADED;
@@ -115,7 +124,14 @@ filtered_base_yylex(void)
                                        cur_token = WITH_CHECK;
                                        break;
                                default:
+                                       /* save the lookahead token for next time */
+                                       lookahead_token = next_token;
+                                       lookahead_yylval = base_yylval;
+                                       lookahead_yylloc = base_yylloc;
                                        have_lookahead = true;
+                                       /* and back up the output info to cur_token */
+                                       base_yylval = cur_yylval;
+                                       base_yylloc = cur_yylloc;
                                        break;
                        }
                        break;