From 5d51ceff359b44461e6f96d84b7ef00507883259 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 26 Dec 2013 15:58:55 -0500 Subject: [PATCH] Basic %bull support. --- gen191/6/ut_mint.c | 2 +- gen191/6/ut_mull.c | 4 ++-- gen191/6/ut_park.c | 2 +- gen191/6/ut_play.c | 2 +- gen191/6/ut_seek.c | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gen191/6/ut_mint.c b/gen191/6/ut_mint.c index 270517af1f..2f25baa211 100644 --- a/gen191/6/ut_mint.c +++ b/gen191/6/ut_mint.c @@ -664,7 +664,7 @@ _mint_used(wir_r); { u2_noun sep = j2_mcy(Pt6, ut, seep)(wir_r, van, sut, c3__both, q_gen); - u2_noun bid = u2_bt(wir_r, u2k(p_gen), u2k(q_gen), sep); + u2_noun bid = u2_bc(wir_r, u2k(p_gen), sep); u2_noun boc = j2_mby(Pt6, bull)(wir_r, bid, sut); u2_noun ret = _mint_in(wir_r, van, boc, gol, r_gen); diff --git a/gen191/6/ut_mull.c b/gen191/6/ut_mull.c index 34e4ac4137..be4f43eda1 100644 --- a/gen191/6/ut_mull.c +++ b/gen191/6/ut_mull.c @@ -593,8 +593,8 @@ { u2_noun sep = j2_mcy(Pt6, ut, seep)(wir_r, van, sut, c3__both, q_gen); u2_noun pox = j2_mcy(Pt6, ut, seep)(wir_r, van, dox, c3__both, q_gen); - u2_noun bid = u2_bt(wir_r, u2k(p_gen), u2k(q_gen), sep); - u2_noun yub = u2_bt(wir_r, u2k(p_gen), u2k(q_gen), pox); + u2_noun bid = u2_bc(wir_r, u2k(p_gen), sep); + u2_noun yub = u2_bc(wir_r, u2k(p_gen), pox); u2_noun boc = j2_mby(Pt6, bull)(wir_r, bid, sut); u2_noun nuf = j2_mby(Pt6, bull)(wir_r, yub, dox); u2_noun ret = _mull_in(wir_r, van, boc, gol, nuf, r_gen); diff --git a/gen191/6/ut_park.c b/gen191/6/ut_park.c index 8c8d089694..7f09bec678 100644 --- a/gen191/6/ut_park.c +++ b/gen191/6/ut_park.c @@ -28,7 +28,7 @@ u2_bi_cell(wir_r, q_sut, &pq_sut, 0); if ( c3__both == way ) { - if ( u2_yes == c3__gold ) { + if ( c3__gold == pq_sut ) { return u2_yes; } else return u2_no; } diff --git a/gen191/6/ut_play.c b/gen191/6/ut_play.c index 20faf980c1..f7900cbdb0 100644 --- a/gen191/6/ut_play.c +++ b/gen191/6/ut_play.c @@ -344,7 +344,7 @@ _play_used(wir_r); { u2_noun sep = j2_mcy(Pt6, ut, seep)(wir_r, van, sut, c3__both, q_gen); - u2_noun bid = u2_bt(wir_r, u2k(p_gen), u2k(q_gen), sep); + u2_noun bid = u2_bc(wir_r, u2k(p_gen), sep); u2_noun boc = j2_mby(Pt6, bull)(wir_r, bid, sut); u2_noun ret = _play_x(wir_r, van, boc, r_gen); diff --git a/gen191/6/ut_seek.c b/gen191/6/ut_seek.c index 60a5038408..5e20555874 100644 --- a/gen191/6/ut_seek.c +++ b/gen191/6/ut_seek.c @@ -322,13 +322,14 @@ u2_noun hyp) // retain { u2_noun zar = j2_mcy(Pt6, ut, seek)(wir_r, van, sut, way, hyp); + u2_noun p_zar = u2h(zar); u2_noun q_zar = u2t(zar); if ( u2_yes != u2h(q_zar) ) { return u2_cm_bail(c3__exit); } else { - u2_noun ret = u2_rx(wir_r, u2t(q_zar)); + u2_noun ret = u2_bc(wir_r, u2_rx(wir_r, p_zar), u2_rx(wir_r, u2t(q_zar))); u2_rz(wir_r, zar); return ret;