summaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
authorTom Lane2003-01-31 20:58:28 +0000
committerTom Lane2003-01-31 20:58:28 +0000
commitb52fe8dcc87595c2e3804499c1e91e7e399d174e (patch)
tree5ec92404f522ccae57b4848a59168e5cd16473ab /src/backend/parser
parentbb0c948bb0d1cd0d5749a6f212b96fa4041050b1 (diff)
Tweak bison build rules so that we get the same error messages from
bison 1.875 and later as we did from earlier bison releases. Eventually we will probably want to adopt the newer message spelling ... but not yet. Per recent discussion on pgpatches. Note: I didn't change the build rules for bootstrap, ecpg, or plpgsql grammars, since these do not affect regression test results.
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index c11098eac2a..d0dde65a6fe 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -2,7 +2,7 @@
#
# Makefile for parser
#
-# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.38 2002/11/01 22:52:33 tgl Exp $
+# $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.38.2.1 2003/01/31 20:58:28 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -38,11 +38,17 @@ gram.o: $(srcdir)/scan.c
$(srcdir)/gram.c: $(srcdir)/parse.h ;
+# The sed hack is so that we can get the same error messages with
+# bison 1.875 and later as we did with earlier bisons. Eventually,
+# I suppose, we should re-standardize on "syntax error" --- in which
+# case flip the sed translation, but don't remove it.
+
$(srcdir)/parse.h: gram.y
ifdef YACC
$(YACC) -d $(YFLAGS) $<
- mv -f y.tab.c $(srcdir)/gram.c
+ sed -e 's/"syntax error/"parse error/' < y.tab.c > $(srcdir)/gram.c
mv -f y.tab.h $(srcdir)/parse.h
+ rm -f y.tab.c
else
@$(missing) bison $< $@
endif