summaryrefslogtreecommitdiff
path: root/contrib/cube
diff options
context:
space:
mode:
authorTom Lane2003-01-31 20:58:00 +0000
committerTom Lane2003-01-31 20:58:00 +0000
commit9d007987207f6a08c312fdaf7a47eb477fd8f819 (patch)
treed40fd378a73cb298f3809fc790c7bd9f513c9f8d /contrib/cube
parentbd96dd118403c6e05486c1060745956ca2ee4466 (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 'contrib/cube')
-rw-r--r--contrib/cube/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index 0cdb317fda..5e396ac878 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/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