Browse Source

Added mechanism to warn correctly about conflicts

ceriel 34 years ago
parent
commit
2592095655

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 0
mach/m68020/as/.distr

@@ -5,3 +5,4 @@ mach2.c
 mach3.c
 mach4.c
 mach5.c
+Expect

+ 1 - 0
mach/m68020/as/Expect

@@ -0,0 +1 @@
+expect 6 shift/reduce, 2 reduce/reduce conflicts

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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