From baaa74dae177e054a304f79a33e327afec81d32e Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Sun, 10 Jan 2016 20:23:32 -0800 Subject: [PATCH] Tentatively applying forq. --- jets/f/ut_crop.c | 4 ++-- jets/f/ut_nest.c | 11 +++++++++++ jets/f/ut_peek.c | 2 +- jets/f/ut_play.c | 2 +- noun/manage.c | 4 ++-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/jets/f/ut_crop.c b/jets/f/ut_crop.c index 6f9eac34c..e0a95e68e 100644 --- a/jets/f/ut_crop.c +++ b/jets/f/ut_crop.c @@ -231,7 +231,7 @@ u3z(hin); return ret; } -#if 0 +#ifdef FROG case c3__frog: p_ref = u3t(ref); { return _crop_sint_frog(van, sut, p_ref, bix); @@ -240,7 +240,7 @@ case c3__frog: p_ref = u3t(ref); { u3_noun fag = u3qf_grof(p_ref); - u3_noun ret = _crop_sint(van, sut, p_ref, bix); + u3_noun ret = _crop_sint(van, sut, fag, bix); u3z(fag); return ret; diff --git a/jets/f/ut_nest.c b/jets/f/ut_nest.c index 221e64146..24824c896 100644 --- a/jets/f/ut_nest.c +++ b/jets/f/ut_nest.c @@ -448,6 +448,7 @@ } else return u3m_bail(c3__fail); } +#ifdef FROG case c3__frog: { p_ref = u3t(ref); @@ -460,6 +461,16 @@ } return c3y; } +#else + case c3__frog: p_ref = u3t(ref); + { + u3_noun fag = u3qf_grof(p_ref); + u3_noun ret = _nest_dext(van, sut, tel, fag, seg, reg, gil); + + u3z(fag); + return ret; + } +#endif case c3__hold: { if ( c3y == u3qdi_has(reg, ref) ) { return c3y; diff --git a/jets/f/ut_peek.c b/jets/f/ut_peek.c index 92af1a83b..2e5f045d2 100644 --- a/jets/f/ut_peek.c +++ b/jets/f/ut_peek.c @@ -122,7 +122,7 @@ u3_noun hed = _peek_in(van, p_sut, way, axe, gil); u3_noun tal = _peek_in(van, q_sut, way, axe, gil); - pro = u3qf_fork(hed, tal); + pro = u3qf_forq(hed, tal); u3z(hed); u3z(tal); diff --git a/jets/f/ut_play.c b/jets/f/ut_play.c index 08bad4ebb..fc16273cf 100644 --- a/jets/f/ut_play.c +++ b/jets/f/ut_play.c @@ -234,7 +234,7 @@ : _play_x(van, fex, q_gen); u3_noun doz = (wux == c3__void) ? c3__void : _play_x(van, wux, r_gen); - u3_noun ret = u3qf_fork(dez, doz); + u3_noun ret = u3qf_forq(dez, doz); u3z(dez); u3z(doz); u3z(fex); u3z(wux); diff --git a/noun/manage.c b/noun/manage.c index 6c2673e0d..dcf8842a7 100644 --- a/noun/manage.c +++ b/noun/manage.c @@ -604,9 +604,9 @@ u3m_bail(u3_noun how) } switch ( how ) { -#if 0 - case c3__meme: +#if 1 case c3__fail: + case c3__meme: #endif case c3__foul: case c3__oops: