Commit Diff

Commit:
2f9d900118318c1a820b170cc04ddf58ed1eee87
From:
rsc <devnull@localhost>
Date:
Message:
day one bug in sam regexp code
Actions:
Patch | Tree
commit - 63408c39a1d07b210540e33a5fec030296cc5f49
commit + 2f9d900118318c1a820b170cc04ddf58ed1eee87
blob - 8904e9cb472c39551596ccd773d97266d6215879
blob + 65944757d6def9f5fa2f82ee1054cb16aef8974c
--- src/cmd/acme/regx.c
+++ src/cmd/acme/regx.c
@@ -668,7 +668,7 @@ rxexecute(Text *t, Rune *r, uint startp, uint eof, Ran
 				/* evaluate right choice later */
 				if(++ntl >= NLIST)
 					goto Overflow;
-				addinst(tlp, inst->u.right, &tlp->se);
+				addinst(tl, inst->u.right, &tlp->se);
 				/* efficiency: advance and re-evaluate */
 				inst = inst->u1.left;
 				goto Switchstmt;
blob - d4c850507bb120cf2167bf9f81345107f55ce1f4
blob + 937fb4fe1d6a4d4fab8dfdfa6090be8fbf905c0c
--- src/cmd/sam/regexp.c
+++ src/cmd/sam/regexp.c
@@ -647,7 +647,7 @@ execute(File *f, Posn startp, Posn eof)
 				/* evaluate right choice later */
 				if(++ntl >= NLIST)
 					goto Overflow;
-				addinst(tlp, inst->right, &tlp->se);
+				addinst(tl, inst->right, &tlp->se);
 				/* efficiency: advance and re-evaluate */
 				inst = inst->left;
 				goto Switchstmt;
blob - a00fbcbc9b8cbee2ce787863edcce9c14ebea349
blob + c04182a1aee0a8c97ce770af7b71b8879038d84a
--- src/libregexp/regexec.c
+++ src/libregexp/regexec.c
@@ -132,7 +132,7 @@ regexec1(Reprog *progp,	/* program to run */
 					break;
 				case OR:
 					/* evaluate right choice later */
-					if(_renewthread(tlp, inst->u1.right, ms, &tlp->se) == tle)
+					if(_renewthread(tl, inst->u1.right, ms, &tlp->se) == tle)
 						return -1;
 					/* efficiency: advance and re-evaluate */
 					continue;