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.
WIN32_DEV
Tom Lane 23 years ago
parent bd96dd1184
commit 9d00798720
  1. 10
      contrib/cube/Makefile
  2. 10
      contrib/seg/Makefile
  3. 10
      src/backend/parser/Makefile

@ -1,4 +1,4 @@
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.7 2002/11/01 22:52:33 tgl Exp $
# $Header: /cvsroot/pgsql/contrib/cube/Makefile,v 1.8 2003/01/31 20:58:00 tgl Exp $
subdir = contrib/cube
top_builddir = ../..
@ -17,11 +17,17 @@ cubeparse.o: cubescan.c
cubeparse.c: cubeparse.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.
cubeparse.h: cubeparse.y
ifdef YACC
$(YACC) -d $(YFLAGS) -p cube_yy $<
mv -f y.tab.c cubeparse.c
sed -e 's/"syntax error/"parse error/' < y.tab.c > cubeparse.c
mv -f y.tab.h cubeparse.h
rm -f y.tab.c
else
@$(missing) bison $< $@
endif

@ -1,4 +1,4 @@
# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.7 2002/11/01 22:52:33 tgl Exp $
# $Header: /cvsroot/pgsql/contrib/seg/Makefile,v 1.8 2003/01/31 20:58:00 tgl Exp $
subdir = contrib/seg
top_builddir = ../..
@ -16,11 +16,17 @@ segparse.o: segscan.c
segparse.c: segparse.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.
segparse.h: segparse.y
ifdef YACC
$(YACC) -d $(YFLAGS) -p seg_yy $<
mv -f y.tab.c segparse.c
sed -e 's/"syntax error/"parse error/' < y.tab.c > segparse.c
mv -f y.tab.h segparse.h
rm -f y.tab.c
else
@$(missing) bison $< $@
endif

@ -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.39 2003/01/31 20:58:00 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

Loading…
Cancel
Save