Added mechanism to warn correctly about conflicts
This commit is contained in:
		
							parent
							
								
									0939a12a70
								
							
						
					
					
						commit
						89b736ba83
					
				
					 19 changed files with 19 additions and 17 deletions
				
			
		|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -5,3 +5,4 @@ mach2.c | |||
| mach3.c | ||||
| mach4.c | ||||
| mach5.c | ||||
| Expect | ||||
|  |  | |||
							
								
								
									
										1
									
								
								mach/m68020/as/Expect
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								mach/m68020/as/Expect
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | |||
| expect 6 shift/reduce, 2 reduce/reduce conflicts | ||||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue