From: ceriel <none@none>
Date: Fri, 22 Apr 1988 14:02:43 +0000 (+0000)
Subject: corrected; sometimes lookahead would fail
X-Git-Tag: release-5-5~3352
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=b948e4b59d989362f3919c4acdbdb30fc66a471c;p=ack.git

corrected; sometimes lookahead would fail
---

diff --git a/mach/proto/cg/codegen.c b/mach/proto/cg/codegen.c
index 6ce9d164e..b9dfef4f6 100644
--- a/mach/proto/cg/codegen.c
+++ b/mach/proto/cg/codegen.c
@@ -171,7 +171,8 @@ if (Debug)
 				SAVEST;
 				mincost = costlimit-totalcost+1;
 				for(i=0;i<npos;i++) {
-					t=codegen(&coderules[pos[i]],ply,FALSE,mincost,0);
+					t=codegen(&coderules[pos[i]],ply,FALSE,
+						  costlimit<MAXINT?mincost:MAXINT,0);
 #ifndef NDEBUG
 if (Debug)
 	fprintf(stderr,"mincost %u,cost %u,pos %d\n",mincost,t,i);
@@ -343,7 +344,7 @@ if(Debug>1) { fprintf(stderr,"Next tuple %d,%d,%d,%d\n",
 if (Debug > 1) fprintf(stderr, "cost after coercions: %u\n", t); 
 #endif
 		if (t<mincost)
-			t += codegen(codep,ply,FALSE,mincost-t,0);
+			t += codegen(codep,ply,FALSE,mincost<MAXINT?mincost-t:MAXINT,0);
 		if (t<mincost) {
 			mincost = t;
 			besttup = tup;
@@ -522,7 +523,7 @@ if (Debug > 1) fprintf(stderr, "cost after coercions: %u\n", t);
 					erasereg(pos2[j]);
 				}
 				if (t<mincost)
-					t += codegen(codep,ply,FALSE,mincost-t,0);
+					t += codegen(codep,ply,FALSE,mincost<MAXINT?mincost-t:MAXINT,0);
 				if (t<mincost) {
 					mincost=t;
 					decision=pos2[j];
diff --git a/mach/proto/ncg/codegen.c b/mach/proto/ncg/codegen.c
index 7d6bef98d..86baa8b0b 100644
--- a/mach/proto/ncg/codegen.c
+++ b/mach/proto/ncg/codegen.c
@@ -196,7 +196,8 @@ if (Debug)
 				SAVEST;
 				mincost = costlimit-totalcost+1;
 				for(i=0;i<npos;i++) {
-					t=codegen(&coderules[pos[i]],ply,FALSE,mincost,0);
+					t=codegen(&coderules[pos[i]],ply,FALSE,
+					    costlimit<MAXINT?mincost:MAXINT,0);
 #ifndef NDEBUG
 if (Debug)
 	fprintf(stderr,"mincost %u,cost %u,pos %d\n",mincost,t,i);
@@ -405,7 +406,7 @@ if (Debug > 1) fprintf(stderr, "cost after coercions: %u\n", t);
 			if (Debug>2)
 				fprintf(stderr,"Continuing match after coercions\n");
 #endif
-			t += codegen(codep,ply,FALSE,mincost-t,0);
+			t += codegen(codep,ply,FALSE,mincost<MAXINT?mincost-t:MAXINT,0);
 		}
 		if ( t<mincost && tokpatlen<=stackheight ) {
 			mincost = t;
@@ -633,7 +634,7 @@ normalfailed:	if (stackpad!=tokpatlen) {
 					erasereg(pos2[j]);
 				}
 				if (t<mincost)
-					t += codegen(codep,ply,FALSE,mincost-t,0);
+					t += codegen(codep,ply,FALSE,mincost<MAXINT?mincost-t:MAXINT,0);
 				if (t<mincost) {
 					mincost=t;
 					decision=pos2[j];