Skip to content

Commit 05346c1

Browse files
committed
PL/pgSQL: rename gram.y to pl_gram.y
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.
1 parent c424d0d commit 05346c1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/pl/plpgsql/src/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -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
5858

5959
pl_gram.h: pl_gram.c ;
6060

61-
pl_gram.c: gram.y
61+
pl_gram.c: pl_gram.y
6262
ifdef BISON
6363
$(BISON) -d $(BISONFLAGS) -o $@ $<
6464
else

src/pl/plpgsql/src/gram.y renamed to src/pl/plpgsql/src/pl_gram.y

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
%{
22
/*-------------------------------------------------------------------------
33
*
4-
* gram.y - Parser for the PL/pgSQL procedural language
4+
* pl_gram.y - Parser for the PL/pgSQL procedural language
55
*
66
* Portions Copyright (c) 1996-2012, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
*
1010
* IDENTIFICATION
11-
* src/pl/plpgsql/src/gram.y
11+
* src/pl/plpgsql/src/pl_gram.y
1212
*
1313
*-------------------------------------------------------------------------
1414
*/

src/pl/plpgsql/src/pl_scanner.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ IdentifierLookup plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
4040
*
4141
* In certain contexts it is desirable to prefer recognizing an unreserved
4242
* 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().
4444
*
4545
* For the most part, the reserved keywords are those that start a PL/pgSQL
4646
* statement (and so would conflict with an assignment to a variable of the
@@ -55,7 +55,7 @@ IdentifierLookup plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
5555
* search is used to locate entries.
5656
*
5757
* 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.
5959
*/
6060

6161
static const ScanKeyword reserved_keywords[] = {

src/tools/msvc/Mkvcbuild.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ sub mkvcbuild
107107

108108
my $plpgsql =
109109
$solution->AddProject('plpgsql', 'dll', 'PLs', 'src\pl\plpgsql\src');
110-
$plpgsql->AddFiles('src\pl\plpgsql\src', 'gram.y');
110+
$plpgsql->AddFiles('src\pl\plpgsql\src', 'pl_gram.y');
111111
$plpgsql->AddReference($postgres);
112112

113113
if ($solution->{options}->{perl})

0 commit comments

Comments
 (0)