PL/pgSQL: rename gram.y to pl_gram.y

petere · petere · commit 05346c131a14 · 2012-10-04T22:40:33.000-04:00
This makes the naming inside plpgsql consistent and distinguishes the
file from the backend's gram.y file.  It will also allow easier
refactoring of the bison make rules later on.
diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile
@@ -58,7 +58,7 @@ pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o pl_scanner.o: plpgsql.h pl
 
 pl_gram.h: pl_gram.c ;
 
-pl_gram.c: gram.y
+pl_gram.c: pl_gram.y
 ifdef BISON
 	$(BISON) -d $(BISONFLAGS) -o $@ $<
 else
diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
@@ -1,14 +1,14 @@
 %{
 /*-------------------------------------------------------------------------
  *
- * gram.y				- Parser for the PL/pgSQL procedural language
+ * pl_gram.y			- Parser for the PL/pgSQL procedural language
  *
  * Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *	  src/pl/plpgsql/src/gram.y
+ *	  src/pl/plpgsql/src/pl_gram.y
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/pl/plpgsql/src/pl_scanner.c b/src/pl/plpgsql/src/pl_scanner.c
@@ -40,7 +40,7 @@ IdentifierLookup plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
  *
  * In certain contexts it is desirable to prefer recognizing an unreserved
  * keyword over recognizing a variable name.  Those cases are handled in
- * gram.y using tok_is_keyword().
+ * pl_gram.y using tok_is_keyword().
  *
  * For the most part, the reserved keywords are those that start a PL/pgSQL
  * statement (and so would conflict with an assignment to a variable of the
@@ -55,7 +55,7 @@ IdentifierLookup plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
  *		 search is used to locate entries.
  *
  * Be careful not to put the same word in both lists.  Also be sure that
- * gram.y's unreserved_keyword production agrees with the second list.
+ * pl_gram.y's unreserved_keyword production agrees with the second list.
  */
 
 static const ScanKeyword reserved_keywords[] = {
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -107,7 +107,7 @@ sub mkvcbuild
 
 	my $plpgsql =
 	  $solution->AddProject('plpgsql', 'dll', 'PLs', 'src\pl\plpgsql\src');
-	$plpgsql->AddFiles('src\pl\plpgsql\src', 'gram.y');
+	$plpgsql->AddFiles('src\pl\plpgsql\src', 'pl_gram.y');
 	$plpgsql->AddReference($postgres);
 
 	if ($solution->{options}->{perl})

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`%{`
`2`	`2`	`/*-------------------------------------------------------------------------`
`3`	`3`	`*`
`4`		`- * gram.y - Parser for the PL/pgSQL procedural language`
	`4`	`+ * pl_gram.y - Parser for the PL/pgSQL procedural language`
`5`	`5`	`*`
`6`	`6`	`* Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * src/pl/plpgsql/src/gram.y`
	`11`	`+ * src/pl/plpgsql/src/pl_gram.y`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ IdentifierLookup plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;`
`40`	`40`	`*`
`41`	`41`	`* In certain contexts it is desirable to prefer recognizing an unreserved`
`42`	`42`	`* keyword over recognizing a variable name. Those cases are handled in`
`43`		`- * gram.y using tok_is_keyword().`
	`43`	`+ * pl_gram.y using tok_is_keyword().`
`44`	`44`	`*`
`45`	`45`	`* For the most part, the reserved keywords are those that start a PL/pgSQL`
`46`	`46`	`* statement (and so would conflict with an assignment to a variable of the`
`@@ -55,7 +55,7 @@ IdentifierLookup plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;`
`55`	`55`	`* search is used to locate entries.`
`56`	`56`	`*`
`57`	`57`	`* Be careful not to put the same word in both lists. Also be sure that`
`58`		`- * gram.y's unreserved_keyword production agrees with the second list.`
	`58`	`+ * pl_gram.y's unreserved_keyword production agrees with the second list.`
`59`	`59`	`*/`
`60`	`60`
`61`	`61`	`static const ScanKeyword reserved_keywords[] = {`