Added mechanism to warn correctly about conflicts

diff --git a/mach/6500/as/Makefile b/mach/6500/as/Makefile
index 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 3a5e6b7..b07613e 100644 (file)
--- 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 (file)
index 0000000..f17a15b
--- /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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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 836fa73..88bbdd3 100644 (file)
--- 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