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/pl_comp.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.143 2009/11/09 00:26:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.144 2009/11/10 02:13:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1250,13 +1250,15 @@ plpgsql_parse_word(const char *word)
 	/* Do case conversion and word separation */
 	plpgsql_convert_ident(word, cp, 1);
 
+	/* No lookup if disabled */
+	if (plpgsql_LookupIdentifiers)
+	{
 		/*
 		 * Do a lookup in the current namespace stack
 		 */
 		nse = plpgsql_ns_lookup(plpgsql_ns_top(), false,
 								cp[0], NULL, NULL,
 								NULL);
-	pfree(cp[0]);
 
 		if (nse != NULL)
 		{
@@ -1265,11 +1267,16 @@ plpgsql_parse_word(const char *word)
 				case PLPGSQL_NSTYPE_VAR:
 				case PLPGSQL_NSTYPE_ROW:
 				case PLPGSQL_NSTYPE_REC:
-				plpgsql_yylval.datum = plpgsql_Datums[nse->itemno];
+					plpgsql_yylval.wdatum.datum = plpgsql_Datums[nse->itemno];
+					plpgsql_yylval.wdatum.ident = cp[0];
+					plpgsql_yylval.wdatum.quoted = (word[0] == '"');
+					plpgsql_yylval.wdatum.idents = NIL;
 					return T_DATUM;
 
 				default:
-				elog(ERROR, "unrecognized plpgsql itemtype: %d", nse->itemtype);
+					elog(ERROR, "unrecognized plpgsql itemtype: %d",
+						 nse->itemtype);
+			}
 		}
 	}
 
@@ -1277,6 +1284,8 @@ plpgsql_parse_word(const char *word)
 	 * Nothing found - up to now it's a word without any special meaning for
 	 * us.
 	 */
+	plpgsql_yylval.word.ident = cp[0];
+	plpgsql_yylval.word.quoted = (word[0] == '"');
 	return T_WORD;
 }
 
@@ -1291,39 +1300,42 @@ plpgsql_parse_dblword(const char *word)
 {
 	PLpgSQL_nsitem *ns;
 	char	   *cp[2];
+	List	   *idents;
 	int			nnames;
 
 	/* Do case conversion and word separation */
 	plpgsql_convert_ident(word, cp, 2);
 
+	idents = list_make2(makeString(cp[0]),
+						makeString(cp[1]));
+
+	/* No lookup if disabled */
+	if (plpgsql_LookupIdentifiers)
+	{
 		/*
 		 * Do a lookup in the current namespace stack
 		 */
 		ns = plpgsql_ns_lookup(plpgsql_ns_top(), false,
 							   cp[0], cp[1], NULL,
 							   &nnames);
-	if (ns == NULL)
+		if (ns != NULL)
 		{
-		pfree(cp[0]);
-		pfree(cp[1]);
-		return T_DBLWORD;
-	}
-
 			switch (ns->itemtype)
 			{
 				case PLPGSQL_NSTYPE_VAR:
 					/* Block-qualified reference to scalar variable. */
-			plpgsql_yylval.datum = plpgsql_Datums[ns->itemno];
+					plpgsql_yylval.wdatum.datum = plpgsql_Datums[ns->itemno];
-			pfree(cp[0]);
+					plpgsql_yylval.wdatum.ident = NULL;
-			pfree(cp[1]);
+					plpgsql_yylval.wdatum.quoted = false; /* not used */
+					plpgsql_yylval.wdatum.idents = idents;
 					return T_DATUM;
 
 				case PLPGSQL_NSTYPE_REC:
 					if (nnames == 1)
 					{
 						/*
-				 * First word is a record name, so second word must be a field
+						 * First word is a record name, so second word must be
-				 * in this record.
+						 * a field in this record.
 						 */
 						PLpgSQL_recfield *new;
 
@@ -1334,27 +1346,24 @@ plpgsql_parse_dblword(const char *word)
 
 						plpgsql_adddatum((PLpgSQL_datum *) new);
 
-				plpgsql_yylval.datum = (PLpgSQL_datum *) new;
+						plpgsql_yylval.wdatum.datum = (PLpgSQL_datum *) new;
-
-				pfree(cp[0]);
-				pfree(cp[1]);
-				return T_DATUM;
 					}
 					else
 					{
 						/* Block-qualified reference to record variable. */
-				plpgsql_yylval.datum = plpgsql_Datums[ns->itemno];
+						plpgsql_yylval.wdatum.datum = plpgsql_Datums[ns->itemno];
-				pfree(cp[0]);
-				pfree(cp[1]);
-				return T_DATUM;
 					}
+					plpgsql_yylval.wdatum.ident = NULL;
+					plpgsql_yylval.wdatum.quoted = false; /* not used */
+					plpgsql_yylval.wdatum.idents = idents;
+					return T_DATUM;
 
 				case PLPGSQL_NSTYPE_ROW:
 					if (nnames == 1)
 					{
 						/*
-				 * First word is a row name, so second word must be a field in
+						 * First word is a row name, so second word must be a
-				 * this row.
+						 * field in this row.
 						 */
 						PLpgSQL_row *row;
 						int			i;
@@ -1365,9 +1374,10 @@ plpgsql_parse_dblword(const char *word)
 							if (row->fieldnames[i] &&
 								strcmp(row->fieldnames[i], cp[1]) == 0)
 							{
-						plpgsql_yylval.datum = plpgsql_Datums[row->varnos[i]];
+								plpgsql_yylval.wdatum.datum = plpgsql_Datums[row->varnos[i]];
-						pfree(cp[0]);
+								plpgsql_yylval.wdatum.ident = NULL;
-						pfree(cp[1]);
+								plpgsql_yylval.wdatum.quoted = false; /* not used */
+								plpgsql_yylval.wdatum.idents = idents;
 								return T_DATUM;
 							}
 						}
@@ -1379,19 +1389,22 @@ plpgsql_parse_dblword(const char *word)
 					else
 					{
 						/* Block-qualified reference to row variable. */
-				plpgsql_yylval.datum = plpgsql_Datums[ns->itemno];
+						plpgsql_yylval.wdatum.datum = plpgsql_Datums[ns->itemno];
-				pfree(cp[0]);
+						plpgsql_yylval.wdatum.ident = NULL;
-				pfree(cp[1]);
+						plpgsql_yylval.wdatum.quoted = false; /* not used */
+						plpgsql_yylval.wdatum.idents = idents;
 						return T_DATUM;
 					}
 
 				default:
 					break;
 			}
+		}
+	}
 
-	pfree(cp[0]);
+	/* Nothing found */
-	pfree(cp[1]);
+	plpgsql_yylval.cword.idents = idents;
-	return T_DBLWORD;
+	return T_CWORD;
 }
 
 
@@ -1405,33 +1418,35 @@ plpgsql_parse_tripword(const char *word)
 {
 	PLpgSQL_nsitem *ns;
 	char	   *cp[3];
+	List	   *idents;
 	int			nnames;
 
 	/* Do case conversion and word separation */
 	plpgsql_convert_ident(word, cp, 3);
 
+	idents = list_make3(makeString(cp[0]),
+						makeString(cp[1]),
+						makeString(cp[2]));
+
+	/* No lookup if disabled */
+	if (plpgsql_LookupIdentifiers)
+	{
 		/*
 		 * Do a lookup in the current namespace stack. Must find a qualified
-	 * reference.
+		 * reference, else ignore.
 		 */
 		ns = plpgsql_ns_lookup(plpgsql_ns_top(), false,
 							   cp[0], cp[1], cp[2],
 							   &nnames);
-	if (ns == NULL || nnames != 2)
+		if (ns != NULL && nnames == 2)
 		{
-		pfree(cp[0]);
-		pfree(cp[1]);
-		pfree(cp[2]);
-		return T_TRIPWORD;
-	}
-
 			switch (ns->itemtype)
 			{
 				case PLPGSQL_NSTYPE_REC:
 				{
 					/*
-				 * words 1/2 are a record name, so third word must be a field
+					 * words 1/2 are a record name, so third word must be a
-				 * in this record.
+					 * field in this record.
 					 */
 					PLpgSQL_recfield *new;
 
@@ -1442,20 +1457,18 @@ plpgsql_parse_tripword(const char *word)
 
 					plpgsql_adddatum((PLpgSQL_datum *) new);
 
-				plpgsql_yylval.datum = (PLpgSQL_datum *) new;
+					plpgsql_yylval.wdatum.datum = (PLpgSQL_datum *) new;
-
+					plpgsql_yylval.wdatum.ident = NULL;
-				pfree(cp[0]);
+					plpgsql_yylval.wdatum.quoted = false; /* not used */
-				pfree(cp[1]);
+					plpgsql_yylval.wdatum.idents = idents;
-				pfree(cp[2]);
-
 					return T_DATUM;
 				}
 
 				case PLPGSQL_NSTYPE_ROW:
 				{
 					/*
-				 * words 1/2 are a row name, so third word must be a field in
+					 * words 1/2 are a row name, so third word must be a field
-				 * this row.
+					 * in this row.
 					 */
 					PLpgSQL_row *row;
 					int			i;
@@ -1466,12 +1479,10 @@ plpgsql_parse_tripword(const char *word)
 						if (row->fieldnames[i] &&
 							strcmp(row->fieldnames[i], cp[2]) == 0)
 						{
-						plpgsql_yylval.datum = plpgsql_Datums[row->varnos[i]];
+							plpgsql_yylval.wdatum.datum = plpgsql_Datums[row->varnos[i]];
-
+							plpgsql_yylval.wdatum.ident = NULL;
-						pfree(cp[0]);
+							plpgsql_yylval.wdatum.quoted = false; /* not used */
-						pfree(cp[1]);
+							plpgsql_yylval.wdatum.idents = idents;
-						pfree(cp[2]);
-
 							return T_DATUM;
 						}
 					}
@@ -1484,11 +1495,12 @@ plpgsql_parse_tripword(const char *word)
 				default:
 					break;
 			}
+		}
+	}
 
-	pfree(cp[0]);
+	/* Nothing found */
-	pfree(cp[1]);
+	plpgsql_yylval.cword.idents = idents;
-	pfree(cp[2]);
+	return T_CWORD;
-	return T_TRIPWORD;
 }
 
 
@@ -1500,26 +1512,21 @@ plpgsql_parse_tripword(const char *word)
  * ----------
  */
 PLpgSQL_type *
-plpgsql_parse_wordtype(const char *word)
+plpgsql_parse_wordtype(char *ident)
 {
 	PLpgSQL_type *dtype;
 	PLpgSQL_nsitem *nse;
 	HeapTuple	typeTup;
-	char	   *cp[1];
-
-	/* Do case conversion and word separation */
-	plpgsql_convert_ident(word, cp, 1);
 
 	/*
 	 * Do a lookup in the current namespace stack
 	 */
 	nse = plpgsql_ns_lookup(plpgsql_ns_top(), false,
-							cp[0], NULL, NULL,
+							ident, NULL, NULL,
 							NULL);
 
 	if (nse != NULL)
 	{
-		pfree(cp[0]);
 		switch (nse->itemtype)
 		{
 			case PLPGSQL_NSTYPE_VAR:
@@ -1536,7 +1543,7 @@ plpgsql_parse_wordtype(const char *word)
 	 * Word wasn't found in the namespace stack. Try to find a data type
 	 * with that name, but ignore shell types and complex types.
 	 */
-	typeTup = LookupTypeName(NULL, makeTypeName(cp[0]), NULL);
+	typeTup = LookupTypeName(NULL, makeTypeName(ident), NULL);
 	if (typeTup)
 	{
 		Form_pg_type typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
@@ -1545,14 +1552,12 @@ plpgsql_parse_wordtype(const char *word)
 			typeStruct->typrelid != InvalidOid)
 		{
 			ReleaseSysCache(typeTup);
-			pfree(cp[0]);
 			return NULL;
 		}
 
 		dtype = build_datatype(typeTup, -1);
 
 		ReleaseSysCache(typeTup);
-		pfree(cp[0]);
 		return dtype;
 	}
 
@@ -1560,42 +1565,42 @@ plpgsql_parse_wordtype(const char *word)
 	 * Nothing found - up to now it's a word without any special meaning for
 	 * us.
 	 */
-	pfree(cp[0]);
 	return NULL;
 }
 
 
 /* ----------
- * plpgsql_parse_dblwordtype		Same lookup for word.word%TYPE
+ * plpgsql_parse_cwordtype		Same lookup for compositeword%TYPE
  * ----------
  */
 PLpgSQL_type *
-plpgsql_parse_dblwordtype(const char *word)
+plpgsql_parse_cwordtype(List *idents)
 {
 	PLpgSQL_type *dtype = NULL;
 	PLpgSQL_nsitem *nse;
+	const char *fldname;
 	Oid			classOid;
 	HeapTuple	classtup = NULL;
 	HeapTuple	attrtup = NULL;
 	HeapTuple	typetup = NULL;
 	Form_pg_class classStruct;
 	Form_pg_attribute attrStruct;
-	char	   *cp[2];
 	MemoryContext oldCxt;
 
 	/* Avoid memory leaks in the long-term function context */
 	oldCxt = MemoryContextSwitchTo(compile_tmp_cxt);
 
-	/* Do case conversion and word separation */
+	if (list_length(idents) == 2)
-	plpgsql_convert_ident(word, cp, 2);
+	{
-
 		/*
 		 * Do a lookup in the current namespace stack.
-	 * We don't need to check number of names matched, because we will only
+		 * We don't need to check number of names matched, because we will
-	 * consider scalar variables.
+		 * only consider scalar variables.
 		 */
 		nse = plpgsql_ns_lookup(plpgsql_ns_top(), false,
-							cp[0], cp[1], NULL,
+								strVal(linitial(idents)),
+								strVal(lsecond(idents)),
+								NULL,
 								NULL);
 
 		if (nse != NULL && nse->itemtype == PLPGSQL_NSTYPE_VAR)
@@ -1607,88 +1612,25 @@ plpgsql_parse_dblwordtype(const char *word)
 		/*
 		 * First word could also be a table name
 		 */
-	classOid = RelnameGetRelid(cp[0]);
+		classOid = RelnameGetRelid(strVal(linitial(idents)));
 		if (!OidIsValid(classOid))
 			goto done;
-
+		fldname = strVal(lsecond(idents));
-	classtup = SearchSysCache(RELOID,
+	}
-							  ObjectIdGetDatum(classOid),
+	else if (list_length(idents) == 3)
-							  0, 0, 0);
+	{
-	if (!HeapTupleIsValid(classtup))
-		goto done;
-	classStruct = (Form_pg_class) GETSTRUCT(classtup);
-
-	/*
-	 * It must be a relation, sequence, view, or type
-	 */
-	if (classStruct->relkind != RELKIND_RELATION &&
-		classStruct->relkind != RELKIND_SEQUENCE &&
-		classStruct->relkind != RELKIND_VIEW &&
-		classStruct->relkind != RELKIND_COMPOSITE_TYPE)
-		goto done;
-
-	/*
-	 * Fetch the named table field and its type
-	 */
-	attrtup = SearchSysCacheAttName(classOid, cp[1]);
-	if (!HeapTupleIsValid(attrtup))
-		goto done;
-	attrStruct = (Form_pg_attribute) GETSTRUCT(attrtup);
-
-	typetup = SearchSysCache(TYPEOID,
-							 ObjectIdGetDatum(attrStruct->atttypid),
-							 0, 0, 0);
-	if (!HeapTupleIsValid(typetup))
-		elog(ERROR, "cache lookup failed for type %u", attrStruct->atttypid);
-
-	/*
-	 * Found that - build a compiler type struct in the caller's cxt and
-	 * return it
-	 */
-	MemoryContextSwitchTo(oldCxt);
-	dtype = build_datatype(typetup, attrStruct->atttypmod);
-	MemoryContextSwitchTo(compile_tmp_cxt);
-
-done:
-	if (HeapTupleIsValid(classtup))
-		ReleaseSysCache(classtup);
-	if (HeapTupleIsValid(attrtup))
-		ReleaseSysCache(attrtup);
-	if (HeapTupleIsValid(typetup))
-		ReleaseSysCache(typetup);
-
-	MemoryContextSwitchTo(oldCxt);
-	return dtype;
-}
-
-/* ----------
- * plpgsql_parse_tripwordtype		Same lookup for word.word.word%TYPE
- * ----------
- */
-PLpgSQL_type *
-plpgsql_parse_tripwordtype(const char *word)
-{
-	PLpgSQL_type *dtype = NULL;
-	Oid			classOid;
-	HeapTuple	classtup = NULL;
-	HeapTuple	attrtup = NULL;
-	HeapTuple	typetup = NULL;
-	Form_pg_class classStruct;
-	Form_pg_attribute attrStruct;
-	char	   *cp[3];
 		RangeVar   *relvar;
-	MemoryContext oldCxt;
 
-	/* Avoid memory leaks in the long-term function context */
+		relvar = makeRangeVar(strVal(linitial(idents)),
-	oldCxt = MemoryContextSwitchTo(compile_tmp_cxt);
+							  strVal(lsecond(idents)),
-
+							  -1);
-	/* Do case conversion and word separation */
-	plpgsql_convert_ident(word, cp, 3);
-
-	relvar = makeRangeVar(cp[0], cp[1], -1);
 		classOid = RangeVarGetRelid(relvar, true);
 		if (!OidIsValid(classOid))
 			goto done;
+		fldname = strVal(lthird(idents));
+	}
+	else
+		goto done;
 
 	classtup = SearchSysCache(RELOID,
 							  ObjectIdGetDatum(classOid),
@@ -1709,7 +1651,7 @@ plpgsql_parse_tripwordtype(const char *word)
 	/*
 	 * Fetch the named table field and its type
 	 */
-	attrtup = SearchSysCacheAttName(classOid, cp[2]);
+	attrtup = SearchSysCacheAttName(classOid, fldname);
 	if (!HeapTupleIsValid(attrtup))
 		goto done;
 	attrStruct = (Form_pg_attribute) GETSTRUCT(attrtup);
@@ -1746,64 +1688,54 @@ done:
  * ----------
  */
 PLpgSQL_type *
-plpgsql_parse_wordrowtype(const char *word)
+plpgsql_parse_wordrowtype(char *ident)
 {
-	PLpgSQL_type *dtype;
 	Oid			classOid;
-	char	   *cp[1];
-
-	/* Do case conversion and word separation */
-	plpgsql_convert_ident(word, cp, 1);
 
 	/* Lookup the relation */
-	classOid = RelnameGetRelid(cp[0]);
+	classOid = RelnameGetRelid(ident);
 	if (!OidIsValid(classOid))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_TABLE),
-				 errmsg("relation \"%s\" does not exist", cp[0])));
+				 errmsg("relation \"%s\" does not exist", ident)));
 
 	/* Build and return the row type struct */
-	dtype = plpgsql_build_datatype(get_rel_type_id(classOid), -1);
+	return plpgsql_build_datatype(get_rel_type_id(classOid), -1);
-
-	pfree(cp[0]);
-
-	return dtype;
 }
 
 /* ----------
- * plpgsql_parse_dblwordrowtype		Scanner found word.word%ROWTYPE.
+ * plpgsql_parse_cwordrowtype		Scanner found compositeword%ROWTYPE.
  *			So word must be a namespace qualified table name.
  * ----------
  */
 PLpgSQL_type *
-plpgsql_parse_dblwordrowtype(const char *word)
+plpgsql_parse_cwordrowtype(List *idents)
 {
-	PLpgSQL_type *dtype;
 	Oid			classOid;
-	char	   *cp[2];
 	RangeVar   *relvar;
 	MemoryContext oldCxt;
 
+	if (list_length(idents) != 2)
+		return NULL;
+
 	/* Avoid memory leaks in long-term function context */
 	oldCxt = MemoryContextSwitchTo(compile_tmp_cxt);
 
-	/* Do case conversion and word separation */
-	plpgsql_convert_ident(word, cp, 2);
-
 	/* Lookup the relation */
-	relvar = makeRangeVar(cp[0], cp[1], -1);
+	relvar = makeRangeVar(strVal(linitial(idents)),
+						  strVal(lsecond(idents)),
+						  -1);
 	classOid = RangeVarGetRelid(relvar, true);
 	if (!OidIsValid(classOid))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_TABLE),
-				 errmsg("relation \"%s.%s\" does not exist", cp[0], cp[1])));
+				 errmsg("relation \"%s.%s\" does not exist",
+						strVal(linitial(idents)), strVal(lsecond(idents)))));
 
 	MemoryContextSwitchTo(oldCxt);
 
 	/* Build and return the row type struct */
-	dtype = plpgsql_build_datatype(get_rel_type_id(classOid), -1);
+	return plpgsql_build_datatype(get_rel_type_id(classOid), -1);
-
-	return dtype;
 }
 
 /*

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_wordtype(char *ident);
-extern PLpgSQL_type *plpgsql_parse_dblwordtype(const char *word);
+extern PLpgSQL_type *plpgsql_parse_cwordtype(List *idents);
-extern PLpgSQL_type *plpgsql_parse_tripwordtype(const char *word);
+extern PLpgSQL_type *plpgsql_parse_wordrowtype(char *ident);
-extern PLpgSQL_type *plpgsql_parse_wordrowtype(const char *word);
+extern PLpgSQL_type *plpgsql_parse_cwordrowtype(List *idents);
-extern PLpgSQL_type *plpgsql_parse_dblwordrowtype(const char *word);
 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;		}