From 469cb65aca0307506886158be2fce9f4438f8361 Mon Sep 17 00:00:00 2001
From: Jan Wieck
Date: Tue, 11 Jun 2002 13:40:53 +0000
Subject: Katherine Ward wrote: > Changes to avoid collisions with WIN32 & MFC
 names... > 1.  Renamed: >       a.  PROC => PGPROC >       b.  GetUserName()
 => GetUserNameFromId() >       c.  GetCurrentTime() => GetCurrentDateTime() >
       d.  IGNORE => IGNORE_DTF in include/utils/datetime.h &
 utils/adt/datetim > > 2.  Added _P to some lex/yacc tokens: >       CONST,
 CHAR, DELETE, FLOAT, GROUP, IN, OUT

Jan
---
 src/backend/bootstrap/bootparse.y   | 6 +++---
 src/backend/bootstrap/bootscanner.l | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/backend/bootstrap')

diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index e6250d0c501..2bd68069c8f 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.46 2002/04/27 21:24:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.47 2002/06/11 13:40:50 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -93,7 +93,7 @@ int num_columns_read = 0;
 %type <ival>  boot_tuple boot_tuplelist
 %type <oidval> optoideq
 
-%token <ival> CONST ID
+%token <ival> CONST_P ID
 %token OPEN XCLOSE XCREATE INSERT_TUPLE
 %token STRING XDEFINE
 %token XDECLARE INDEX ON USING XBUILD INDICES UNIQUE
@@ -329,7 +329,7 @@ boot_tuple:
 		;
 
 boot_const :
-		  CONST { $$=yylval.ival; }
+		  CONST_P { $$=yylval.ival; }
 		;
 
 boot_ident :
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index b471dcc66e9..e0656a82a01 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.22 2002/04/27 21:24:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.23 2002/06/11 13:40:50 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -121,7 +121,7 @@ insert			{ return(INSERT_TUPLE); }
 (-)?{D}*"."{D}+({Exp})? |
 (-)?{D}+{Exp}			{
 							yylval.ival = EnterString((char*)yytext);
-							return(CONST);
+							return(CONST_P);
 						}
 
 .				{
-- 
cgit v1.2.3