From 89b736ba83c395e4127d63c2df1e7d0cb7d23dfb Mon Sep 17 00:00:00 2001 From: ceriel Date: Fri, 19 Jan 1990 16:05:44 +0000 Subject: [PATCH] Added mechanism to warn correctly about conflicts --- mach/6500/as/Makefile | 2 +- mach/6800/as/Makefile | 2 +- mach/6805/as/Makefile | 2 +- mach/6809/as/Makefile | 2 +- mach/arm/as/Makefile | 2 +- mach/i386/as/Makefile | 2 +- mach/i80/as/Makefile | 2 +- mach/i86/as/Makefile | 2 +- mach/m68020/as/.distr | 1 + mach/m68020/as/Expect | 1 + mach/m68020/as/Makefile | 2 +- mach/m68k2/as/Makefile | 2 +- mach/ns/as/Makefile | 2 +- mach/pdp/as/Makefile | 2 +- mach/proto/as/Makefile | 2 +- mach/s2650/as/Makefile | 2 +- mach/vax4/as/Makefile | 2 +- mach/z80/as/Makefile | 2 +- mach/z8000/as/Makefile | 2 +- 19 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 mach/m68020/as/Expect diff --git a/mach/6500/as/Makefile b/mach/6500/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/6500/as/Makefile +++ b/mach/6500/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/6800/as/Makefile b/mach/6800/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/6800/as/Makefile +++ b/mach/6800/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/6805/as/Makefile b/mach/6805/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/6805/as/Makefile +++ b/mach/6805/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/6809/as/Makefile b/mach/6809/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/6809/as/Makefile +++ b/mach/6809/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/arm/as/Makefile b/mach/arm/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/arm/as/Makefile +++ b/mach/arm/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/i386/as/Makefile b/mach/i386/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/i386/as/Makefile +++ b/mach/i386/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/i80/as/Makefile b/mach/i80/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/i80/as/Makefile +++ b/mach/i80/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/i86/as/Makefile b/mach/i86/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/i86/as/Makefile +++ b/mach/i86/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/m68020/as/.distr b/mach/m68020/as/.distr index 3a5e6b717..b07613e61 100644 --- a/mach/m68020/as/.distr +++ b/mach/m68020/as/.distr @@ -5,3 +5,4 @@ mach2.c mach3.c mach4.c mach5.c +Expect diff --git a/mach/m68020/as/Expect b/mach/m68020/as/Expect new file mode 100644 index 000000000..f17a15bb5 --- /dev/null +++ b/mach/m68020/as/Expect @@ -0,0 +1 @@ +expect 6 shift/reduce, 2 reduce/reduce conflicts diff --git a/mach/m68020/as/Makefile b/mach/m68020/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/m68020/as/Makefile +++ b/mach/m68020/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/m68k2/as/Makefile b/mach/m68k2/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/m68k2/as/Makefile +++ b/mach/m68k2/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/ns/as/Makefile b/mach/ns/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/ns/as/Makefile +++ b/mach/ns/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/pdp/as/Makefile b/mach/pdp/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/pdp/as/Makefile +++ b/mach/pdp/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/proto/as/Makefile b/mach/proto/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/proto/as/Makefile +++ b/mach/proto/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/s2650/as/Makefile b/mach/s2650/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/s2650/as/Makefile +++ b/mach/s2650/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/vax4/as/Makefile b/mach/vax4/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/vax4/as/Makefile +++ b/mach/vax4/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/z80/as/Makefile b/mach/z80/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/z80/as/Makefile +++ b/mach/z80/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c diff --git a/mach/z8000/as/Makefile b/mach/z8000/as/Makefile index 836fa7358..88bbdd3d6 100644 --- a/mach/z8000/as/Makefile +++ b/mach/z8000/as/Makefile @@ -40,7 +40,7 @@ as: $(COBJ) as.o as.y: $(CDIR)/comm2.y $(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y - @echo "expect 1 shift/reduce conflict" + @if test -f Expect ; then cat Expect ; else echo "expect 1 shift/reduce conflict"; fi lint: $(CSRC) as.c lint $(INCL) $(CSRC) as.c