mirror of
https://github.com/urbit/shrub.git
synced 2024-12-11 11:02:25 +03:00
Basic %bull support.
This commit is contained in:
parent
3855896562
commit
5d51ceff35
@ -664,7 +664,7 @@
|
|||||||
_mint_used(wir_r);
|
_mint_used(wir_r);
|
||||||
{
|
{
|
||||||
u2_noun sep = j2_mcy(Pt6, ut, seep)(wir_r, van, sut, c3__both, q_gen);
|
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 boc = j2_mby(Pt6, bull)(wir_r, bid, sut);
|
||||||
u2_noun ret = _mint_in(wir_r, van, boc, gol, r_gen);
|
u2_noun ret = _mint_in(wir_r, van, boc, gol, r_gen);
|
||||||
|
|
||||||
|
@ -593,8 +593,8 @@
|
|||||||
{
|
{
|
||||||
u2_noun sep = j2_mcy(Pt6, ut, seep)(wir_r, van, sut, c3__both, q_gen);
|
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 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 bid = u2_bc(wir_r, u2k(p_gen), sep);
|
||||||
u2_noun yub = u2_bt(wir_r, u2k(p_gen), u2k(q_gen), pox);
|
u2_noun yub = u2_bc(wir_r, u2k(p_gen), pox);
|
||||||
u2_noun boc = j2_mby(Pt6, bull)(wir_r, bid, sut);
|
u2_noun boc = j2_mby(Pt6, bull)(wir_r, bid, sut);
|
||||||
u2_noun nuf = j2_mby(Pt6, bull)(wir_r, yub, dox);
|
u2_noun nuf = j2_mby(Pt6, bull)(wir_r, yub, dox);
|
||||||
u2_noun ret = _mull_in(wir_r, van, boc, gol, nuf, r_gen);
|
u2_noun ret = _mull_in(wir_r, van, boc, gol, nuf, r_gen);
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
u2_bi_cell(wir_r, q_sut, &pq_sut, 0);
|
u2_bi_cell(wir_r, q_sut, &pq_sut, 0);
|
||||||
|
|
||||||
if ( c3__both == way ) {
|
if ( c3__both == way ) {
|
||||||
if ( u2_yes == c3__gold ) {
|
if ( c3__gold == pq_sut ) {
|
||||||
return u2_yes;
|
return u2_yes;
|
||||||
} else return u2_no;
|
} else return u2_no;
|
||||||
}
|
}
|
||||||
|
@ -344,7 +344,7 @@
|
|||||||
_play_used(wir_r);
|
_play_used(wir_r);
|
||||||
{
|
{
|
||||||
u2_noun sep = j2_mcy(Pt6, ut, seep)(wir_r, van, sut, c3__both, q_gen);
|
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 boc = j2_mby(Pt6, bull)(wir_r, bid, sut);
|
||||||
u2_noun ret = _play_x(wir_r, van, boc, r_gen);
|
u2_noun ret = _play_x(wir_r, van, boc, r_gen);
|
||||||
|
|
||||||
|
@ -322,13 +322,14 @@
|
|||||||
u2_noun hyp) // retain
|
u2_noun hyp) // retain
|
||||||
{
|
{
|
||||||
u2_noun zar = j2_mcy(Pt6, ut, seek)(wir_r, van, sut, way, hyp);
|
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);
|
u2_noun q_zar = u2t(zar);
|
||||||
|
|
||||||
if ( u2_yes != u2h(q_zar) ) {
|
if ( u2_yes != u2h(q_zar) ) {
|
||||||
return u2_cm_bail(c3__exit);
|
return u2_cm_bail(c3__exit);
|
||||||
}
|
}
|
||||||
else {
|
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);
|
u2_rz(wir_r, zar);
|
||||||
return ret;
|
return ret;
|
||||||
|
Loading…
Reference in New Issue
Block a user