From 2dee828cacfe58f6babe2c86f95bf106c8060ca4 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 12 Nov 2009 00:13:00 +0000 Subject: Remove plpgsql's separate lexer (finally!), in favor of using the core lexer directly. This was a lot of trouble, but should be worth it in terms of not having to keep the plpgsql lexer in step with core anymore. In addition the handling of keywords is significantly better-structured, allowing us to de-reserve a number of words that plpgsql formerly treated as reserved. --- src/tools/msvc/pgflex.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/tools/msvc/pgflex.bat') diff --git a/src/tools/msvc/pgflex.bat b/src/tools/msvc/pgflex.bat index f7427117e3..00c6757231 100755 --- a/src/tools/msvc/pgflex.bat +++ b/src/tools/msvc/pgflex.bat @@ -1,5 +1,5 @@ @echo off -REM $PostgreSQL: pgsql/src/tools/msvc/pgflex.bat,v 1.5 2007/12/19 12:29:36 mha Exp $ +REM $PostgreSQL: pgsql/src/tools/msvc/pgflex.bat,v 1.6 2009/11/12 00:13:00 tgl Exp $ IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat @@ -13,7 +13,6 @@ if errorlevel 1 goto noflex if "%1" == "src\backend\parser\scan.l" call :generate %1 src\backend\parser\scan.c -CF if "%1" == "src\backend\bootstrap\bootscanner.l" call :generate %1 src\backend\bootstrap\bootscanner.c if "%1" == "src\backend\utils\misc\guc-file.l" call :generate %1 src\backend\utils\misc\guc-file.c -if "%1" == "src\pl\plpgsql\src\scan.l" call :generate %1 src\pl\plpgsql\src\pl_scan.c if "%1" == "src\interfaces\ecpg\preproc\pgc.l" call :generate %1 src\interfaces\ecpg\preproc\pgc.c if "%1" == "src\bin\psql\psqlscan.l" call :generate %1 src\bin\psql\psqlscan.c if "%1" == "contrib\cube\cubescan.l" call :generate %1 contrib\cube\cubescan.c -- cgit v1.2.1