More incremental refactoring in plpgsql: get rid of gram.y dependencies on

yytext.  This is a necessary change if we're going to have a lexer interface
layer that does lookahead, since yytext won't necessarily be in step with
what the grammar thinks is the current token.  yylval and yylloc should
be the only side-variables that we need to manage when doing lookahead.

src/pl/plpgsql/src/plpgsql.h

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.122 2009/11/09 00:26:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.123 2009/11/10 02:13:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -769,6 +769,27 @@ typedef struct
 } PLpgSQL_plugin;
 
 
+/* Struct types used during parsing */
+
+typedef struct
+{
+	char	   *ident;			/* palloc'd converted identifier */
+	bool		quoted;			/* Was it double-quoted? */
+} PLword;
+
+typedef struct
+{
+	List	   *idents;			/* composite identifiers (list of String) */
+} PLcword;
+
+typedef struct
+{
+	PLpgSQL_datum *datum;		/* referenced variable */
+	char	   *ident;			/* valid if simple name */
+	bool		quoted;
+	List	   *idents;			/* valid if composite name */
+} PLwdatum;
+
 /**********************************************************************
  * Global variable declarations
  **********************************************************************/
@@ -807,11 +828,10 @@ extern void plpgsql_parser_setup(struct ParseState *pstate,
 extern int	plpgsql_parse_word(const char *word);
 extern int	plpgsql_parse_dblword(const char *word);
 extern int	plpgsql_parse_tripword(const char *word);
-extern PLpgSQL_type *plpgsql_parse_wordtype(const char *word);
-extern PLpgSQL_type *plpgsql_parse_dblwordtype(const char *word);
-extern PLpgSQL_type *plpgsql_parse_tripwordtype(const char *word);
-extern PLpgSQL_type *plpgsql_parse_wordrowtype(const char *word);
-extern PLpgSQL_type *plpgsql_parse_dblwordrowtype(const char *word);
+extern PLpgSQL_type *plpgsql_parse_wordtype(char *ident);
+extern PLpgSQL_type *plpgsql_parse_cwordtype(List *idents);
+extern PLpgSQL_type *plpgsql_parse_wordrowtype(char *ident);
+extern PLpgSQL_type *plpgsql_parse_cwordrowtype(List *idents);
 extern PLpgSQL_type *plpgsql_build_datatype(Oid typeOid, int32 typmod);
 extern PLpgSQL_variable *plpgsql_build_variable(const char *refname, int lineno,
 					   PLpgSQL_type *dtype,

src/pl/plpgsql/src/scan.l

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.75 2009/11/09 00:26:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.76 2009/11/10 02:13:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -183,15 +183,11 @@ open			{ SET_YYLLOC(); return K_OPEN;			}
 or				{ SET_YYLLOC(); return K_OR;			}
 perform			{ SET_YYLLOC(); return K_PERFORM;		}
 raise			{ SET_YYLLOC(); return K_RAISE;			}
-result_oid		{ SET_YYLLOC(); return K_RESULT_OID;	}
 return			{ SET_YYLLOC(); return K_RETURN;		}
-reverse			{ SET_YYLLOC(); return K_REVERSE;		}
-row_count		{ SET_YYLLOC(); return K_ROW_COUNT;		}
 scroll			{ SET_YYLLOC(); return K_SCROLL;		}
 strict			{ SET_YYLLOC(); return K_STRICT;	    }
 then			{ SET_YYLLOC(); return K_THEN;			}
 to				{ SET_YYLLOC(); return K_TO;			}
-type			{ SET_YYLLOC(); return K_TYPE;			}
 using			{ SET_YYLLOC(); return K_USING;			}
 when			{ SET_YYLLOC(); return K_WHEN;			}
 while			{ SET_YYLLOC(); return K_WHILE;			}
@@ -206,27 +202,21 @@ dump			{ SET_YYLLOC(); return O_DUMP;			}
      */
 {identifier}					{
 	SET_YYLLOC();
-	if (!plpgsql_LookupIdentifiers) return T_WORD;
 	return plpgsql_parse_word(yytext); }
 {identifier}{space}*\.{space}*{identifier}	{
 	SET_YYLLOC();
-	if (!plpgsql_LookupIdentifiers) return T_DBLWORD;
 	return plpgsql_parse_dblword(yytext); }
 {identifier}{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}	{
 	SET_YYLLOC();
-	if (!plpgsql_LookupIdentifiers) return T_TRIPWORD;
 	return plpgsql_parse_tripword(yytext); }
 {param}							{
 	SET_YYLLOC();
-	if (!plpgsql_LookupIdentifiers) return T_WORD;
 	return plpgsql_parse_word(yytext); }
 {param}{space}*\.{space}*{identifier}	{
 	SET_YYLLOC();
-	if (!plpgsql_LookupIdentifiers) return T_DBLWORD;
 	return plpgsql_parse_dblword(yytext); }
 {param}{space}*\.{space}*{identifier}{space}*\.{space}*{identifier}	{
 	SET_YYLLOC();
-	if (!plpgsql_LookupIdentifiers) return T_TRIPWORD;
 	return plpgsql_parse_tripword(yytext); }
 
 {digit}+		{ SET_YYLLOC(); return T_NUMBER;		}