d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added mechanism to warn correctly about conflicts

Browse source
This commit is contained in:
ceriel 1990-01-19 16:05:44 +00:00
parent 0939a12a70
commit 89b736ba83
19 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mach/6500/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/6800/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/6805/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/6809/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/arm/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/i386/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/i80/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/i86/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

1
mach/m68020/as/.distr
View file

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

1
mach/m68020/as/Expect Normal file
View file

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

2
mach/m68020/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/m68k2/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/ns/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/pdp/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/proto/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/s2650/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/vax4/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/z80/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c

2
mach/z8000/as/Makefile
View file

@ -40,7 +40,7 @@ as: $(COBJ) as.o
as.y: $(CDIR)/comm2.y as.y: $(CDIR)/comm2.y
$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.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: $(CSRC) as.c
lint $(INCL) $(CSRC) as.c lint $(INCL) $(CSRC) as.c