From 658a77f88b970820f2d7d833fa1d1796d124d9f6 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Mon, 7 Jan 2019 23:34:38 -0500 Subject: [PATCH] Revert "adds staged jet headers and dashboard declarations, renames everything" This reverts commit cee1bfe59180e768ceb7fbb202ac123a955b812f. --- include/jets/k.h | 5 - include/jets/q.h | 72 --------------- include/jets/w.h | 42 --------- include/noun/retrieve.h | 2 - jets/stage/c/gor.c | 10 +- jets/stage/c/hor.c | 46 --------- jets/stage/c/vor.c | 10 +- jets/stage/d/by_bif.c | 12 +-- jets/stage/d/by_del.c | 14 +-- jets/stage/d/by_dif.c | 16 ++-- jets/stage/d/by_gas.c | 14 +-- jets/stage/d/by_get.c | 20 ++-- jets/stage/d/by_has.c | 16 ++-- jets/stage/d/by_jab.c | 12 +-- jets/stage/d/by_put.c | 20 ++-- jets/stage/d/in_bif.c | 10 +- jets/stage/d/in_del.c | 14 +-- jets/stage/d/in_dif.c | 16 ++-- jets/stage/d/in_gas.c | 14 +-- jets/stage/d/in_has.c | 16 ++-- jets/stage/d/in_mer.c | 22 ++--- jets/stage/d/in_put.c | 20 ++-- jets/stage/d/in_uni.c | 16 ++-- jets/stage/f/fork.c | 18 ++-- jets/stage/f/look.c | 14 +-- jets/stage/f/loot.c | 10 +- jets/stage/f/ut.c | 26 +++--- jets/stage/f/ut_buss.c | 12 +-- jets/stage/f/ut_conk.c | 12 +-- jets/stage/f/ut_crop.c | 26 +++--- jets/stage/f/ut_find.c | 74 +++++++-------- jets/stage/f/ut_fire.c | 28 +++--- jets/stage/f/ut_fish.c | 18 ++-- jets/stage/f/ut_fuse.c | 20 ++-- jets/stage/f/ut_gain.c | 4 +- jets/stage/f/ut_lose.c | 4 +- jets/stage/f/ut_mint.c | 88 +++++++++--------- jets/stage/f/ut_mull.c | 108 +++++++++++----------- jets/stage/f/ut_nest.c | 56 +++++------ jets/stage/f/ut_peek.c | 18 ++-- jets/stage/f/ut_peel.c | 6 +- jets/stage/f/ut_play.c | 48 +++++----- jets/stage/f/ut_repo.c | 10 +- jets/stage/f/ut_rest.c | 22 ++--- jets/stage/f/ut_tack.c | 4 +- jets/stage/f/ut_toss.c | 8 +- jets/stage/f/ut_wrap.c | 10 +- jets/tree.c | 200 +--------------------------------------- meson.build | 55 +---------- 49 files changed, 463 insertions(+), 875 deletions(-) delete mode 100644 jets/stage/c/hor.c diff --git a/include/jets/k.h b/include/jets/k.h index 9b1920353e..3eeb4d2273 100644 --- a/include/jets/k.h +++ b/include/jets/k.h @@ -105,9 +105,6 @@ u3_noun u3kdi_uni(u3_noun a, u3_noun b); - u3_weak u3kdi__stage_put(u3_noun a, u3_noun b); - u3_noun u3kdi__stage_uni(u3_noun a, u3_noun b); - # define u3kdb_tap(a) u3kdi_tap(a) /* u3ke: tier 5 functions @@ -132,8 +129,6 @@ u3_noun u3kf_fork(u3_noun yed); - u3_noun u3kf__stage_fork(u3_noun yed); - /* u3kz_fork(): build %fork span. */ u3_noun diff --git a/include/jets/q.h b/include/jets/q.h index 41ae130363..24475289a3 100644 --- a/include/jets/q.h +++ b/include/jets/q.h @@ -70,10 +70,6 @@ u3_noun u3qc_swp(u3_atom, u3_atom); u3_noun u3qc_sqt(u3_atom); - u3_noun u3qc__stage_gor(u3_atom, u3_atom); -# define u3qc__stage_hor u3qc__stage_gor - u3_noun u3qc__stage_vor(u3_atom, u3_atom); - /** Tier 4. **/ u3_noun u3qdb_bif(u3_noun, u3_noun); @@ -86,14 +82,6 @@ # define u3qdb_tap u3qdi_tap u3_noun u3qdb_uni(u3_noun, u3_noun); - u3_noun u3qdb__stage_bif(u3_noun, u3_noun); - u3_noun u3qdb__stage_dif(u3_noun, u3_noun); - u3_noun u3qdb__stage_gas(u3_noun, u3_noun); - u3_noun u3qdb__stage_get(u3_noun, u3_noun); - u3_noun u3qdb__stage_has(u3_noun, u3_noun); - u3_noun u3qdb__stage_put(u3_noun, u3_noun, u3_noun); -# define u3qdb__stage_tap u3qdi_tap - u3_noun u3qdi_bif(u3_noun, u3_noun); u3_noun u3qdi_dif(u3_noun, u3_noun); u3_noun u3qdi_gas(u3_noun, u3_noun); @@ -105,15 +93,6 @@ u3_noun u3qdi_uni(u3_noun, u3_noun); u3_noun u3qdi_wyt(u3_noun); - u3_noun u3qdi__stage_bif(u3_noun, u3_noun); - u3_noun u3qdi__stage_dif(u3_noun, u3_noun); - u3_noun u3qdi__stage_gas(u3_noun, u3_noun); - u3_noun u3qdi__stage_has(u3_noun, u3_noun); - u3_noun u3qdi__stage_mer(u3_noun, u3_noun); - u3_noun u3qdi__stage_put(u3_noun, u3_noun); -# define u3qdi__stage_tap u3qdi_tap - u3_noun u3qdi__stage_uni(u3_noun, u3_noun); - /** Tier 5. **/ u3_noun u3qe_cue(u3_atom); @@ -252,11 +231,6 @@ u3_noun u3qf_slot(u3_atom, u3_noun); u3_noun u3qf_type(u3_noun); - u3_noun u3qf__stage_fork(u3_noun); - u3_noun u3qf__stage_forq(u3_noun, u3_noun); - u3_noun u3qf__stage_look(u3_noun, u3_noun); - u3_noun u3qf__stage_loot(u3_noun, u3_noun); - u3_noun u3qfl_bunt(u3_noun, u3_noun); u3_noun u3qfl_whip(u3_noun, u3_noun, u3_noun); @@ -314,50 +288,4 @@ u3_noun u3qfu_toss(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); u3_noun u3qfu_wrap(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_burn(u3_noun, u3_noun); - u3_noun u3qfu__stage_busk(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_buss(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_bust(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_conk(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_crop(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_cull(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun); - u3_noun u3qfu__stage_duck(u3_noun, u3_noun); - u3_noun u3qfu__stage_dung(u3_noun, u3_noun cap, u3_noun); - u3_noun u3qfu__stage_dunq(u3_noun, const c3_c*, u3_noun); - void u3qfu__stage_dump(u3_noun, const c3_c*, u3_noun); - u3_noun u3qfu__stage_fond(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_find(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_finc(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_fink(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_fire(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_firm(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_fish(u3_noun, u3_noun, u3_atom); - u3_noun u3qfu__stage_fuse(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_gain(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_heal(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_lose(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_mint(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_mull(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_nest(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_nost(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_orth(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_peek(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_peel(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_play(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_repo(u3_noun, u3_noun); - u3_noun u3qfu__stage_rest(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_shep(u3_noun, const c3_c*, u3_noun, u3_noun); - u3_noun u3qfu__stage_shew(u3_noun, u3_noun); - u3_noun u3qfu__stage_sift(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_snub(u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_tack(u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_toss(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); - u3_noun u3qfu__stage_wrap(u3_noun, u3_noun, u3_noun); - -# define u3qfu__stage_van_fan 28 -# define u3qfu__stage_van_rib 58 -# define u3qfu__stage_van_vrf 59 -# define u3qfu__stage_van_vet 118 -# define u3qfu__stage_van_fab 119 - void u3qf_test(const c3_c*, u3_noun); diff --git a/include/jets/w.h b/include/jets/w.h index 60d77191f8..21d4d84d3b 100644 --- a/include/jets/w.h +++ b/include/jets/w.h @@ -71,10 +71,6 @@ u3_noun u3wc_swp(u3_noun); u3_noun u3wc_sqt(u3_noun); - u3_noun u3wc__stage_gor(u3_noun); -# define u3wc__stage_hor u3wc__stage_gor - u3_noun u3wc__stage_vor(u3_noun); - u3_noun u3wcp_ins(u3_noun); u3_noun u3wcp_ind(u3_noun); u3_noun u3wcp_tos(u3_noun); @@ -94,16 +90,6 @@ # define u3wdb_tap u3wdi_tap u3_noun u3wdb_uni(u3_noun); - u3_noun u3wdb__stage_bif(u3_noun); - u3_noun u3wdb__stage_del(u3_noun); - u3_noun u3wdb__stage_dif(u3_noun); - u3_noun u3wdb__stage_gas(u3_noun); - u3_noun u3wdb__stage_get(u3_noun); - u3_noun u3wdb__stage_has(u3_noun); - u3_noun u3wdb__stage_jab(u3_noun); - u3_noun u3wdb__stage_put(u3_noun); -# define u3wdb__stage_tap u3wdi_tap - u3_noun u3wdi_bif(u3_noun); u3_noun u3wdi_del(u3_noun); u3_noun u3wdi_dif(u3_noun); @@ -116,15 +102,6 @@ u3_noun u3wdi_uni(u3_noun); u3_noun u3wdi_wyt(u3_noun); - u3_noun u3wdi__stage_bif(u3_noun); - u3_noun u3wdi__stage_del(u3_noun); - u3_noun u3wdi__stage_dif(u3_noun); - u3_noun u3wdi__stage_gas(u3_noun); - u3_noun u3wdi__stage_has(u3_noun); - u3_noun u3wdi__stage_mer(u3_noun); - u3_noun u3wdi__stage_put(u3_noun); - u3_noun u3wdi__stage_uni(u3_noun); - /** Tier 5. **/ u3_noun u3we_cue(u3_noun); @@ -280,10 +257,6 @@ u3_noun u3wf_look(u3_noun); u3_noun u3wf_loot(u3_noun); - u3_noun u3wf__stage_fork(u3_noun); - u3_noun u3wf__stage_look(u3_noun); - u3_noun u3wf__stage_loot(u3_noun); - u3_noun u3wfl_bunt(u3_noun); u3_noun u3wfl_whip(u3_noun); @@ -318,18 +291,3 @@ u3_noun u3wfu_snub(u3_noun); u3_noun u3wfu_toss(u3_noun); u3_noun u3wfu_wrap(u3_noun); - - u3_noun u3wfu__stage_crop(u3_noun); - u3_noun u3wfu__stage_find(u3_noun); - u3_noun u3wfu__stage_fire(u3_noun); - u3_noun u3wfu__stage_fish(u3_noun); - u3_noun u3wfu__stage_fond(u3_noun); - u3_noun u3wfu__stage_fuse(u3_noun); - u3_noun u3wfu__stage_mint(u3_noun); - u3_noun u3wfu__stage_mull(u3_noun); - u3_noun u3wfu__stage_nest(u3_noun); - u3_noun u3wfu__stage_peek(u3_noun); - u3_noun u3wfu__stage_play(u3_noun); - u3_noun u3wfu__stage_rest(u3_noun); - u3_noun u3wfu__stage_toss(u3_noun); - u3_noun u3wfu__stage_wrap(u3_noun); diff --git a/include/noun/retrieve.h b/include/noun/retrieve.h index 0a7be687dd..3c63beb72e 100644 --- a/include/noun/retrieve.h +++ b/include/noun/retrieve.h @@ -32,8 +32,6 @@ c3_o u3r_mean(u3_noun a, ...); -#define u3r__stage_mug u3r_mug - /* u3r_mug(): ** ** Compute and/or recall the mug (31-bit hash) of (a). diff --git a/jets/stage/c/gor.c b/jets/stage/c/gor.c index 52bb000430..8e89b5e8cb 100644 --- a/jets/stage/c/gor.c +++ b/jets/stage/c/gor.c @@ -7,11 +7,11 @@ /* functions */ u3_noun - u3qc__stage_gor(u3_noun a, + u3qc_gor(u3_noun a, u3_noun b) { - c3_w c_w = u3r__stage_mug(a); - c3_w d_w = u3r__stage_mug(b); + c3_w c_w = u3r_mug(a); + c3_w d_w = u3r_mug(b); if ( c_w == d_w ) { return u3qc_dor(a, b); @@ -19,14 +19,14 @@ else return (c_w < d_w) ? c3y : c3n; } u3_noun - u3wc__stage_gor(u3_noun cor) + u3wc_gor(u3_noun cor) { u3_noun a, b; if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) ) { return u3m_bail(c3__exit); } else { - return u3qc__stage_gor(a, b); + return u3qc_gor(a, b); } } diff --git a/jets/stage/c/hor.c b/jets/stage/c/hor.c deleted file mode 100644 index 8180f2b020..0000000000 --- a/jets/stage/c/hor.c +++ /dev/null @@ -1,46 +0,0 @@ -/* j/3/hor.c -** -*/ -#include "all.h" - - -/* functions -*/ - u3_noun - u3qc__disabled__stage_hor(u3_noun a, - u3_noun b) - { - if ( c3y == u3ud(a) ) { - if ( c3y == u3ud(b) ) { - return u3qc__stage_gor(a, b); - } else { - return c3y; - } - } else { - if ( c3y == u3ud(b) ) { - return c3n; - } - else { - u3_noun h_a = u3h(a); - u3_noun h_b = u3h(b); - - if ( c3y == u3r_sing(h_a, h_b) ) { - return u3qc__stage_gor(u3t(a), u3t(b)); - } else { - return u3qc__stage_gor(h_a, h_b); - } - } - } - } - u3_noun - u3wc__disabled__stage_hor(u3_noun cor) - { - u3_noun a, b; - - if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) ) { - return u3m_bail(c3__exit); - } else { - return u3qc__stage_hor(a, b); - } - } - diff --git a/jets/stage/c/vor.c b/jets/stage/c/vor.c index f388fcc48c..28364140b2 100644 --- a/jets/stage/c/vor.c +++ b/jets/stage/c/vor.c @@ -7,11 +7,11 @@ /* functions */ u3_noun - u3qc__stage_vor(u3_atom a, + u3qc_vor(u3_atom a, u3_atom b) { - c3_w c_w = u3r__stage_mug(u3r__stage_mug(a)); - c3_w d_w = u3r__stage_mug(u3r__stage_mug(b)); + c3_w c_w = u3r_mug(u3r_mug(a)); + c3_w d_w = u3r_mug(u3r_mug(b)); if ( c_w == d_w ) { return u3qc_dor(a, b); @@ -19,13 +19,13 @@ else return (c_w < d_w) ? c3y : c3n; } u3_noun - u3wc__stage_vor(u3_noun cor) + u3wc_vor(u3_noun cor) { u3_noun a, b; if ( (c3n == u3r_mean(cor, u3x_sam_2, &a, u3x_sam_3, &b, 0)) ) { return u3m_bail(c3__exit); } else { - return u3qc__stage_vor(a, b); + return u3qc_vor(a, b); } } diff --git a/jets/stage/d/by_bif.c b/jets/stage/d/by_bif.c index 057b14e68b..3e53ba6d63 100644 --- a/jets/stage/d/by_bif.c +++ b/jets/stage/d/by_bif.c @@ -1,4 +1,4 @@ -/* jets/d/yb_bif.c +/* jets/d/by_bif.c ** */ #include "all.h" @@ -29,7 +29,7 @@ u3_noun c, n_c, l_c, r_c; u3_noun d; - if ( c3y == u3qc__stage_gor(p_b, p_n_a) ) { + if ( c3y == u3qc_gor(p_b, p_n_a) ) { c = _b_bif_putroot(l_a, b); u3r_trel(c, &n_c, &l_c, &r_c); d = u3nt(u3k(n_c), @@ -54,17 +54,17 @@ /* functions */ - u3_noun u3wdb__stage_bif(u3_noun cor) + u3_noun u3wdb_bif(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdb__stage_bif(a, b); + return u3qdb_bif(a, b); } } - u3_noun u3qdb__stage_bif(u3_noun a, + u3_noun u3qdb_bif(u3_noun a, u3_noun b) { u3_noun c, n_c, l_c, r_c; @@ -78,5 +78,5 @@ } /* - u3_weak u3kdb__stage_bif(u3_noun a, u3_noun b); + u3_weak u3kdi_bif(u3_noun a, u3_noun b); */ diff --git a/jets/stage/d/by_del.c b/jets/stage/d/by_del.c index 612d2748c3..90e11b37cf 100644 --- a/jets/stage/d/by_del.c +++ b/jets/stage/d/by_del.c @@ -31,7 +31,7 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3qc__stage_vor(u3h(n_l_a), u3h(n_r_a)) ) { + if ( c3y == u3qc_vor(u3h(n_l_a), u3h(n_r_a)) ) { u3_noun new_right = u3nt(u3k(n_a), u3k(r_l_a), u3k(r_a)); @@ -61,7 +61,7 @@ } u3_noun - u3qdb__stage_del(u3_noun a, + u3qdb_del(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -76,15 +76,15 @@ return u3m_bail(c3__exit); } else if ( c3n == u3r_sing(pn_a, b) ) { - if ( c3y == u3qc__stage_gor(b, pn_a) ) { + if ( c3y == u3qc_gor(b, pn_a) ) { return u3nt(u3k(n_a), - u3qdb__stage_del(l_a, b), + u3qdb_del(l_a, b), u3k(r_a)); } else { return u3nt(u3k(n_a), u3k(l_a), - u3qdb__stage_del(r_a, b)); + u3qdb_del(r_a, b)); } } else { @@ -94,7 +94,7 @@ } u3_noun - u3wdb__stage_del(u3_noun cor) + u3wdb_del(u3_noun cor) { u3_noun a, b; @@ -103,7 +103,7 @@ return u3m_bail(c3__exit); } else { - u3_noun n = u3qdb__stage_del(a, b); + u3_noun n = u3qdb_del(a, b); return n; } } diff --git a/jets/stage/d/by_dif.c b/jets/stage/d/by_dif.c index dae1855695..7973a4f343 100644 --- a/jets/stage/d/by_dif.c +++ b/jets/stage/d/by_dif.c @@ -25,7 +25,7 @@ || c3n == u3r_cell(n_e, &p_n_e, &q_n_e) ) { return u3m_bail(c3__exit); } else { - if ( c3y == u3qc__stage_vor(p_n_d, p_n_e) ) { + if ( c3y == u3qc_vor(p_n_d, p_n_e) ) { return u3nt(u3k(n_d), u3k(l_d), _b_dif_join(u3k(r_d), u3k(e))); @@ -40,17 +40,17 @@ /* functions */ - u3_noun u3wdb__stage_dif(u3_noun cor) + u3_noun u3wdb_dif(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdb__stage_dif(a, b); + return u3qdb_dif(a, b); } } - u3_noun u3qdb__stage_dif(u3_noun a, + u3_noun u3qdb_dif(u3_noun a, u3_noun b) { if ( u3_nul == b ) { @@ -63,7 +63,7 @@ return u3m_bail(c3__exit); } else { - c = u3qdb__stage_bif(a, n_b); + c = u3qdb_bif(a, n_b); if ( c3n == u3r_cell(c, &l_c, &r_c) ) { return u3m_bail(c3__exit); @@ -71,8 +71,8 @@ u3_noun d; u3_noun e; - d = u3qdb__stage_dif(l_c, l_b); - e = u3qdb__stage_dif(r_c, r_b); + d = u3qdb_dif(l_c, l_b); + e = u3qdb_dif(r_c, r_b); u3z(c); return _b_dif_join(d, e); @@ -82,5 +82,5 @@ } /* - u3_weak u3kdb__stage_dif(u3_noun a, u3_noun b); + u3_weak u3kdb_dif(u3_noun a, u3_noun b); */ diff --git a/jets/stage/d/by_gas.c b/jets/stage/d/by_gas.c index dd39fc5ab0..caa7f5291d 100644 --- a/jets/stage/d/by_gas.c +++ b/jets/stage/d/by_gas.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdb__stage_gas(u3_noun a, + u3qdb_gas(u3_noun a, u3_noun b) { if ( u3_nul == b ) { @@ -27,10 +27,10 @@ u3_noun qi_b = u3t(i_b); u3_noun c; - if ( u3_none == (c = u3qdb__stage_put(a, pi_b, qi_b)) ) { + if ( u3_none == (c = u3qdb_put(a, pi_b, qi_b)) ) { return u3m_bail(c3__exit); } else { - u3_noun d = u3qdb__stage_gas(c, t_b); + u3_noun d = u3qdb_gas(c, t_b); u3z(c); return d; @@ -40,21 +40,21 @@ } } u3_noun - u3wdb__stage_gas(u3_noun cor) + u3wdb_gas(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdb__stage_gas(a, b); + return u3qdb_gas(a, b); } } u3_noun - u3kdb__stage_gas(u3_noun a, + u3kdb_gas(u3_noun a, u3_noun b) { - u3_weak c = u3qdb__stage_gas(a, b); + u3_weak c = u3qdb_gas(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/jets/stage/d/by_get.c b/jets/stage/d/by_get.c index ac105ff612..5885787642 100644 --- a/jets/stage/d/by_get.c +++ b/jets/stage/d/by_get.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdb__stage_get(u3_noun a, + u3qdb_get(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -27,30 +27,30 @@ return u3nc(u3_nul, u3k(qn_a)); } else { - if ( c3y == u3qc__stage_gor(b, pn_a) ) { - return u3qdb__stage_get(l_a, b); + if ( c3y == u3qc_gor(b, pn_a) ) { + return u3qdb_get(l_a, b); } - else return u3qdb__stage_get(r_a, b); + else return u3qdb_get(r_a, b); } } } } u3_noun - u3wdb__stage_get(u3_noun cor) + u3wdb_get(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdb__stage_get(a, b); + return u3qdb_get(a, b); } } u3_weak - u3kdb__stage_get(u3_noun a, + u3kdb_get(u3_noun a, u3_noun b) { - u3_noun c = u3qdb__stage_get(a, b); + u3_noun c = u3qdb_get(a, b); u3z(a); u3z(b); if ( c3n == u3r_du(c) ) { @@ -64,10 +64,10 @@ } } u3_noun - u3kdb__stage_got(u3_noun a, + u3kdb_got(u3_noun a, u3_noun b) { - u3_weak c = u3kdb__stage_get(a, b); + u3_weak c = u3kdb_get(a, b); if ( u3_none == c ) { return u3m_bail(c3__exit); diff --git a/jets/stage/d/by_has.c b/jets/stage/d/by_has.c index 4a3c26bbf2..0fa41bf3e0 100644 --- a/jets/stage/d/by_has.c +++ b/jets/stage/d/by_has.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdb__stage_has(u3_noun a, + u3qdb_has(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -27,30 +27,30 @@ return c3y; } else { - if ( c3y == u3qc__stage_gor(b, pn_a) ) { - return u3qdb__stage_has(l_a, b); + if ( c3y == u3qc_gor(b, pn_a) ) { + return u3qdb_has(l_a, b); } - else return u3qdb__stage_has(r_a, b); + else return u3qdb_has(r_a, b); } } } } u3_noun - u3wdb__stage_has(u3_noun cor) + u3wdb_has(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdb__stage_has(a, b); + return u3qdb_has(a, b); } } u3_noun - u3kdb__stage_has(u3_noun a, + u3kdb_has(u3_noun a, u3_noun b) { - u3_weak c = u3qdb__stage_has(a, b); + u3_weak c = u3qdb_has(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/jets/stage/d/by_jab.c b/jets/stage/d/by_jab.c index 19f4607ad7..f147232a21 100644 --- a/jets/stage/d/by_jab.c +++ b/jets/stage/d/by_jab.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdb__stage_jab(u3_noun a, + u3qdb_jab(u3_noun a, u3_noun key, u3_noun fun) { @@ -29,11 +29,11 @@ return u3nc(u3nc(u3k(pn_a), value), u3k(u3t(a))); } else { - if ( c3y == u3qc__stage_gor(key, pn_a) ) { - return u3nt(u3k(n_a), u3qdb__stage_jab(l_a, key, fun), u3k(r_a)); + if ( c3y == u3qc_gor(key, pn_a) ) { + return u3nt(u3k(n_a), u3qdb_jab(l_a, key, fun), u3k(r_a)); } else { - return u3nt(u3k(n_a), u3k(l_a), u3qdb__stage_jab(r_a, key, fun)); + return u3nt(u3k(n_a), u3k(l_a), u3qdb_jab(r_a, key, fun)); } } } @@ -41,7 +41,7 @@ } u3_noun - u3wdb__stage_jab(u3_noun cor) + u3wdb_jab(u3_noun cor) { u3_noun a, key, fun; @@ -50,7 +50,7 @@ u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - u3_noun n = u3qdb__stage_jab(a, key, fun); + u3_noun n = u3qdb_jab(a, key, fun); return n; } } diff --git a/jets/stage/d/by_put.c b/jets/stage/d/by_put.c index dd81fea73c..5bafdc0c28 100644 --- a/jets/stage/d/by_put.c +++ b/jets/stage/d/by_put.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdb__stage_put(u3_noun a, + u3qdb_put(u3_noun a, u3_noun b, u3_noun c) { @@ -38,10 +38,10 @@ } } else { - if ( c3y == u3qc__stage_gor(b, pn_a) ) { - d = u3qdb__stage_put(l_a, b, c); + if ( c3y == u3qc_gor(b, pn_a) ) { + d = u3qdb_put(l_a, b, c); - if ( c3y == u3qc__stage_vor(pn_a, u3h(u3h(d))) ) { + if ( c3y == u3qc_vor(pn_a, u3h(u3h(d))) ) { return u3nt(u3k(n_a), d, u3k(r_a)); @@ -62,9 +62,9 @@ } } else { - d = u3qdb__stage_put(r_a, b, c); + d = u3qdb_put(r_a, b, c); - if ( c3y == u3qc__stage_vor(pn_a, u3h(u3h(d))) ) { + if ( c3y == u3qc_vor(pn_a, u3h(u3h(d))) ) { return u3nt(u3k(n_a), u3k(l_a), d); @@ -88,7 +88,7 @@ } } u3_noun - u3wdb__stage_put(u3_noun cor) + u3wdb_put(u3_noun cor) { u3_noun a, b, c; @@ -97,11 +97,11 @@ u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdb__stage_put(a, b, c); + return u3qdb_put(a, b, c); } } u3_weak - u3kdb__stage_put(u3_noun a, + u3kdb_put(u3_noun a, u3_noun b, u3_noun c) { @@ -109,7 +109,7 @@ // // (Mysterious comment in old glue code.) // - u3_noun pro = u3qdb__stage_put(a, b, c); + u3_noun pro = u3qdb_put(a, b, c); u3z(a); u3z(b); u3z(c); return pro; diff --git a/jets/stage/d/in_bif.c b/jets/stage/d/in_bif.c index 5fe6b10fd2..4c5bdbeb91 100644 --- a/jets/stage/d/in_bif.c +++ b/jets/stage/d/in_bif.c @@ -25,7 +25,7 @@ u3_noun c, n_c, l_c, r_c; u3_noun d; - if ( c3y == u3qc__stage_hor(b, n_a) ) { + if ( c3y == u3qc_hor(b, n_a) ) { c = _i_bif_putroot(l_a, b); u3r_trel(c, &n_c, &l_c, &r_c); d = u3nt(u3k(n_c), @@ -48,17 +48,17 @@ /* functions */ - u3_noun u3wdi__stage_bif(u3_noun cor) + u3_noun u3wdi_bif(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdi__stage_bif(a, b); + return u3qdi_bif(a, b); } } - u3_noun u3qdi__stage_bif(u3_noun a, + u3_noun u3qdi_bif(u3_noun a, u3_noun b) { u3_noun c, n_c, l_c, r_c; @@ -72,5 +72,5 @@ } /* - u3_weak u3kdi__stage_bif(u3_noun a, u3_noun b); + u3_weak u3kdi_bif(u3_noun a, u3_noun b); */ diff --git a/jets/stage/d/in_del.c b/jets/stage/d/in_del.c index 859bacaf55..02390ccce8 100644 --- a/jets/stage/d/in_del.c +++ b/jets/stage/d/in_del.c @@ -29,7 +29,7 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3qc__stage_vor(n_l_a, n_r_a) ) { + if ( c3y == u3qc_vor(n_l_a, n_r_a) ) { u3_noun new_right = u3nt(u3k(n_a), u3k(r_l_a), u3k(r_a)); @@ -59,7 +59,7 @@ } u3_noun - u3qdi__stage_del(u3_noun a, + u3qdi_del(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -72,15 +72,15 @@ return u3m_bail(c3__exit); } else if ( c3n == u3r_sing(n_a, b) ) { - if ( c3y == u3qc__stage_hor(b, n_a) ) { + if ( c3y == u3qc_hor(b, n_a) ) { return u3nt(u3k(n_a), - u3qdi__stage_del(l_a, b), + u3qdi_del(l_a, b), u3k(r_a)); } else { return u3nt(u3k(n_a), u3k(l_a), - u3qdi__stage_del(r_a, b)); + u3qdi_del(r_a, b)); } } else { @@ -90,7 +90,7 @@ } u3_noun - u3wdi__stage_del(u3_noun cor) + u3wdi_del(u3_noun cor) { u3_noun a, b; @@ -99,7 +99,7 @@ return u3m_bail(c3__exit); } else { - u3_noun n = u3qdi__stage_del(a, b); + u3_noun n = u3qdi_del(a, b); return n; } } diff --git a/jets/stage/d/in_dif.c b/jets/stage/d/in_dif.c index 84026a40fd..389cc1fa54 100644 --- a/jets/stage/d/in_dif.c +++ b/jets/stage/d/in_dif.c @@ -21,7 +21,7 @@ || c3n == u3r_trel(e, &n_e, &l_e, &r_e) ) { return u3m_bail(c3__exit); } else { - if ( c3y == u3qc__stage_vor(n_d, n_e) ) { + if ( c3y == u3qc_vor(n_d, n_e) ) { return u3nt(u3k(n_d), u3k(l_d), _i_dif_join(u3k(r_d), u3k(e))); @@ -36,17 +36,17 @@ /* functions */ - u3_noun u3wdi__stage_dif(u3_noun cor) + u3_noun u3wdi_dif(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdi__stage_dif(a, b); + return u3qdi_dif(a, b); } } - u3_noun u3qdi__stage_dif(u3_noun a, + u3_noun u3qdi_dif(u3_noun a, u3_noun b) { if ( u3_nul == b ) { @@ -59,7 +59,7 @@ return u3m_bail(c3__exit); } else { - c = u3qdi__stage_bif(a, n_b); + c = u3qdi_bif(a, n_b); if ( c3n == u3r_cell(c, &l_c, &r_c) ) { return u3m_bail(c3__exit); @@ -67,8 +67,8 @@ u3_noun d; u3_noun e; - d = u3qdi__stage_dif(l_c, l_b); - e = u3qdi__stage_dif(r_c, r_b); + d = u3qdi_dif(l_c, l_b); + e = u3qdi_dif(r_c, r_b); u3z(c); return _i_dif_join(d, e); @@ -78,5 +78,5 @@ } /* - u3_weak u3kdi__stage_dif(u3_noun a, u3_noun b); + u3_weak u3kdi_dif(u3_noun a, u3_noun b); */ diff --git a/jets/stage/d/in_gas.c b/jets/stage/d/in_gas.c index 60a1630e1a..f3f8d73721 100644 --- a/jets/stage/d/in_gas.c +++ b/jets/stage/d/in_gas.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdi__stage_gas(u3_noun a, + u3qdi_gas(u3_noun a, u3_noun b) { if ( u3_nul == b ) { @@ -21,10 +21,10 @@ u3_noun t_b = u3t(b); u3_noun c; - if ( u3_none == (c = u3qdi__stage_put(a, i_b)) ) { + if ( u3_none == (c = u3qdi_put(a, i_b)) ) { return u3m_bail(c3__exit); } else { - u3_noun d = u3qdi__stage_gas(c, t_b); + u3_noun d = u3qdi_gas(c, t_b); u3z(c); return d; @@ -33,21 +33,21 @@ } } u3_noun - u3wdi__stage_gas(u3_noun cor) + u3wdi_gas(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdi__stage_gas(a, b); + return u3qdi_gas(a, b); } } u3_noun - u3kdi__stage_gas(u3_noun a, + u3kdi_gas(u3_noun a, u3_noun b) { - u3_weak c = u3qdi__stage_gas(a, b); + u3_weak c = u3qdi_gas(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/jets/stage/d/in_has.c b/jets/stage/d/in_has.c index d0c59a7700..fb142bc748 100644 --- a/jets/stage/d/in_has.c +++ b/jets/stage/d/in_has.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdi__stage_has(u3_noun a, + u3qdi_has(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -24,30 +24,30 @@ return c3y; } else { - if ( c3y == u3qc__stage_hor(b, n_a) ) { - return u3qdi__stage_has(l_a, b); + if ( c3y == u3qc_hor(b, n_a) ) { + return u3qdi_has(l_a, b); } - else return u3qdi__stage_has(r_a, b); + else return u3qdi_has(r_a, b); } } } } u3_noun - u3wdi__stage_has(u3_noun cor) + u3wdi_has(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdi__stage_has(a, b); + return u3qdi_has(a, b); } } u3_noun - u3kdi__stage_has(u3_noun a, + u3kdi_has(u3_noun a, u3_noun b) { - u3_weak c = u3qdi__stage_has(a, b); + u3_weak c = u3qdi_has(a, b); u3z(a); u3z(b); if ( u3_none == c ) { diff --git a/jets/stage/d/in_mer.c b/jets/stage/d/in_mer.c index 957368721c..14fa6675f6 100644 --- a/jets/stage/d/in_mer.c +++ b/jets/stage/d/in_mer.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdi__stage_mer(u3_noun a, + u3qdi_mer(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -28,7 +28,7 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3qc__stage_vor(n_b, n_a) ) { + if ( c3y == u3qc_vor(n_b, n_a) ) { c = a; a = b; b = c; c = n_a; n_a = n_b; n_b = c; c = lr_a; lr_a = lr_b; lr_b = c; @@ -41,12 +41,12 @@ } else if ( c3y == u3r_sing(n_a, n_b) ) { return u3nt(u3k(n_a), - u3qdi__stage_mer(l_a, l_b), - u3qdi__stage_mer(r_a, r_b)); + u3qdi_mer(l_a, l_b), + u3qdi_mer(r_a, r_b)); } - else if ( c3y == u3qc__stage_hor(n_b, n_a) ) { - return u3qdi__stage_mer(u3nt(n_a, - u3qdi__stage_mer(l_a, + else if ( c3y == u3qc_hor(n_b, n_a) ) { + return u3qdi_mer(u3nt(n_a, + u3qdi_mer(l_a, u3nt(n_b, l_b, u3_nul)), @@ -54,9 +54,9 @@ r_b); } else { - return u3qdi__stage_mer(u3nt(n_a, + return u3qdi_mer(u3nt(n_a, l_a, - u3qdi__stage_mer(r_a, + u3qdi_mer(r_a, u3nt(n_b, u3_nul, r_b))), @@ -67,7 +67,7 @@ } u3_noun - u3wdi__stage_mer(u3_noun cor) + u3wdi_mer(u3_noun cor) { u3_noun a, b; @@ -75,6 +75,6 @@ return u3m_bail(c3__exit); } else { - return u3qdi__stage_mer(a, b); + return u3qdi_mer(a, b); } } diff --git a/jets/stage/d/in_put.c b/jets/stage/d/in_put.c index 973c3cf80b..10d2c43299 100644 --- a/jets/stage/d/in_put.c +++ b/jets/stage/d/in_put.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qdi__stage_put(u3_noun a, + u3qdi_put(u3_noun a, u3_noun b) { if ( u3_nul == a ) { @@ -27,10 +27,10 @@ return u3m_bail(c3__exit); } else { - if ( c3y == u3qc__stage_hor(b, n_a) ) { - c = u3qdi__stage_put(l_a, b); + if ( c3y == u3qc_hor(b, n_a) ) { + c = u3qdi_put(l_a, b); - if ( c3y == u3qc__stage_vor(n_a, u3h(c)) ) { + if ( c3y == u3qc_vor(n_a, u3h(c)) ) { return u3nt(u3k(n_a), c, u3k(r_a)); @@ -50,9 +50,9 @@ } } else { - c = u3qdi__stage_put(r_a, b); + c = u3qdi_put(r_a, b); - if ( c3y == u3qc__stage_vor(n_a, u3h(c)) ) { + if ( c3y == u3qc_vor(n_a, u3h(c)) ) { return u3nt(u3k(n_a), u3k(l_a), c); @@ -75,25 +75,25 @@ } } u3_noun - u3wdi__stage_put(u3_noun cor) + u3wdi_put(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdi__stage_put(a, b); + return u3qdi_put(a, b); } } u3_weak - u3kdi__stage_put(u3_noun a, + u3kdi_put(u3_noun a, u3_noun b) { // Bizarre asymmetry in old jets. // // (Mysterious comment in old glue code.) // - u3_noun pro = u3qdi__stage_put(a, b); + u3_noun pro = u3qdi_put(a, b); u3z(a); u3z(b); return pro; diff --git a/jets/stage/d/in_uni.c b/jets/stage/d/in_uni.c index b5c0c56624..85f07b8350 100644 --- a/jets/stage/d/in_uni.c +++ b/jets/stage/d/in_uni.c @@ -23,11 +23,11 @@ _in_uni(u3_noun a, u3_noun b) { return u3m_bail(c3__exit); } - else if ( c3n == u3qc__stage_vor(n_a, n_b) ) { + else if ( c3n == u3qc_vor(n_a, n_b) ) { if ( c3y == u3r_sing(n_a, n_b) ) { return u3nt(u3k(n_b), _in_uni(l_a, l_b), _in_uni(r_a, r_b)); } - else if ( c3y == u3qc__stage_hor(n_a, n_b) ) { + else if ( c3y == u3qc_hor(n_a, n_b) ) { naw = u3nt(u3k(n_a), u3k(l_a), u3_nul); sub = _in_uni(naw, l_b); neb = u3nt(u3k(n_b), sub, u3k(r_b)); @@ -47,7 +47,7 @@ _in_uni(u3_noun a, u3_noun b) else if ( c3y == u3r_sing(n_b, n_a) ) { return u3nt(u3k(n_b), _in_uni(l_a, l_b), _in_uni(r_a, r_b)); } - else if ( c3y == u3qc__stage_hor(n_b, n_a) ) { + else if ( c3y == u3qc_hor(n_b, n_a) ) { neb = u3nt(u3k(n_b), u3k(l_b), u3_nul); sub = _in_uni(l_a, neb); naw = u3nt(u3k(n_a), sub, u3k(r_a)); @@ -69,10 +69,10 @@ _in_uni(u3_noun a, u3_noun b) /* functions */ u3_noun - u3kdi__stage_uni(u3_noun a, + u3kdi_uni(u3_noun a, u3_noun b) { - u3_noun c = u3qdi__stage_uni(a, b); + u3_noun c = u3qdi_uni(a, b); u3z(a); u3z(b); @@ -80,7 +80,7 @@ _in_uni(u3_noun a, u3_noun b) } u3_noun - u3qdi__stage_uni(u3_noun a, + u3qdi_uni(u3_noun a, u3_noun b) { if ( c3y == u3r_sing(a, b) ) { @@ -91,14 +91,14 @@ _in_uni(u3_noun a, u3_noun b) } } u3_noun - u3wdi__stage_uni(u3_noun cor) + u3wdi_uni(u3_noun cor) { u3_noun a, b; if ( c3n == u3r_mean(cor, u3x_sam, &b, u3x_con_sam, &a, 0) ) { return u3m_bail(c3__exit); } else { - return u3qdi__stage_uni(a, b); + return u3qdi_uni(a, b); } } diff --git a/jets/stage/f/fork.c b/jets/stage/f/fork.c index 4b562eb3a9..37aaad2366 100644 --- a/jets/stage/f/fork.c +++ b/jets/stage/f/fork.c @@ -7,7 +7,7 @@ /* functions */ u3_noun - u3qf__stage_forq(u3_noun hoz, + u3qf_forq(u3_noun hoz, u3_noun bur) { if ( c3y == u3r_sing(hoz, bur) ) { @@ -19,11 +19,11 @@ else if ( c3__void == hoz ) { return u3k(bur); } - else return u3kf__stage_fork(u3nt(u3k(hoz), u3k(bur), u3_nul)); + else return u3kf_fork(u3nt(u3k(hoz), u3k(bur), u3_nul)); } u3_noun - u3qf__stage_fork(u3_noun yed) + u3qf_fork(u3_noun yed) { u3_noun lez = u3_nul; @@ -32,10 +32,10 @@ if ( c3__void != i_yed ) { if ( (c3y == u3du(i_yed)) && (c3__fork == u3h(i_yed)) ) { - lez = u3kdi__stage_uni(lez, u3k(u3t(i_yed))); + lez = u3kdi_uni(lez, u3k(u3t(i_yed))); } else { - lez = u3kdi__stage_put(lez, u3k(i_yed)); + lez = u3kdi_put(lez, u3k(i_yed)); } } @@ -57,21 +57,21 @@ } u3_noun - u3wf__stage_fork(u3_noun cor) + u3wf_fork(u3_noun cor) { u3_noun yed; if ( c3n == u3r_mean(cor, u3x_sam, &yed, 0) ) { return u3m_bail(c3__fail); } else { - return u3qf__stage_fork(yed); + return u3qf_fork(yed); } } u3_noun - u3kf__stage_fork(u3_noun yed) + u3kf_fork(u3_noun yed) { - u3_noun ret = u3qf__stage_fork(yed); + u3_noun ret = u3qf_fork(yed); u3z(yed); return ret; diff --git a/jets/stage/f/look.c b/jets/stage/f/look.c index 4ced245e1c..b03df87709 100644 --- a/jets/stage/f/look.c +++ b/jets/stage/f/look.c @@ -1,4 +1,4 @@ -/* j/6/lork.c +/* j/6/look.c ** */ #include "all.h" @@ -46,7 +46,7 @@ u3k(qn_dab)); } else { - if ( c3y == u3qc__stage_gor(cog, pn_dab) ) { + if ( c3y == u3qc_gor(cog, pn_dab) ) { return u3_nul; } else { @@ -67,7 +67,7 @@ u3k(qn_dab)); } else { - if ( c3y == u3qc__stage_gor(cog, pn_dab) ) { + if ( c3y == u3qc_gor(cog, pn_dab) ) { u3_noun pro; axe = u3qc_peg(axe, 3); @@ -88,7 +88,7 @@ u3k(qn_dab)); } else { - if ( c3y == u3qc__stage_gor(cog, pn_dab) ) { + if ( c3y == u3qc_gor(cog, pn_dab) ) { u3_noun pro; axe = u3qc_peg(axe, 6); @@ -116,19 +116,19 @@ /* functions */ u3_noun - u3qf__stage_look(u3_noun cog, + u3qf_look(u3_noun cog, u3_noun dab) { return _look_in(cog, dab, 1); } u3_noun - u3wf__stage_look(u3_noun cor) + u3wf_look(u3_noun cor) { u3_noun cog, dab; if ( c3n == u3r_mean(cor, u3x_sam_2, &cog, u3x_sam_3, &dab, 0) ) { return u3m_bail(c3__fail); } else { - return u3qf__stage_look(cog, dab); + return u3qf_look(cog, dab); } } diff --git a/jets/stage/f/loot.c b/jets/stage/f/loot.c index 72f9b9442a..06abf7542c 100644 --- a/jets/stage/f/loot.c +++ b/jets/stage/f/loot.c @@ -1,4 +1,4 @@ -/* j/6/lort.c +/* j/6/loot.c ** */ #include "all.h" @@ -23,7 +23,7 @@ } else { u3_noun qqn_dom = u3t(u3t(n_dom)); - u3_noun yep = u3qf__stage_look(cog, qqn_dom); + u3_noun yep = u3qf_look(cog, qqn_dom); if ( (u3_nul == l_dom) && (u3_nul == r_dom) ) { if ( u3_nul == yep ) { @@ -115,19 +115,19 @@ /* functions */ u3_noun - u3qf__stage_loot(u3_noun cog, + u3qf_loot(u3_noun cog, u3_noun dom) { return _loot_in(cog, dom, 1); } u3_noun - u3wf__stage_loot(u3_noun cor) + u3wf_loot(u3_noun cor) { u3_noun cog, dom; if ( c3n == u3r_mean(cor, u3x_sam_2, &cog, u3x_sam_3, &dom, 0) ) { return u3m_bail(c3__fail); } else { - return u3qf__stage_loot(cog, dom); + return u3qf_loot(cog, dom); } } diff --git a/jets/stage/f/ut.c b/jets/stage/f/ut.c index e8a68f998b..9fcf3ec1a3 100644 --- a/jets/stage/f/ut.c +++ b/jets/stage/f/ut.c @@ -10,11 +10,11 @@ // duck: create a duck core for mean. // u3_noun - u3qfu__stage_duck(u3_noun van, + u3qfu_duck(u3_noun van, u3_noun typ) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(typ), 0); - u3_noun ret = u3j_cook("u3qfu__stage_duck-dune", u3k(von), "dune"); + u3_noun ret = u3j_cook("u3qfu_duck-dune", u3k(von), "dune"); u3z(von); return ret; @@ -23,12 +23,12 @@ // dung: create a dunk core for mean (noun caption) // u3_noun - u3qfu__stage_dung(u3_noun van, + u3qfu_dung(u3_noun van, u3_noun paz, u3_noun typ) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(typ), 0); - u3_noun duq = u3j_cook("u3qfu__stage_dung-dunk", u3k(von), "dunk"); + u3_noun duq = u3j_cook("u3qfu_dung-dunk", u3k(von), "dunk"); u3_noun ret = u3i_molt(u3k(duq), u3x_sam, u3k(paz), 0); u3z(duq); @@ -39,12 +39,12 @@ // dunq: create a dunk core for mean // u3_noun - u3qfu__stage_dunq(u3_noun van, + u3qfu_dunq(u3_noun van, const c3_c* paz_c, u3_noun typ) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(typ), 0); - u3_noun duq = u3j_cook("u3qfu__stage_dunq-dunk", u3k(von), "dunk"); + u3_noun duq = u3j_cook("u3qfu_dunq-dunk", u3k(von), "dunk"); u3_noun paz = u3i_string(paz_c); u3_noun ret = u3i_molt(u3k(duq), u3x_sam, u3k(paz), 0); @@ -57,7 +57,7 @@ // dump: dump a type. // void - u3qfu__stage_dump(u3_noun van, + u3qfu_dump(u3_noun van, const c3_c* paz_c, u3_noun typ) { @@ -65,19 +65,19 @@ c3_c ugh_c[1024]; sprintf(ugh_c, "%s: %s: 0x%8x:", - paz_c, pfix_c, u3r__stage_mug(typ)); + paz_c, pfix_c, u3r_mug(typ)); #if 0 - u3_pier_tank(0, u3n_kick_on(u3qfu__stage_dunq(van, ugh_c, typ))); + u3_pier_tank(0, u3n_kick_on(u3qfu_dunq(van, ugh_c, typ))); #endif } // shew: create a show core for mean // u3_noun - u3qfu__stage_shew(u3_noun van, + u3qfu_shew(u3_noun van, u3_noun mol) { - u3_noun sho = u3j_cook("u3qfu__stage_shew-show", u3k(van), "show"); + u3_noun sho = u3j_cook("u3qfu_shew-show", u3k(van), "show"); u3_noun ret = u3i_molt(u3k(sho), u3x_sam, u3k(mol), 0); u3z(sho); @@ -88,12 +88,12 @@ // shep: show with caption and style // u3_noun - u3qfu__stage_shep(u3_noun van, + u3qfu_shep(u3_noun van, const c3_c* paz_c, u3_noun sty, u3_noun mol) { - return u3qfu__stage_shew(van, + return u3qfu_shew(van, u3nc(u3nc('c', u3i_string(paz_c)), u3nc(u3k(sty), mol))); } diff --git a/jets/stage/f/ut_buss.c b/jets/stage/f/ut_buss.c index bce8db03c8..144046d8af 100644 --- a/jets/stage/f/ut_buss.c +++ b/jets/stage/f/ut_buss.c @@ -13,7 +13,7 @@ u3_noun gen) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("_stage_cqfu_buss-buss", von, "buss"); + u3_noun gat = u3j_cook("_cqfu_buss-buss", von, "buss"); return u3n_kick_on(u3i_molt(gat, u3x_sam_2, @@ -29,7 +29,7 @@ u3_noun gen) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("_stage_cqfu_busk-busk", von, "busk"); + u3_noun gat = u3j_cook("_cqfu_busk-busk", von, "busk"); return u3n_kick_on(u3i_molt(gat, u3x_sam, @@ -40,7 +40,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_buss(u3_noun cor) + u3wfu_buss(u3_noun cor) { u3_noun sut, cog, gen, van; @@ -58,7 +58,7 @@ } u3_noun - u3qfu__stage_buss(u3_noun van, + u3qfu_buss(u3_noun van, u3_noun sut, u3_noun cog, u3_noun gen) @@ -68,7 +68,7 @@ u3_noun - u3wfu__stage_busk(u3_noun cor) + u3wfu_busk(u3_noun cor) { u3_noun sut, gen, van; @@ -84,7 +84,7 @@ } u3_noun - u3qfu__stage_busk(u3_noun van, + u3qfu_busk(u3_noun van, u3_noun sut, u3_noun gen) { diff --git a/jets/stage/f/ut_conk.c b/jets/stage/f/ut_conk.c index 569cf1ed48..d851143a12 100644 --- a/jets/stage/f/ut_conk.c +++ b/jets/stage/f/ut_conk.c @@ -32,19 +32,19 @@ return ret; } case 2: { - u3_noun vet = u3r_at(u3qfu__stage_van_vet, van); + u3_noun vet = u3r_at(u3qfu_van_vet, van); u3_noun hed, tal, deh, lat, ret; if ( c3y == vet ) { u3_noun cel = u3nt(c3__cell, c3__noun, c3__noun); - if ( c3n == u3qfu__stage_nest(van, cel, c3y, sut) ) { + if ( c3n == u3qfu_nest(van, cel, c3y, sut) ) { return u3m_bail(c3__fail); } u3z(cel); } - hed = u3qfu__stage_peek(van, sut, c3__both, 2); - tal = u3qfu__stage_peek(van, sut, c3__both, 3); + hed = u3qfu_peek(van, sut, c3__both, 2); + tal = u3qfu_peek(van, sut, c3__both, 3); deh = _cqfu_conk(van, hed, u3h(u3t(got))); lat = _cqfu_conk(van, tal, u3t(u3t(got))); @@ -63,7 +63,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_conk(u3_noun cor) + u3wfu_conk(u3_noun cor) { u3_noun sut, got, van; @@ -79,7 +79,7 @@ } u3_noun - u3qfu__stage_conk(u3_noun van, + u3qfu_conk(u3_noun van, u3_noun sut, u3_noun got) { diff --git a/jets/stage/f/ut_crop.c b/jets/stage/f/ut_crop.c index 7e6a31affe..c558737cc1 100644 --- a/jets/stage/f/ut_crop.c +++ b/jets/stage/f/ut_crop.c @@ -16,7 +16,7 @@ u3_noun ref, u3_noun bix) { - u3_noun rep = u3qfu__stage_repo(van, sut); + u3_noun rep = u3qfu_repo(van, sut); u3_noun ret = _crop_dext(van, rep, ref, bix); if ( c3y == u3r_sing(ret, rep) ) { @@ -122,7 +122,7 @@ else if ( c3__cell == u3h(ref) ) { u3x_cell(u3t(ref), &p_ref, &q_ref); - if ( c3y == u3qfu__stage_nest(van, p_ref, c3n, p_sut) ) + if ( c3y == u3qfu_nest(van, p_ref, c3n, p_sut) ) { u3_noun foz = _crop_dext(van, q_sut, q_ref, bix); u3_noun ret = u3qf_cell(p_sut, foz); @@ -160,8 +160,8 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun yed = u3qdi__stage_tap(p_sut); - u3_noun ret = u3kf__stage_fork(_crop_dext_fork(van, yed, ref, bix)); + u3_noun yed = u3qdi_tap(p_sut); + u3_noun ret = u3kf_fork(_crop_dext_fork(van, yed, ref, bix)); u3z(yed); return ret; @@ -170,10 +170,10 @@ { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( c3y == u3qdi__stage_has(bix, hud) ) { + if ( c3y == u3qdi_has(bix, hud) ) { # if 0 - u3_noun dun = u3qfu__stage_dunq(van, "type", sut); - u3_noun niz = u3qfu__stage_dunq(van, "over", ref); + u3_noun dun = u3qfu_dunq(van, "type", sut); + u3_noun niz = u3qfu_dunq(van, "over", ref); u3t_push(u3nc(c3__mean, dun)); u3t_push(u3nc(c3__mean, niz)); @@ -181,7 +181,7 @@ return u3m_error("crop-loop"); } else { - u3_noun bux = u3qdi__stage_put(bix, hud); + u3_noun bux = u3qdi_put(bix, hud); u3_noun ret = _crop_repo(van, sut, ref, bux); u3z(hud); @@ -211,7 +211,7 @@ } case c3__fork: p_ref = u3t(ref); { - u3_noun yed = u3qdi__stage_tap(p_ref); + u3_noun yed = u3qdi_tap(p_ref); u3_noun ret = _crop_sint_fork(van, sut, yed, bix); u3z(yed); @@ -219,7 +219,7 @@ } case c3__hold: { - u3_noun rep = u3qfu__stage_repo(van, ref); + u3_noun rep = u3qfu_repo(van, ref); u3_noun ret = _crop_dext(van, sut, rep, bix); u3z(rep); @@ -239,7 +239,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_crop(u3_noun cor) + u3wfu_crop(u3_noun cor) { u3_noun sut, ref, van; @@ -253,11 +253,11 @@ } u3_noun - u3qfu__stage_crop(u3_noun van, + u3qfu_crop(u3_noun van, u3_noun sut, u3_noun ref) { - c3_m fun_m = 200 + c3__crop + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__crop + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_2(fun_m, sut, ref); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_find.c b/jets/stage/f/ut_find.c index 7f85ad9f51..bde859ee90 100644 --- a/jets/stage/f/ut_find.c +++ b/jets/stage/f/ut_find.c @@ -13,14 +13,14 @@ u3_noun lon, u3_noun gil); -/* `u3qfu__stage_felt_arm` is a helper function for - * u3qfu__stage_felt. It handles the case in which the +/* `u3qfu_felt_arm` is a helper function for + * u3qfu_felt. It handles the case in which the * opal is for an arm, by creating a list of * parent core types. These will be converted to * a single `fork` type. */ static u3_noun - u3qfu__stage_felt_arm(u3_noun lis) + u3qfu_felt_arm(u3_noun lis) { if ( u3_nul == lis ) { return u3_nul; @@ -40,19 +40,19 @@ u3x_trel(q_typ, &pq_typ, &qq_typ, &rq_typ); u3_noun dox = u3nt(c3__core, u3k(qq_typ), u3k(q_typ)); - return u3nc(dox, u3qfu__stage_felt_arm(t_lis)); + return u3nc(dox, u3qfu_felt_arm(t_lis)); } } } -/* `u3qfu__stage_felt` takes an opal, lap, and converts +/* `u3qfu_felt` takes an opal, lap, and converts * it to a type. The opal comes from the last * limb of the wing processed by `+fond`. The * type is used in +fond as the subject type of * the next limb in the wing. */ static u3_noun - u3qfu__stage_felt(u3_noun lap) + u3qfu_felt(u3_noun lap) { u3_noun lim, mil; u3x_cell(lap, &lim, &mil); @@ -63,11 +63,11 @@ else if ( c3n == lim ) { u3_noun p_lap, q_lap, lis, hos; u3x_cell(mil, &p_lap, &q_lap); - lis = u3qdi__stage_tap(q_lap); - hos = u3qfu__stage_felt_arm(lis); + lis = u3qdi_tap(q_lap); + hos = u3qfu_felt_arm(lis); u3z(lis); - return u3kf__stage_fork(hos); + return u3kf_fork(hos); } else { u3m_bail(c3__exit); @@ -75,13 +75,13 @@ } static u3_noun - u3qfu__stage_fund(u3_noun van, + u3qfu_fund(u3_noun van, u3_noun sut, u3_noun way, u3_noun gen) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("u3qfu__stage_fund-fund", von, "fund"); + u3_noun gat = u3j_cook("u3qfu_fund-fund", von, "fund"); return u3n_kick_on(u3i_molt(gat, u3x_sam_2, @@ -92,12 +92,12 @@ } static u3_noun - u3qfu__stage_fine(u3_noun van, + u3qfu_fine(u3_noun van, u3_noun sut, u3_noun tor) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("u3qfu__stage_fine-fine", von, "fine"); + u3_noun gat = u3j_cook("u3qfu_fine-fine", von, "fine"); return u3n_kick_on(u3i_molt(gat, u3x_sam, @@ -220,7 +220,7 @@ return _find_buck_here(van, sut, way, p_heg, q_heg, axe, lon, gil); } else { - u3_noun zem = u3qf__stage_loot(u3t(q_heg), qrq_sut); + u3_noun zem = u3qf_loot(u3t(q_heg), qrq_sut); if ( (u3_nul != zem) && (0 != p_heg) ) { u3_noun ped; @@ -260,7 +260,7 @@ return pro; } else { - u3_noun pec = u3qfu__stage_peel(van, sut, way, rpq_sut); + u3_noun pec = u3qfu_peel(van, sut, way, rpq_sut); u3_noun pro; if ( c3n == u3h(pec) ) { @@ -273,7 +273,7 @@ u3z(exa); } else { - u3_noun sam = u3qfu__stage_peek(van, p_sut, way, 2); + u3_noun sam = u3qfu_peek(van, p_sut, way, 2); u3_noun exa = u3qc_peg(axe, 6); pro = _find_buck(van, sam, way, p_heg, q_heg, exa, lon, gil); @@ -326,7 +326,7 @@ return u3nt(c3n, c3n, u3nc( - u3kf__stage_fork(u3nt(u3k(ppp_hax), u3k(ppp_yor), u3_nul)), + u3kf_fork(u3nt(u3k(ppp_hax), u3k(ppp_yor), u3_nul)), u3k(qpp_hax))); } } @@ -357,7 +357,7 @@ return u3nt(c3y, u3k(pp_hax), - u3nc(c3y, u3kf__stage_fork + u3nc(c3y, u3kf_fork (u3nt(u3k(pqp_hax), u3k(pqp_yor), u3_nul)))); } } @@ -375,7 +375,7 @@ return u3nt(c3y, u3k(pp_hax), - u3nt(c3n, u3k(pqp_hax), u3qdi__stage_uni(qqp_hax, qqp_yor))); + u3nt(c3n, u3k(pqp_hax), u3qdi_uni(qqp_hax, qqp_yor))); } } } @@ -439,7 +439,7 @@ u3_noun gil) { u3_noun p_sut = u3t(sut); - u3_noun yed = u3qdi__stage_tap(p_sut); + u3_noun yed = u3qdi_tap(p_sut); u3_noun wiz; u3_noun ret; @@ -472,7 +472,7 @@ } else { u3_noun iqp_sut = u3h(qp_sut); // twig - u3_noun tiv = u3qfu__stage_mint // (pair type nock) + u3_noun tiv = u3qfu_mint // (pair type nock) (van, q_sut, c3__noun, iqp_sut); u3_noun tqp_sut = u3t(qp_sut); // (list twig) u3_noun p_tiv = u3h(tiv); // type @@ -507,7 +507,7 @@ } u3z(fid); - vat = u3qfu__stage_fine(van, sut, tor); + vat = u3qfu_fine(van, sut, tor); u3z(tor); ret = u3nt @@ -556,7 +556,7 @@ else { u3_noun pp_sut = u3h(p_sut); // (map term {wain (unit twig)}) u3_noun qp_sut = u3t(p_sut); // (list (pair type nock)) - u3_noun tyr = u3qdb__stage_get(pp_sut, uq_heg); // (unit (unit twig)) + u3_noun tyr = u3qdb_get(pp_sut, uq_heg); // (unit (unit twig)) if ( u3_nul == tyr ) { return _find_buck_face_next @@ -578,7 +578,7 @@ } else { u3_noun uu_tyr = u3t(u_tyr); - u3_noun tor = u3qfu__stage_fund(van, sut, way, uu_tyr); + u3_noun tor = u3qfu_fund(van, sut, way, uu_tyr); if ( c3y == u3h(tor) ) { u3_noun p_tor = u3t(tor); // (pair vein opal) @@ -659,7 +659,7 @@ } case c3__hint: { - u3_noun fop = u3qfu__stage_repo(van, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _find_buck(van, fop, way, p_heg, q_heg, axe, lon, gil); u3z(fop); return pro; @@ -677,12 +677,12 @@ case c3__hold: { // fprintf(stderr, "hold\r\n"); - if ( (c3y == u3qdi__stage_has(gil, sut)) ) { + if ( (c3y == u3qdi_has(gil, sut)) ) { return u3_nul; } else { - u3_noun zoc = u3qdi__stage_put(gil, sut); - u3_noun fop = u3qfu__stage_repo(van, sut); + u3_noun zoc = u3qdi_put(gil, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _find_buck(van, fop, way, p_heg, q_heg, axe, lon, zoc); u3z(fop); @@ -705,7 +705,7 @@ u3_noun qp_mor = u3t(p_mor); // opal { - u3_noun ref = u3qfu__stage_felt(qp_mor); + u3_noun ref = u3qfu_felt(qp_mor); u3_noun lon = u3k(pp_mor); u3_noun heg = (c3y == u3du(i_hyp)) ? u3k(i_hyp) @@ -723,7 +723,7 @@ ret = u3nt (c3y, u3nc(u3nc(u3_nul, u3k(p_heg)), u3k(lon)), - u3nc(c3y, u3qfu__stage_peek(van, ref, way, p_heg))); + u3nc(c3y, u3qfu_peek(van, ref, way, p_heg))); } else { u3_noun p_heg = u3h(u3t(heg)); // @ud @@ -765,7 +765,7 @@ u3_noun ppp_mor = u3h(pp_mor); // span u3_noun qpp_mor = u3t(pp_mor); // nock u3_noun gen = u3nt(c3__wing, u3k(i_hyp), u3_nul); - u3_noun fex = u3qfu__stage_mint(van, ppp_mor, c3__noun, gen); + u3_noun fex = u3qfu_mint(van, ppp_mor, c3__noun, gen); u3_noun ret = u3nt(c3n, c3n, u3nc(u3k(u3h(fex)), @@ -840,7 +840,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_find(u3_noun cor) + u3wfu_find(u3_noun cor) { u3_noun sut, way, hyp, van; @@ -857,12 +857,12 @@ } u3_noun - u3qfu__stage_find(u3_noun van, + u3qfu_find(u3_noun van, u3_noun sut, u3_noun way, u3_noun hyp) { - c3_m fun_m = 200 + c3__find + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__find + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_3(fun_m, sut, way, hyp); if ( u3_none != pro ) { @@ -878,7 +878,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_fond(u3_noun cor) + u3wfu_fond(u3_noun cor) { u3_noun sut, way, hyp, van; @@ -895,12 +895,12 @@ } u3_noun - u3qfu__stage_fond(u3_noun van, + u3qfu_fond(u3_noun van, u3_noun sut, u3_noun way, u3_noun hyp) { - c3_m fun_m = 200 + c3__fond + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__fond + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_3(fun_m, sut, way, hyp); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_fire.c b/jets/stage/f/ut_fire.c index 552d87f27c..873d4524be 100644 --- a/jets/stage/f/ut_fire.c +++ b/jets/stage/f/ut_fire.c @@ -10,7 +10,7 @@ _fire_vet(u3_noun van) { // u3_noun vet = u3j_hook(u3k(van), "vet"); - u3_noun vet = u3r_at(u3qfu__stage_van_vet, van); + u3_noun vet = u3r_at(u3qfu_van_vet, van); switch ( vet ) { case c3n: @@ -25,7 +25,7 @@ u3_noun dox, u3_noun gen) { - u3_noun rib = u3r_at(u3qfu__stage_van_rib, van); + u3_noun rib = u3r_at(u3qfu_van_rib, van); u3_noun key = u3nt(u3k(sut), u3k(dox), u3k(gen)); @@ -34,16 +34,16 @@ if ( c3n == _fire_vet(van) ) { ret = c3y; } - if ( c3y == u3qdi__stage_has(rib, key) ) { + if ( c3y == u3qdi_has(rib, key) ) { ret = c3y; } else { - u3_noun rob = u3qdi__stage_put(rib, key); + u3_noun rob = u3qdi_put(rib, key); u3_noun von = u3i_molt(u3k(van), - u3qfu__stage_van_rib, + u3qfu_van_rib, u3k(rob), 0); - u3_noun mul = u3qfu__stage_mull(von, sut, c3__noun, dox, gen); + u3_noun mul = u3qfu_mull(von, sut, c3__noun, dox, gen); ret = c3y; @@ -83,11 +83,11 @@ if ( (c3__ash == u3h(gat)) || (c3__dry == u3h(gat)) ) { if ( (c3y == vet) && - (c3n == u3qfu__stage_nest(van, qq_typ, c3y, p_typ)) ) + (c3n == u3qfu_nest(van, qq_typ, c3y, p_typ)) ) { #if 0 - u3_noun dun = u3qfu__stage_dunq(van, "need", qq_typ); - u3_noun niz = u3qfu__stage_dunq(van, "have", p_typ); + u3_noun dun = u3qfu_dunq(van, "need", qq_typ); + u3_noun niz = u3qfu_dunq(van, "have", p_typ); u3t_push(u3nc(c3__mean, niz)); u3t_push(u3nc(c3__mean, dun)); @@ -101,8 +101,8 @@ else { c3_assert(c3__wet == u3h(gat)); #if 0 - u3_noun dun = u3qfu__stage_dunq(van, "wild", typ); - u3_noun niz = u3qfu__stage_dunq(van, "tame", dox); + u3_noun dun = u3qfu_dunq(van, "wild", typ); + u3_noun niz = u3qfu_dunq(van, "tame", dox); u3t_push(u3nc(c3__mean, dun)); u3t_push(u3nc(c3__mean, niz)); @@ -151,7 +151,7 @@ u3_noun sut, u3_noun hag) { - u3_noun vet = u3r_at(u3qfu__stage_van_vet, van); + u3_noun vet = u3r_at(u3qfu_van_vet, van); c3_assert(!"not live"); { @@ -178,7 +178,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_fire(u3_noun cor) + u3wfu_fire(u3_noun cor) { u3_noun sut, hag, van; @@ -192,7 +192,7 @@ } u3_noun - u3qfu__stage_fire(u3_noun van, + u3qfu_fire(u3_noun van, u3_noun sut, u3_noun hag) { diff --git a/jets/stage/f/ut_fish.c b/jets/stage/f/ut_fish.c index bc218533ba..6454e20b59 100644 --- a/jets/stage/f/ut_fish.c +++ b/jets/stage/f/ut_fish.c @@ -102,7 +102,7 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun yed = u3qdi__stage_tap(p_sut); + u3_noun yed = u3qdi_tap(p_sut); u3_noun ret = _fish_fork(van, yed, axe, vit); u3z(yed); @@ -111,9 +111,9 @@ case c3__hold: { p_sut = u3t(sut); { - if ( (c3y == u3qdi__stage_has(vit, sut)) ) { - // u3_noun dun = u3qfu__stage_dunq(van, "type", sut); - u3_noun niz = u3qfu__stage_shep + if ( (c3y == u3qdi_has(vit, sut)) ) { + // u3_noun dun = u3qfu_dunq(van, "type", sut); + u3_noun niz = u3qfu_shep (van, "axis", 'd', u3k(axe)); // u3t_push(u3nc(c3__mean, dun)); @@ -121,8 +121,8 @@ return u3m_error("fish-loop"); } else { - u3_noun zoc = u3qdi__stage_put(vit, sut); - u3_noun fop = u3qfu__stage_repo(van, sut); + u3_noun zoc = u3qdi_put(vit, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _fish_in(van, fop, axe, zoc); u3z(fop); @@ -147,7 +147,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_fish(u3_noun cor) + u3wfu_fish(u3_noun cor) { u3_noun sut, axe, van; @@ -162,11 +162,11 @@ } u3_noun - u3qfu__stage_fish(u3_noun van, + u3qfu_fish(u3_noun van, u3_noun sut, u3_noun axe) { - c3_m fun_m = 200 + c3__fish + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__fish + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_2(fun_m, sut, axe); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_fuse.c b/jets/stage/f/ut_fuse.c index c65d8e531c..069d0ba14f 100644 --- a/jets/stage/f/ut_fuse.c +++ b/jets/stage/f/ut_fuse.c @@ -14,7 +14,7 @@ u3_noun ref, u3_noun bix) { - u3_noun rep = u3qfu__stage_repo(van, sut); + u3_noun rep = u3qfu_repo(van, sut); u3_noun ret = _fuse_in(van, rep, ref, bix); if ( c3y == u3r_sing(ret, rep) ) { @@ -142,8 +142,8 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun yed = u3qdi__stage_tap(p_sut); - u3_noun ret = u3kf__stage_fork(_fuse_in_fork(van, yed, ref, bix)); + u3_noun yed = u3qdi_tap(p_sut); + u3_noun ret = u3kf_fork(_fuse_in_fork(van, yed, ref, bix)); u3z(yed); return ret; @@ -152,16 +152,16 @@ { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( c3y == u3qdi__stage_has(bix, hud) ) { - // u3_noun dun = u3qfu__stage_dunq(van, "type", sut); - // u3_noun niz = u3qfu__stage_dunq(van, "over", ref); + if ( c3y == u3qdi_has(bix, hud) ) { + // u3_noun dun = u3qfu_dunq(van, "type", sut); + // u3_noun niz = u3qfu_dunq(van, "over", ref); // u3t_push(u3nc(c3__mean, dun)); // u3t_push(u3nc(c3__mean, niz)); return u3m_error("fuse-loop"); } else { - u3_noun bux = u3qdi__stage_put(bix, hud); + u3_noun bux = u3qdi_put(bix, hud); u3_noun ret = _fuse_repo(van, sut, ref, bux); u3z(hud); @@ -183,7 +183,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_fuse(u3_noun cor) + u3wfu_fuse(u3_noun cor) { u3_noun sut, ref, van; @@ -197,11 +197,11 @@ } u3_noun - u3qfu__stage_fuse(u3_noun van, + u3qfu_fuse(u3_noun van, u3_noun sut, u3_noun ref) { - c3_m fun_m = 200 + c3__fuse + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__fuse + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_2(fun_m, sut, ref); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_gain.c b/jets/stage/f/ut_gain.c index ee8f90d9a4..509740ab17 100644 --- a/jets/stage/f/ut_gain.c +++ b/jets/stage/f/ut_gain.c @@ -5,12 +5,12 @@ u3_noun - u3qfu__stage_gain(u3_noun van, + u3qfu_gain(u3_noun van, u3_noun sut, u3_noun gen) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("u3qfu__stage_gain-gain", von, "gain"); + u3_noun gat = u3j_cook("u3qfu_gain-gain", von, "gain"); return u3n_kick_on(u3i_molt(gat, u3x_sam, u3k(gen), 0)); } diff --git a/jets/stage/f/ut_lose.c b/jets/stage/f/ut_lose.c index fd34d74b20..16e9f6c0f0 100644 --- a/jets/stage/f/ut_lose.c +++ b/jets/stage/f/ut_lose.c @@ -5,12 +5,12 @@ u3_noun - u3qfu__stage_lose(u3_noun van, + u3qfu_lose(u3_noun van, u3_noun sut, u3_noun gen) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("u3qfu__stage_lose-lose", von, "lose"); + u3_noun gat = u3j_cook("u3qfu_lose-lose", von, "lose"); return u3n_kick_on(u3i_molt(gat, u3x_sam, u3k(gen), 0)); } diff --git a/jets/stage/f/ut_mint.c b/jets/stage/f/ut_mint.c index 9b34dbaf1e..54ff5c466e 100644 --- a/jets/stage/f/ut_mint.c +++ b/jets/stage/f/ut_mint.c @@ -11,7 +11,7 @@ static u3_noun _mint_bean() { - return u3kf__stage_fork(u3nt(u3nq(c3__atom, 'f', u3_nul, 0), + return u3kf_fork(u3nt(u3nq(c3__atom, 'f', u3_nul, 0), u3nq(c3__atom, 'f', u3_nul, 1), u3_nul)); } @@ -39,7 +39,7 @@ _mint_vet(u3_noun van) { // u3_noun vet = u3j_hook(u3k(van), "vet"); - u3_noun vet = u3r_at(u3qfu__stage_van_vet, van); + u3_noun vet = u3r_at(u3qfu_van_vet, van); switch ( vet ) { case c3n: @@ -134,10 +134,10 @@ u3_noun typ) { if ( (c3y == _mint_vet(van)) && - (c3n == u3qfu__stage_nest(van, gol, c3y, typ)) ) + (c3n == u3qfu_nest(van, gol, c3y, typ)) ) { - // u3_noun dun = u3qfu__stage_dunq(van, "need", gol); - // u3_noun niz = u3qfu__stage_dunq(van, "have", typ); + // u3_noun dun = u3qfu_dunq(van, "need", gol); + // u3_noun niz = u3qfu_dunq(van, "have", typ); // u3t_push(u3nc(c3__mean, dun)); // u3t_push(u3nc(c3__mean, niz)); @@ -188,7 +188,7 @@ u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); - u3_noun sho = u3j_cook("_stage_mint_loc-show", u3k(van), "show"); + u3_noun sho = u3j_cook("_mint_loc-show", u3k(van), "show"); u3_noun ret = u3i_molt(u3k(sho), u3x_sam, u3k(mol), 0); u3z(mol); @@ -206,7 +206,7 @@ u3_noun rig) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("_stage_mint_cnts-emin", von, "emin"); + u3_noun gat = u3j_cook("_mint_cnts-emin", von, "emin"); return u3n_kick_on(u3i_molt(gat, u3x_sam_2, @@ -228,7 +228,7 @@ { while ( 1 ) { if ( c3n == u3du(mew) ) { - u3_noun gim = u3qfu__stage_fire(van, sut, rag); + u3_noun gim = u3qfu_fire(van, sut, rag); u3_noun fol = u3qf_hike(p_lar, hej); u3z(rag); @@ -240,10 +240,10 @@ u3_noun t_mew = u3t(mew); u3_noun pi_mew = u3h(i_mew); u3_noun qi_mew = u3t(i_mew); - u3_noun zil = u3qfu__stage_mint(van, sut, c3__noun, qi_mew); + u3_noun zil = u3qfu_mint(van, sut, c3__noun, qi_mew); u3_noun p_zil = u3h(zil); u3_noun q_zil = u3t(zil); - u3_noun wip = u3qfu__stage_toss(van, sut, pi_mew, p_zil, rag); + u3_noun wip = u3qfu_toss(van, sut, pi_mew, p_zil, rag); u3z(rag); rag = u3k(u3t(wip)); @@ -266,7 +266,7 @@ u3_noun hyp, u3_noun rig) { - u3_noun lar = u3qfu__stage_seek(van, sut, c3__read, hyp); + u3_noun lar = u3qfu_seek(van, sut, c3__read, hyp); u3_noun p_lar = u3h(lar); u3_noun q_lar = u3t(lar); u3_noun pq_lar = u3h(q_lar); @@ -317,7 +317,7 @@ if ( c3n == u3du(gen) ) { u3_noun ter = u3r_at(u3x_con_3, van); - u3_noun fab = u3r_at(u3qfu__stage_van_fab, van); + u3_noun fab = u3r_at(u3qfu_van_fab, van); u3_noun rex = u3qfp_open(ter, fab, gen); ret = _mint_in(van, sut, gol, rex); @@ -344,12 +344,12 @@ } else switch ( u3h(gen) ) { default: { u3_noun ter = u3r_at(u3x_con_3, van); - u3_noun fab = u3r_at(u3qfu__stage_van_fab, van); + u3_noun fab = u3r_at(u3qfu_van_fab, van); u3_noun rex = u3qfp_open(ter, fab, gen); if ( c3y == u3r_sing(rex, gen) ) { #if 1 - u3_noun zix = u3qfu__stage_shep(van, "gene", 'q', u3k(gen)); + u3_noun zix = u3qfu_shep(van, "gene", 'q', u3k(gen)); u3t_push(u3nc(c3__mean, zix)); return u3m_error("mint-open"); @@ -367,13 +367,13 @@ case c3__fits: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun wam = u3qfu__stage_play(van, sut, p_gen); + u3_noun wam = u3qfu_play(van, sut, p_gen); u3_noun dok = u3nc(c3__wing, u3k(q_gen)); u3_noun vol = _mint_corn(van, sut, dok); u3_noun axe = _mint_cove(vol); ret = u3nc(_mint_nice(van, gol, _mint_bean()), - u3qfu__stage_fish(van, wam, axe)); + u3qfu_fish(van, wam, axe)); u3z(axe); u3z(vol); @@ -388,8 +388,8 @@ { u3_noun bol = _mint_bean(); u3_noun nor = _mint_in(van, sut, bol, p_gen); - u3_noun fex = u3qfu__stage_gain(van, sut, p_gen); - u3_noun wux = u3qfu__stage_lose(van, sut, p_gen); + u3_noun fex = u3qfu_gain(van, sut, p_gen); + u3_noun wux = u3qfu_lose(van, sut, p_gen); u3_noun duy = (c3__void == fex) ? ( (c3__void == wux) ? u3nc(0, 0) @@ -400,7 +400,7 @@ u3_noun hiq = _mint_in(van, fex, gol, q_gen); u3_noun ran = _mint_in(van, wux, gol, r_gen); - ret = u3nc(u3qf__stage_forq(u3h(hiq), + ret = u3nc(u3qf_forq(u3h(hiq), u3h(ran)), _mint_cond(duy, u3k(u3t(hiq)), @@ -442,8 +442,8 @@ u3_noun ret; if ( (c3y == _mint_vet(van)) && - (c3n == u3qfu__stage_nest(van, u3h(one), c3n, u3h(two))) && - (c3n == u3qfu__stage_nest(van, u3h(two), c3y, u3h(one))) ) + (c3n == u3qfu_nest(van, u3h(one), c3n, u3h(two))) && + (c3n == u3qfu_nest(van, u3h(two), c3y, u3h(one))) ) { return u3m_error("nest"); } @@ -495,7 +495,7 @@ case c3__rock: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun typ = u3qfu__stage_play(van, sut, gen); + u3_noun typ = u3qfu_play(van, sut, gen); u3_noun ret = u3nc(_mint_nice(van, gol, typ), u3nc(1, u3k(q_gen))); @@ -515,7 +515,7 @@ case c3__sand: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun typ = u3qfu__stage_play(van, sut, gen); + u3_noun typ = u3qfu_play(van, sut, gen); u3_noun ret = u3nc(_mint_nice(van, gol, typ), u3nc(1, u3k(q_gen))); @@ -532,7 +532,7 @@ _mint_used(); { u3_noun ryd = _mint_in(van, sut, gol, p_gen); - u3_noun tyf = u3qfu__stage_wrap(van, u3h(ryd), c3__iron); + u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__iron); u3_noun tyn = _mint_nice(van, gol, tyf); u3_noun pro = u3nc(tyn, u3k(u3t(ryd))); @@ -545,7 +545,7 @@ _mint_used(); { u3_noun ryd = _mint_in(van, sut, gol, p_gen); - u3_noun tyf = u3qfu__stage_wrap(van, u3h(ryd), c3__zinc); + u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__zinc); u3_noun tyn = _mint_nice(van, gol, tyf); u3_noun pro = u3nc(tyn, u3k(u3t(ryd))); @@ -557,7 +557,7 @@ _mint_used(); { u3_noun ryd = _mint_in(van, sut, gol, p_gen); - u3_noun tyf = u3qfu__stage_wrap(van, u3h(ryd), c3__lead); + u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__lead); u3_noun tyn = _mint_nice(van, gol, tyf); u3_noun pro = u3nc(tyn, u3k(u3t(ryd))); @@ -587,7 +587,7 @@ case c3__ktls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun huz = u3qfu__stage_play(van, sut, p_gen); + u3_noun huz = u3qfu_play(van, sut, p_gen); u3_noun hif = _mint_nice(van, gol, huz); u3_noun zel = _mint_in(van, sut, hif, q_gen); u3_noun ret = u3nc(hif, u3k(u3t(zel))); @@ -622,7 +622,7 @@ case c3__tscm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun boc = u3qfu__stage_busk(van, sut, p_gen); + u3_noun boc = u3qfu_busk(van, sut, p_gen); u3_noun ret = _mint_in(van, boc, gol, q_gen); u3z(boc); @@ -660,8 +660,8 @@ case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun typ = u3qfu__stage_play(van, sut, p_gen); - u3_noun dug = u3qfu__stage_duck(van, typ); + u3_noun typ = u3qfu_play(van, sut, p_gen); + u3_noun dug = u3qfu_duck(van, typ); u3t_push(u3nc(c3__mean, dug)); { @@ -695,7 +695,7 @@ case c3__zpts: p_gen = u3t(gen); _mint_used(); { - u3_noun von = u3i_molt(u3k(van), u3qfu__stage_van_vet, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); u3_noun sev = _mint_corn(von, sut, p_gen); u3z(von); @@ -705,7 +705,7 @@ case c3__ktcn: p_gen = u3t(gen); _mint_used(); { - u3_noun von = u3i_molt(u3k(van), u3qfu__stage_van_fab, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_fab, c3n, 0); u3_noun ret = _mint_in(von, sut, gol, p_gen); u3z(von); @@ -716,7 +716,7 @@ _mint_used(); { u3_noun hyp = u3nc(u3nc(c3y, 1), u3k(q_gen)); - u3_noun fid = u3qfu__stage_find(van, sut, c3__free, hyp); + u3_noun fid = u3qfu_find(van, sut, c3__free, hyp); if ( c3y != u3h(fid) ) { return u3m_error("mint-fragment"); @@ -750,8 +750,8 @@ _mint_used(); { - c3_m fun_m = 200 + c3__blow; - u3_noun vrf = u3r_at(u3qfu__stage_van_vrf, van); + c3_m fun_m = 141 + c3__blow; + u3_noun vrf = u3r_at(u3qfu_van_vrf, van); u3_noun pro = u3z_find_4(fun_m, vrf, sut, gol, p_gen); if ( u3_none != pro ) { @@ -759,7 +759,7 @@ } else { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("_stage_mint_in-blow", von, "blow"); + u3_noun gat = u3j_cook("_mint_in-blow", von, "blow"); u3_noun pro; pro = u3n_kick_on(u3i_molt(gat, @@ -778,7 +778,7 @@ { return u3nc(_mint_nice(van, gol, - u3qfu__stage_play(van, sut, p_gen)), + u3qfu_play(van, sut, p_gen)), u3nc(1, u3k(q_gen))); } @@ -801,7 +801,7 @@ _mint_used(); { u3_noun vos = _mint_in(van, sut, c3__noun, q_gen); - u3_noun zur = u3qfu__stage_play(van, sut, p_gen); + u3_noun zur = u3qfu_play(van, sut, p_gen); u3_noun p_vos = u3h(vos); u3_noun q_vos = u3t(vos); u3_noun waz = u3nc(1, _mint_burp(van, p_vos)); @@ -835,8 +835,8 @@ _mint_used(); { if ( c3y == _mint_vet(van) ) { - u3_noun zur = u3qfu__stage_play(van, sut, p_gen); - u3_noun dun = u3qfu__stage_dunq(van, "lost", zur); + u3_noun zur = u3qfu_play(van, sut, p_gen); + u3_noun dun = u3qfu_dunq(van, "lost", zur); u3t_push(u3nc(c3__mean, dun)); return u3m_error("mint-lost"); @@ -867,7 +867,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_mint(u3_noun cor) + u3wfu_mint(u3_noun cor) { u3_noun sut, gol, gen, van; @@ -884,13 +884,13 @@ } u3_noun - u3qfu__stage_mint(u3_noun van, + u3qfu_mint(u3_noun van, u3_noun sut, u3_noun gol, u3_noun gen) { - c3_m fun_m = 200 + c3__mint; - u3_noun vrf = u3r_at(u3qfu__stage_van_vrf, van); + c3_m fun_m = 141 + c3__mint; + u3_noun vrf = u3r_at(u3qfu_van_vrf, van); u3_noun pro = u3z_find_4(fun_m, vrf, sut, gol, gen); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_mull.c b/jets/stage/f/ut_mull.c index ba9440d7ba..760ebbf1f1 100644 --- a/jets/stage/f/ut_mull.c +++ b/jets/stage/f/ut_mull.c @@ -11,7 +11,7 @@ static u3_noun _mull_bean() { - return u3kf__stage_fork(u3nt(u3nq(c3__atom, 'f', u3_nul, 0), + return u3kf_fork(u3nt(u3nq(c3__atom, 'f', u3_nul, 0), u3nq(c3__atom, 'f', u3_nul, 1), u3_nul)); } @@ -21,7 +21,7 @@ u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); - u3_noun sho = u3j_cook("_stage_mull_loc-show", u3k(van), "show"); + u3_noun sho = u3j_cook("_mull_loc-show", u3k(van), "show"); u3_noun ret = u3i_molt(u3k(sho), u3x_sam, u3k(mol), 0); u3z(mol); @@ -108,7 +108,7 @@ u3_noun sut, u3_noun gen) { - u3_noun fug = u3qfu__stage_mint(van, sut, c3__noun, gen); + u3_noun fug = u3qfu_mint(van, sut, c3__noun, gen); u3_noun axe = _mull_cove(u3t(fug)); u3z(fug); @@ -120,9 +120,9 @@ u3_noun gol, u3_noun typ) { - if ( c3n == u3qfu__stage_nest(van, gol, c3y, typ) ) { - // u3_noun dun = u3qfu__stage_dunq(van, "need", gol); - // u3_noun niz = u3qfu__stage_dunq(van, "have", typ); + if ( c3n == u3qfu_nest(van, gol, c3y, typ) ) { + // u3_noun dun = u3qfu_dunq(van, "need", gol); + // u3_noun niz = u3qfu_dunq(van, "have", typ); // u3t_push(u3nc(c3__mean, dun)); // u3t_push(u3nc(c3__mean, niz)); @@ -176,7 +176,7 @@ u3_noun rig) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("_stage_mull_cnts-emul", von, "emul"); + u3_noun gat = u3j_cook("_mull_cnts-emul", von, "emul"); return u3n_kick_on(u3i_molt(gat, u3x_sam_2, @@ -209,8 +209,8 @@ u3_noun zil = _mull_in(van, sut, c3__noun, dox, qi_mew); u3_noun p_zil = u3h(zil); u3_noun q_zil = u3t(zil); - u3_noun cuf = u3qfu__stage_toss(van, sut, pi_mew, p_zil, p_yom); - u3_noun dof = u3qfu__stage_toss(van, sut, pi_mew, q_zil, q_yom); + u3_noun cuf = u3qfu_toss(van, sut, pi_mew, p_zil, p_yom); + u3_noun dof = u3qfu_toss(van, sut, pi_mew, q_zil, q_yom); if ( u3r_sing(u3h(cuf), u3h(dof)) ) { u3m_error("mull-bonk-a"); @@ -239,8 +239,8 @@ u3_noun hyp, u3_noun rig) { - u3_noun lar = u3qfu__stage_seek(van, sut, c3__read, hyp); - u3_noun vug = u3qfu__stage_seek(van, dox, c3__read, hyp); + u3_noun lar = u3qfu_seek(van, sut, c3__read, hyp); + u3_noun vug = u3qfu_seek(van, dox, c3__read, hyp); u3_noun p_lar = u3h(lar); u3_noun q_lar = u3t(lar); u3_noun pq_lar = u3h(q_lar); @@ -258,9 +258,9 @@ u3_noun yom = _mull_edit (van, sut, dox, mew, u3k(qq_lar), u3k(qq_vug)); - u3_noun von = u3i_molt(u3k(van), u3qfu__stage_van_vet, c3n, 0); - u3_noun p_ret = u3qfu__stage_fire(van, sut, u3h(yom)); - u3_noun q_ret = u3qfu__stage_fire(von, sut, u3t(yom)); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); + u3_noun p_ret = u3qfu_fire(van, sut, u3h(yom)); + u3_noun q_ret = u3qfu_fire(von, sut, u3t(yom)); u3z(von); u3z(yom); @@ -286,7 +286,7 @@ if ( c3n == u3du(gen) ) { u3_noun ter = u3r_at(u3x_con_3, van); - u3_noun fab = u3r_at(u3qfu__stage_van_fab, van); + u3_noun fab = u3r_at(u3qfu_van_fab, van); u3_noun rex = u3qfp_open(ter, fab, gen); ret = _mull_in(van, sut, gol, dox, rex); @@ -312,12 +312,12 @@ else switch ( u3h(gen) ) { default: { u3_noun ter = u3r_at(u3x_con_3, van); - u3_noun fab = u3r_at(u3qfu__stage_van_fab, van); + u3_noun fab = u3r_at(u3qfu_van_fab, van); u3_noun rex = u3qfp_open(ter, fab, gen); if ( c3y == u3r_sing(rex, gen) ) { #if 1 - u3_noun zix = u3qfu__stage_shep(van, "gene", 'q', u3k(gen)); + u3_noun zix = u3qfu_shep(van, "gene", 'q', u3k(gen)); u3t_push(u3nc(c3__mean, zix)); return u3m_error("mull-open"); @@ -335,13 +335,13 @@ case c3__fits: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun p_waz = u3qfu__stage_play(van, sut, p_gen); - u3_noun q_waz = u3qfu__stage_play(van, dox, p_gen); + u3_noun p_waz = u3qfu_play(van, sut, p_gen); + u3_noun q_waz = u3qfu_play(van, dox, p_gen); u3_noun dok = u3nc(c3__wing, u3k(q_gen)); u3_noun p_syx = _mull_doke(van, sut, dok); u3_noun q_syx = _mull_doke(van, dox, dok); - u3_noun p_pov = u3qfu__stage_fish(van, p_waz, p_syx); - u3_noun q_pov = u3qfu__stage_fish(van, q_waz, q_syx); + u3_noun p_pov = u3qfu_fish(van, p_waz, p_syx); + u3_noun q_pov = u3qfu_fish(van, q_waz, q_syx); if ( (c3n == u3r_sing(p_syx, q_syx)) || (c3n == u3r_sing(p_pov, q_pov)) ) @@ -360,8 +360,8 @@ _mull_used(); { u3_noun hyp = u3nc(u3nc(c3y, 1), u3k(q_gen)); - u3_noun fid = u3qfu__stage_find(van, sut, c3__free, hyp); - u3_noun gax = u3qfu__stage_find(van, dox, c3__free, hyp); + u3_noun fid = u3qfu_find(van, sut, c3__free, hyp); + u3_noun gax = u3qfu_find(van, dox, c3__free, hyp); u3_noun old_type, old_axis; u3_noun new_type, new_axis; @@ -399,7 +399,7 @@ if ( c3n == u3r_sing(old_axis, new_axis) ) { return u3m_error("mull-bonk-x"); } - else if ( c3n == u3qfu__stage_nest(van, old_type, c3y, new_type) ) { + else if ( c3n == u3qfu_nest(van, old_type, c3y, new_type) ) { return u3m_error("mull-bonk-x"); } @@ -416,10 +416,10 @@ { u3_noun bol = _mull_bean(); u3_noun nor = _mull_in(van, sut, bol, dox, p_gen); - u3_noun p_fex = u3qfu__stage_gain(van, sut, p_gen); - u3_noun q_fex = u3qfu__stage_gain(van, dox, p_gen); - u3_noun p_wux = u3qfu__stage_lose(van, sut, p_gen); - u3_noun q_wux = u3qfu__stage_lose(van, dox, p_gen); + u3_noun p_fex = u3qfu_gain(van, sut, p_gen); + u3_noun q_fex = u3qfu_gain(van, dox, p_gen); + u3_noun p_wux = u3qfu_lose(van, sut, p_gen); + u3_noun q_wux = u3qfu_lose(van, dox, p_gen); u3_noun hiq, ran; u3_noun dis, dat; u3_noun ret; @@ -428,7 +428,7 @@ hiq = u3nc(c3__void, (c3__void == q_fex) ? c3__void - : u3qfu__stage_play(van, q_fex, q_gen)); + : u3qfu_play(van, q_fex, q_gen)); } else if ( c3__void == q_fex ) { hiq = u3m_error("mull-bonk-c"); } @@ -438,14 +438,14 @@ ran = u3nc(c3__void, (c3__void == q_wux) ? c3__void - : u3qfu__stage_play(van, q_wux, r_gen)); + : u3qfu_play(van, q_wux, r_gen)); } else if ( c3__void == q_wux ) { ran = u3m_error("mull-bonk-d"); } else ran = _mull_in(van, p_wux, gol, q_wux, r_gen); - dis = u3qf__stage_forq(u3h(hiq), u3h(ran)); - dat = u3qf__stage_forq(u3t(hiq), u3t(ran)); + dis = u3qf_forq(u3h(hiq), u3h(ran)); + dat = u3qf_forq(u3t(hiq), u3t(ran)); ret = u3nc(_mull_nice(van, gol, dis), dat); @@ -523,7 +523,7 @@ case c3__rock: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun typ = u3qfu__stage_play(van, sut, gen); + u3_noun typ = u3qfu_play(van, sut, gen); return _mull_both(van, gol, typ); } @@ -543,7 +543,7 @@ case c3__sand: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun typ = u3qfu__stage_play(van, sut, gen); + u3_noun typ = u3qfu_play(van, sut, gen); return _mull_both(van, gol, typ); } @@ -557,10 +557,10 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); - u3_noun pro = u3nc(u3qfu__stage_wrap(van, + u3_noun pro = u3nc(u3qfu_wrap(van, u3h(vat), c3__iron), - u3qfu__stage_wrap(van, + u3qfu_wrap(van, u3t(vat), c3__iron)); @@ -573,10 +573,10 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); - u3_noun pro = u3nc(u3qfu__stage_wrap(van, + u3_noun pro = u3nc(u3qfu_wrap(van, u3h(vat), c3__zinc), - u3qfu__stage_wrap(van, + u3qfu_wrap(van, u3t(vat), c3__zinc)); @@ -588,10 +588,10 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); - u3_noun pro = u3nc(u3qfu__stage_wrap(van, + u3_noun pro = u3nc(u3qfu_wrap(van, u3h(vat), c3__lead), - u3qfu__stage_wrap(van, + u3qfu_wrap(van, u3t(vat), c3__lead)); @@ -630,8 +630,8 @@ case c3__ktls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun p_hif = _mull_nice(van, gol, u3qfu__stage_play(van, sut, p_gen)); - u3_noun q_hif = u3qfu__stage_play(van, dox, p_gen); + u3_noun p_hif = _mull_nice(van, gol, u3qfu_play(van, sut, p_gen)); + u3_noun q_hif = u3qfu_play(van, dox, p_gen); u3_noun zel = _mull_in(van, sut, p_hif, dox, q_gen); u3_noun ret = u3nc(p_hif, q_hif); @@ -654,8 +654,8 @@ case c3__tscm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun boc = u3qfu__stage_busk(van, sut, p_gen); - u3_noun nuf = u3qfu__stage_busk(van, dox, p_gen); + u3_noun boc = u3qfu_busk(van, sut, p_gen); + u3_noun nuf = u3qfu_busk(van, dox, p_gen); u3_noun ret = _mull_in(van, boc, gol, nuf, q_gen); u3z(boc); @@ -697,8 +697,8 @@ case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun typ = u3qfu__stage_play(van, sut, p_gen); - u3_noun dug = u3qfu__stage_duck(van, typ); + u3_noun typ = u3qfu_play(van, sut, p_gen); + u3_noun dug = u3qfu_duck(van, typ); u3_noun ret; u3t_push(u3nc(c3__mean, dug)); @@ -720,8 +720,8 @@ case c3__zpcm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun p_ret = u3qfu__stage_play(van, sut, p_gen); - u3_noun q_ret = u3qfu__stage_play(van, sut, q_gen); + u3_noun p_ret = u3qfu_play(van, sut, p_gen); + u3_noun q_ret = u3qfu_play(van, sut, q_gen); return u3nc(_mull_nice(van, gol, p_ret), q_ret); @@ -748,7 +748,7 @@ case c3__ktcn: p_gen = u3t(gen); _mull_used(); { - u3_noun von = u3i_molt(u3k(van), u3qfu__stage_van_fab, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_fab, c3n, 0); u3_noun ret = _mull_in(von, sut, gol, dox, p_gen); u3z(von); @@ -759,8 +759,8 @@ case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun p_zur = u3qfu__stage_play(van, sut, p_gen); - u3_noun q_zur = u3qfu__stage_play (van, dox, p_gen); + u3_noun p_zur = u3qfu_play(van, sut, p_gen); + u3_noun q_zur = u3qfu_play (van, dox, p_gen); u3_noun vos = _mull_in(van, sut, c3__noun, dox, q_gen); u3_noun p_ret = u3qf_cell(p_zur, u3h(vos)); u3_noun q_ret = u3qf_cell(q_zur, u3t(vos)); @@ -813,7 +813,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_mull(u3_noun cor) + u3wfu_mull(u3_noun cor) { u3_noun sut, gol, dox, gen, van; @@ -831,13 +831,13 @@ } u3_noun - u3qfu__stage_mull(u3_noun van, + u3qfu_mull(u3_noun van, u3_noun sut, u3_noun gol, u3_noun dox, u3_noun gen) { - c3_m fun_m = 200 + c3__mull + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__mull + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_4(fun_m, sut, gol, dox, gen); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_nest.c b/jets/stage/f/ut_nest.c index 985a17a7cb..f36c1385cb 100644 --- a/jets/stage/f/ut_nest.c +++ b/jets/stage/f/ut_nest.c @@ -45,8 +45,8 @@ return c3n; } else { - u3_noun vis = u3qfu__stage_play(van, sut, qn_dab); - u3_noun lon = u3qfu__stage_play(van, ref, qn_hem); + u3_noun vis = u3qfu_play(van, sut, qn_dab); + u3_noun lon = u3qfu_play(van, ref, qn_hem); u3_noun ret = _nest_dext(van, vis, tel, lon, u3_nul, u3_nul, gil); @@ -153,13 +153,13 @@ else { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (c3y == u3qdi__stage_has(gil, hud)) ) { + if ( (c3y == u3qdi_has(gil, hud)) ) { u3z(hud); return c3y; } else { - u3_noun zoc = u3qdi__stage_put(gil, hud); + u3_noun zoc = u3qdi_put(gil, hud); u3_noun tus = u3nt(c3__core, u3k(qq_sut), u3nc(u3nt(u3k(ppq_sut), u3k(qpq_sut), c3__gold), @@ -189,8 +189,8 @@ _nest_dext(van, qq_ref, tel, qq_sut, u3_nul, u3_nul, gil)); } case c3__iron: { - u3_noun s_sam = u3qfu__stage_peek(van, qq_sut, c3__rite, 2); - u3_noun r_sam = u3qfu__stage_peek(van, qq_ref, c3__rite, 2); + u3_noun s_sam = u3qfu_peek(van, qq_sut, c3__rite, 2); + u3_noun r_sam = u3qfu_peek(van, qq_ref, c3__rite, 2); u3_noun ret = _nest_dext (van, r_sam, tel, s_sam, u3_nul, u3_nul, gil); @@ -202,8 +202,8 @@ return c3y; } case c3__zinc: { - u3_noun s_pal = u3qfu__stage_peek(van, qq_sut, c3__read, 2); - u3_noun r_pal = u3qfu__stage_peek(van, qq_ref, c3__read, 2); + u3_noun s_pal = u3qfu_peek(van, qq_sut, c3__read, 2); + u3_noun r_pal = u3qfu_peek(van, qq_ref, c3__read, 2); u3_noun ret = _nest_dext (van, s_pal, tel, r_pal, u3_nul, u3_nul, gil); @@ -308,7 +308,7 @@ } { - u3_noun dey = u3qdi__stage_tap(p_sut); + u3_noun dey = u3qdi_tap(p_sut); u3_noun yed = dey; while ( u3_nul != yed ) { @@ -325,21 +325,21 @@ } case c3__hold: { - if ( c3y == u3qdi__stage_has(seg, sut) ) { + if ( c3y == u3qdi_has(seg, sut) ) { return c3n; } else { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (c3y == u3qdi__stage_has(gil, hud)) ) { + if ( (c3y == u3qdi_has(gil, hud)) ) { u3z(hud); return c3y; } else { - u3_noun gus = u3qdi__stage_put(seg, sut); - u3_noun zoc = u3qdi__stage_put(gil, hud); - u3_noun fop = u3qfu__stage_repo(van, sut); + u3_noun gus = u3qdi_put(seg, sut); + u3_noun zoc = u3qdi_put(gil, hud); + u3_noun fop = u3qfu_repo(van, sut); u3_noun hiv = _nest_dext(van, fop, tel, ref, gus, reg, zoc); u3z(hud); @@ -369,8 +369,8 @@ return tyn; } else { #if 0 - u3_noun dun = u3qfu__stage_dunq(van, "need", sut); - u3_noun niz = u3qfu__stage_dunq(van, "have", ref); + u3_noun dun = u3qfu_dunq(van, "need", sut); + u3_noun niz = u3qfu_dunq(van, "have", ref); u3t_push(u3nc(c3__mean, dun)); u3t_push(u3nc(c3__mean, niz)); @@ -394,7 +394,7 @@ } { - c3_m fun_m = 200 + c3__nest + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__nest + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_2(fun_m, sut, ref); if ( u3_none != pro ) { @@ -440,7 +440,7 @@ case c3__atom: return c3n; case c3__cell: return c3n; case c3__core: { - u3_noun gam = u3qfu__stage_repo(van, ref); + u3_noun gam = u3qfu_repo(van, ref); u3_noun hiv = _nest_dext(van, sut, tel, gam, seg, reg, gil); u3z(gam); @@ -456,7 +456,7 @@ } case c3__fork: p_ref = u3t(ref); { - u3_noun dey = u3qdi__stage_tap(p_ref); + u3_noun dey = u3qdi_tap(p_ref); u3_noun yed = dey; while ( u3_nul != yed ) { @@ -471,20 +471,20 @@ return c3y; } case c3__hold: { - if ( c3y == u3qdi__stage_has(reg, ref) ) { + if ( c3y == u3qdi_has(reg, ref) ) { return c3y; } { u3_noun hud = u3nc(u3k(sut), u3k(ref)); - if ( (c3y == u3qdi__stage_has(gil, hud)) ) { + if ( (c3y == u3qdi_has(gil, hud)) ) { u3z(hud); return c3y; } else { - u3_noun gur = u3qdi__stage_put(reg, ref); - u3_noun zoc = u3qdi__stage_put(gil, hud); - u3_noun gam = u3qfu__stage_repo(van, ref); + u3_noun gur = u3qdi_put(reg, ref); + u3_noun zoc = u3qdi_put(gil, hud); + u3_noun gam = u3qfu_repo(van, ref); { u3_noun hiv = _nest_dext(van, sut, tel, gam, seg, gur, zoc); @@ -515,7 +515,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_nest(u3_noun cor) + u3wfu_nest(u3_noun cor) { u3_noun sut, tel, ref, van; @@ -533,14 +533,14 @@ } u3_noun - u3qfu__stage_nest(u3_noun van, + u3qfu_nest(u3_noun van, u3_noun sut, u3_noun tel, u3_noun ref) { #if 1 - c3_m fun_m = 200 + c3__nest; - u3_noun vrf = u3r_at(u3qfu__stage_van_vrf, van); + c3_m fun_m = 141 + c3__nest; + u3_noun vrf = u3r_at(u3qfu_van_vrf, van); u3_noun pro = u3z_find_4(fun_m, vrf, sut, tel, ref); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_peek.c b/jets/stage/f/ut_peek.c index bbaba3a8da..dc9a5887c9 100644 --- a/jets/stage/f/ut_peek.c +++ b/jets/stage/f/ut_peek.c @@ -85,7 +85,7 @@ u3_atom lat = u3qc_mas(axe); if ( 3 == now ) { - u3_noun pec = u3qfu__stage_peel(van, sut, way, rpq_sut); + u3_noun pec = u3qfu_peel(van, sut, way, rpq_sut); u3_noun sam = u3h(pec); u3_noun con = u3t(pec); u3_atom tow; @@ -156,19 +156,19 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun yed = u3qdi__stage_tap(p_sut); - u3_noun ret = u3kf__stage_fork(_peek_fork(van, yed, way, axe, gil)); + u3_noun yed = u3qdi_tap(p_sut); + u3_noun ret = u3kf_fork(_peek_fork(van, yed, way, axe, gil)); u3z(yed); return ret; } case c3__hold: { - if ( (c3y == u3qdi__stage_has(gil, sut)) ) { + if ( (c3y == u3qdi_has(gil, sut)) ) { return c3__void; } else { - u3_noun zoc = u3qdi__stage_put(gil, sut); - u3_noun fop = u3qfu__stage_repo(van, sut); + u3_noun zoc = u3qdi_put(gil, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _peek_in(van, fop, way, axe, zoc); u3z(fop); @@ -195,7 +195,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_peek(u3_noun cor) + u3wfu_peek(u3_noun cor) { u3_noun sut, way, axe, van; @@ -213,12 +213,12 @@ } u3_noun - u3qfu__stage_peek(u3_noun van, + u3qfu_peek(u3_noun van, u3_noun sut, u3_noun way, u3_noun axe) { - c3_m fun_m = 200 + c3__peek + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__peek + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_3(fun_m, sut, way, axe); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_peel.c b/jets/stage/f/ut_peel.c index 0ffc3f9407..717a625433 100644 --- a/jets/stage/f/ut_peel.c +++ b/jets/stage/f/ut_peel.c @@ -6,7 +6,7 @@ /* logic */ - static u3_noun + u3_noun _cqfu_peel(u3_noun van, u3_noun sut, u3_noun way, @@ -28,7 +28,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_peel(u3_noun cor) + u3wfu_peel(u3_noun cor) { u3_noun sut, way, met, van; @@ -45,7 +45,7 @@ } u3_noun - u3qfu__stage_peel(u3_noun van, + u3qfu_peel(u3_noun van, u3_noun sut, u3_noun way, u3_noun met) diff --git a/jets/stage/f/ut_play.c b/jets/stage/f/ut_play.c index 0dc6e00e65..9a300edf4f 100644 --- a/jets/stage/f/ut_play.c +++ b/jets/stage/f/ut_play.c @@ -13,7 +13,7 @@ static u3_noun _play_bean() { - return u3kf__stage_fork(u3nt(u3nq(c3__atom, 'f', u3_nul, 0), + return u3kf_fork(u3nt(u3nq(c3__atom, 'f', u3_nul, 0), u3nq(c3__atom, 'f', u3_nul, 1), u3_nul)); } @@ -70,7 +70,7 @@ u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); - u3_noun sho = u3j_cook("_stage_play_loc-show", u3k(van), "show"); + u3_noun sho = u3j_cook("_play_loc-show", u3k(van), "show"); u3_noun ret = u3i_molt(u3k(sho), u3x_sam, u3k(mol), 0); u3z(mol); @@ -121,7 +121,7 @@ u3_noun rig) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("_stage_play_cnts-epla", von, "epla"); + u3_noun gat = u3j_cook("_play_cnts-epla", von, "epla"); return u3n_kick_on(u3i_molt(gat, u3x_sam_2, @@ -146,7 +146,7 @@ u3_noun pi_mew = u3h(i_mew); u3_noun qi_mew = u3t(i_mew); u3_noun laf = _play_in(van, sut, qi_mew); - u3_noun ruz = u3qfu__stage_toss(van, sut, pi_mew, laf, rag); + u3_noun ruz = u3qfu_toss(van, sut, pi_mew, laf, rag); u3z(laf); u3z(rag); @@ -163,12 +163,12 @@ u3_noun hyp, u3_noun rig) { - u3_noun lar = u3qfu__stage_seek(van, sut, c3__read, hyp); + u3_noun lar = u3qfu_seek(van, sut, c3__read, hyp); u3_noun q_lar = u3t(lar); u3_noun qq_lar = u3t(q_lar); u3_noun mew = rig; u3_noun rag = _play_edit(van, sut, mew, u3k(qq_lar)); - u3_noun ret = u3qfu__stage_fire(van, sut, rag); + u3_noun ret = u3qfu_fire(van, sut, rag); u3z(rag); u3z(lar); @@ -208,7 +208,7 @@ #if 1 return _play_in(van, sut, gen); #else - u3_noun zix = u3qfu__stage_shep + u3_noun zix = u3qfu_shep (van, "gene", 'q', u3k(gen)); u3_noun ret; @@ -231,12 +231,12 @@ if ( c3n == u3du(gen) ) { open: { u3_noun ter = u3r_at(u3x_con_3, van); - u3_noun fab = u3r_at(u3qfu__stage_van_fab, van); + u3_noun fab = u3r_at(u3qfu_van_fab, van); u3_noun rex = u3qfp_open(ter, fab, gen); u3_noun ret; if ( c3y == u3r_sing(rex, gen) ) { - u3_noun zix = u3qfu__stage_shep(van, "gene", 'q', u3k(gen)); + u3_noun zix = u3qfu_shep(van, "gene", 'q', u3k(gen)); u3t_push(u3nc(c3__mean, zix)); return u3m_error("play-open-z"); @@ -271,13 +271,13 @@ case c3__wtcl: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen); _play_used(); { - u3_noun fex = u3qfu__stage_gain(van, sut, p_gen); - u3_noun wux = u3qfu__stage_lose(van, sut, p_gen); + u3_noun fex = u3qfu_gain(van, sut, p_gen); + u3_noun wux = u3qfu_lose(van, sut, p_gen); u3_noun dez = (fex == c3__void) ? c3__void : _play_x(van, fex, q_gen); u3_noun doz = (wux == c3__void) ? c3__void : _play_x(van, wux, r_gen); - u3_noun ret = u3qf__stage_forq(dez, doz); + u3_noun ret = u3qf_forq(dez, doz); u3z(dez); u3z(doz); u3z(fex); u3z(wux); @@ -352,7 +352,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, p_gen); - u3_noun pro = u3qfu__stage_wrap(van, boc, c3__iron); + u3_noun pro = u3qfu_wrap(van, boc, c3__iron); u3z(boc); return pro; @@ -362,7 +362,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, p_gen); - u3_noun pro = u3qfu__stage_wrap(van, boc, c3__zinc); + u3_noun pro = u3qfu_wrap(van, boc, c3__zinc); u3z(boc); return pro; @@ -372,7 +372,7 @@ _play_used(); { u3_noun boc = _play_x(van, sut, p_gen); - u3_noun pro = u3qfu__stage_wrap(van, boc, c3__lead); + u3_noun pro = u3qfu_wrap(van, boc, c3__lead); u3z(boc); return pro; @@ -421,7 +421,7 @@ case c3__tscm: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { - u3_noun boc = u3qfu__stage_busk(van, sut, p_gen); + u3_noun boc = u3qfu_busk(van, sut, p_gen); u3_noun ret = _play_x(van, boc, q_gen); u3z(boc); @@ -459,8 +459,8 @@ case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { - u3_noun typ = u3qfu__stage_play(van, sut, p_gen); - u3_noun dug = u3qfu__stage_duck(van, typ); + u3_noun typ = u3qfu_play(van, sut, p_gen); + u3_noun dug = u3qfu_duck(van, typ); u3_noun ret; u3t_push(u3nc(c3__mean, dug)); @@ -487,7 +487,7 @@ case c3__ktcn: p_gen = u3t(gen); { - u3_noun von = u3i_molt(u3k(van), u3qfu__stage_van_fab, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_fab, c3n, 0); u3_noun ret = _play_x(von, sut, p_gen); u3z(von); @@ -559,7 +559,7 @@ u3_noun sut, u3_noun gen) { - u3_noun von = u3i_molt(u3k(van), u3qfu__stage_van_vet, c3n, 0); + u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); u3_noun ret = _play_x(von, sut, gen); u3z(von); @@ -569,7 +569,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_play(u3_noun cor) + u3wfu_play(u3_noun cor) { u3_noun sut, gen, van; @@ -583,13 +583,13 @@ } u3_noun - u3qfu__stage_play(u3_noun van, + u3qfu_play(u3_noun van, u3_noun sut, u3_noun gen) { #if 1 - c3_m fun_m = 200 + c3__play; - u3_noun vrf = u3r_at(u3qfu__stage_van_vrf, van); + c3_m fun_m = 141 + c3__play; + u3_noun vrf = u3r_at(u3qfu_van_vrf, van); u3_noun pro = u3z_find_3(fun_m, vrf, sut, gen); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_repo.c b/jets/stage/f/ut_repo.c index 1cea98c9d4..0e82bf8139 100644 --- a/jets/stage/f/ut_repo.c +++ b/jets/stage/f/ut_repo.c @@ -7,7 +7,7 @@ /* logic */ u3_noun - u3qfu__stage_repo(u3_noun van, + u3qfu_repo(u3_noun van, u3_noun sut) { u3_noun p_sut, q_sut; @@ -16,7 +16,7 @@ default: return u3k(sut); case c3__noun: { - return u3kf__stage_fork(u3nt(u3nt(c3__atom, u3_blip, u3_nul), + return u3kf_fork(u3nt(u3nt(c3__atom, u3_blip, u3_nul), u3nt(c3__cell, c3__noun, c3__noun), u3_nul)); } @@ -49,7 +49,7 @@ u3_noun old = u3nc(u3nc(u3k(p_sut), u3k(q_sut)), u3_nul); u3_noun ret; - ret = u3qfu__stage_rest(van, sut, old); + ret = u3qfu_rest(van, sut, old); u3z(old); return ret; } @@ -58,13 +58,13 @@ } u3_noun - u3wfu__stage_repo(u3_noun cor) + u3wfu_repo(u3_noun cor) { u3_noun sut; if ( u3_none == (sut = u3r_at(u3x_sam, cor)) ) { return u3m_bail(c3__fail); } else { - return u3qfu__stage_repo(cor, sut); + return u3qfu_repo(cor, sut); } } diff --git a/jets/stage/f/ut_rest.c b/jets/stage/f/ut_rest.c index 1134ffeb2d..81edd85dfc 100644 --- a/jets/stage/f/ut_rest.c +++ b/jets/stage/f/ut_rest.c @@ -16,7 +16,7 @@ u3_noun i_leg = u3h(leg); u3_noun t_leg = u3t(leg); - return u3nc(u3qfu__stage_play(van, u3h(i_leg), u3t(i_leg)), + return u3nc(u3qfu_play(van, u3h(i_leg), u3t(i_leg)), _rest_in_list(van, t_leg)); } } @@ -25,8 +25,8 @@ _rest_in_stil(u3_noun van, u3_noun gar) { - u3_noun gun = u3qdi__stage_gas(u3_nul, gar); - u3_noun yed = u3qdi__stage_tap(gun); + u3_noun gun = u3qdi_gas(u3_nul, gar); + u3_noun yed = u3qdi_tap(gun); u3z(gun); return yed; @@ -38,7 +38,7 @@ { u3_noun gar = _rest_in_list(van, leg); u3_noun yed = _rest_in_stil(van, gar); - u3_noun fub = u3qf__stage_fork(yed); + u3_noun fub = u3qf_fork(yed); u3z(gar); u3z(yed); @@ -53,7 +53,7 @@ if ( u3_nul == leg ) { return c3n; } else { - return c3o(u3qdi__stage_has(fan, u3h(leg)), + return c3o(u3qdi_has(fan, u3h(leg)), _rest_hit_fan(fan, u3t(leg))); } } @@ -63,14 +63,14 @@ u3_noun sut, u3_noun leg) { - u3_noun fan = u3r_at(u3qfu__stage_van_fan, van); + u3_noun fan = u3r_at(u3qfu_van_fan, van); if ( c3y == _rest_hit_fan(fan, leg) ) { return u3m_error("rest-loop"); } else { - u3_noun naf = u3qdi__stage_gas(fan, leg); - u3_noun nav = u3i_molt(u3k(van), u3qfu__stage_van_fan, u3k(naf), 0); + u3_noun naf = u3qdi_gas(fan, leg); + u3_noun nav = u3i_molt(u3k(van), u3qfu_van_fan, u3k(naf), 0); u3_noun mez = _rest_in(nav, leg); u3z(naf); @@ -82,7 +82,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_rest(u3_noun cor) + u3wfu_rest(u3_noun cor) { u3_noun sut, leg, van; @@ -96,11 +96,11 @@ } u3_noun - u3qfu__stage_rest(u3_noun van, + u3qfu_rest(u3_noun van, u3_noun sut, u3_noun leg) { - c3_m fun_m = 200 + c3__rest + ((!!u3r_at(u3qfu__stage_van_vet, van)) << 8); + c3_m fun_m = 141 + c3__rest + ((!!u3r_at(u3qfu_van_vet, van)) << 8); u3_noun pro = u3z_find_2(fun_m, sut, leg); if ( u3_none != pro ) { diff --git a/jets/stage/f/ut_tack.c b/jets/stage/f/ut_tack.c index 5ebf7736bf..9328c43aee 100644 --- a/jets/stage/f/ut_tack.c +++ b/jets/stage/f/ut_tack.c @@ -4,13 +4,13 @@ #include "all.h" u3_noun - u3qfu__stage_tack(u3_noun van, + u3qfu_tack(u3_noun van, u3_noun sut, u3_noun hyp, u3_noun mur) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); - u3_noun gat = u3j_cook("u3qfu__stage_tack-tack", von, "tack"); + u3_noun gat = u3j_cook("u3qfu_tack-tack", von, "tack"); return u3n_kick_on(u3i_molt(gat, u3x_sam_2, diff --git a/jets/stage/f/ut_toss.c b/jets/stage/f/ut_toss.c index 84a90190ee..15973cf581 100644 --- a/jets/stage/f/ut_toss.c +++ b/jets/stage/f/ut_toss.c @@ -21,7 +21,7 @@ u3_noun pi_men = u3h(i_men); u3_noun qi_men = u3t(i_men); u3_noun t_men = u3t(men); - u3_noun geq = u3qfu__stage_tack(van, pi_men, peh, mur); + u3_noun geq = u3qfu_tack(van, pi_men, peh, mur); u3_noun p_geq = u3h(geq); u3_noun q_geq = u3t(geq); u3_noun mox = _toss_in(van, sut, peh, mur, t_men); @@ -45,7 +45,7 @@ /* functions */ - static u3_noun + u3_noun _cqfu_toss(u3_noun van, u3_noun sut, u3_noun peh, @@ -69,7 +69,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_toss(u3_noun cor) + u3wfu_toss(u3_noun cor) { u3_noun van, sut, peh, mur, men; @@ -87,7 +87,7 @@ } u3_noun - u3qfu__stage_toss(u3_noun van, + u3qfu_toss(u3_noun van, u3_noun sut, u3_noun peh, u3_noun mur, diff --git a/jets/stage/f/ut_wrap.c b/jets/stage/f/ut_wrap.c index 85ef1458e6..e51d3843f1 100644 --- a/jets/stage/f/ut_wrap.c +++ b/jets/stage/f/ut_wrap.c @@ -55,15 +55,15 @@ } case c3__fork: p_sut = u3t(sut); { - u3_noun yed = u3qdi__stage_tap(p_sut); - u3_noun ret = u3kf__stage_fork(_wrap_fork(van, yed, yoz)); + u3_noun yed = u3qdi_tap(p_sut); + u3_noun ret = u3kf_fork(_wrap_fork(van, yed, yoz)); u3z(yed); return ret; } case c3__hold: { - u3_noun fop = u3qfu__stage_repo(van, sut); + u3_noun fop = u3qfu_repo(van, sut); u3_noun pro = _cqfu_wrap(van, fop, yoz); u3z(fop); @@ -75,7 +75,7 @@ /* boilerplate */ u3_noun - u3wfu__stage_wrap(u3_noun cor) + u3wfu_wrap(u3_noun cor) { u3_noun sut, yoz, van; @@ -89,7 +89,7 @@ } u3_noun - u3qfu__stage_wrap(u3_noun van, + u3qfu_wrap(u3_noun van, u3_noun sut, u3_noun yoz) { diff --git a/jets/tree.c b/jets/tree.c index 54cacc9ad4..c2bb9b6f70 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -220,15 +220,6 @@ static c3_c* _141_pen_look_ha[] = {0}; static u3j_harm _141_pen_loot_a[] = {{".2", u3wf_loot}, {}}; static c3_c* _141_pen_loot_ha[] = {0}; -// mug staging -// -static u3j_harm _141_pen_stage_fork_a[] = {{".2", u3wf__stage_fork}, {}}; -static c3_c* _141_pen_stage_fork_ha[] = {0}; -static u3j_harm _141_pen_stage_look_a[] = {{".2", u3wf__stage_look}, {}}; -static c3_c* _141_pen_stage_look_ha[] = {0}; -static u3j_harm _141_pen_stage_loot_a[] = {{".2", u3wf__stage_loot}, {}}; -static c3_c* _141_pen_stage_loot_ha[] = {0}; - static u3j_harm _141_pen__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; static c3_c* _141_pen__ut_crop_ha[] = {0}; static u3j_harm _141_pen__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; @@ -273,11 +264,11 @@ static u3j_core _141_pen__ut_d[] = { "wrap", 7, _141_pen__ut_wrap_a, 0, _141_pen__ut_wrap_ha }, {} }; - static u3j_harm _141_pen__ut_a[] = { {"repo", u3wfu_repo}, {} }; + static c3_c* _141_pen__ut_ha[] = {0}; static u3j_hood _141_pen__ut_ho[] = { @@ -326,106 +317,6 @@ static u3j_hood _141_pen__ut_ho[] = { {}, }; -// mug staging -// - - static u3j_harm _141_pen__ut_stage_crop_a[] = {{".2", u3wfu__stage_crop}, {}}; - static c3_c* _141_pen__ut_stage_crop_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_fire_a[] = {{".2", u3wfu__stage_fire}, {}}; - static c3_c* _141_pen__ut_stage_fire_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_fish_a[] = {{".2", u3wfu__stage_fish}, {}}; - static c3_c* _141_pen__ut_stage_fish_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_fond_a[] = {{".2", u3wfu__stage_fond}, {}}; - static c3_c* _141_pen__ut_stage_fond_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_fuse_a[] = {{".2", u3wfu__stage_fuse}, {}}; - static c3_c* _141_pen__ut_stage_fuse_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_mint_a[] = {{".2", u3wfu__stage_mint}, {}}; - static c3_c* _141_pen__ut_stage_mint_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_mull_a[] = {{".2", u3wfu__stage_mull}, {}}; - static c3_c* _141_pen__ut_stage_mull_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_nest_a[] = {{".2", u3wfu__stage_nest}, {}}; - static c3_c* _141_pen__ut_stage_nest_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_peek_a[] = {{".2", u3wfu__stage_peek}, {}}; - static c3_c* _141_pen__ut_stage_peek_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_play_a[] = {{".2", u3wfu__stage_play}, {}}; - static c3_c* _141_pen__ut_stage_play_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_rest_a[] = {{".2", u3wfu__stage_rest}, {}}; - static c3_c* _141_pen__ut_stage_rest_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_toss_a[] = {{".2", u3wfu__stage_toss}, {}}; - static c3_c* _141_pen__ut_stage_toss_ha[] = {0}; - static u3j_harm _141_pen__ut_stage_wrap_a[] = {{".2", u3wfu__stage_wrap}, {}}; - static c3_c* _141_pen__ut_stage_wrap_ha[] = {0}; - -static u3j_core _141_pen__stage_ut_d[] = - { - { "crop", 7, _141_pen__ut_stage_crop_a, 0, _141_pen__ut_stage_crop_ha }, - { "fond", 7, _141_pen__ut_stage_fond_a, 0, _141_pen__ut_stage_fond_ha }, - { "fire", 7, _141_pen__ut_stage_fire_a, 0, _141_pen__ut_stage_fire_ha }, - { "fish", 7, _141_pen__ut_stage_fish_a, 0, _141_pen__ut_stage_fish_ha }, - { "fuse", 7, _141_pen__ut_stage_fuse_a, 0, _141_pen__ut_stage_fuse_ha }, - { "mint", 7, _141_pen__ut_stage_mint_a, 0, _141_pen__ut_stage_mint_ha }, - { "mull", 7, _141_pen__ut_stage_mull_a, 0, _141_pen__ut_stage_mull_ha }, - { "nest", 7, _141_pen__ut_stage_nest_a, 0, _141_pen__ut_stage_nest_ha }, - { "peek", 7, _141_pen__ut_stage_peek_a, 0, _141_pen__ut_stage_peek_ha }, - { "play", 7, _141_pen__ut_stage_play_a, 0, _141_pen__ut_stage_play_ha }, - { "rest", 7, _141_pen__ut_stage_rest_a, 0, _141_pen__ut_stage_rest_ha }, - { "toss", 7, _141_pen__ut_stage_toss_a, 0, _141_pen__ut_stage_toss_ha }, - { "wrap", 7, _141_pen__ut_stage_wrap_a, 0, _141_pen__ut_stage_wrap_ha }, - {} - }; - -static u3j_harm _141_pen__stage_ut_a[] = - { {"repo", u3wfu_repo}, - {} - }; -static c3_c* _141_pen__stage_ut_ha[] = {0}; - -static u3j_hood _141_pen__stage_ut_ho[] = { - // %ar ar - { "fan", 28, c3n }, - { "rib", 58, c3n }, - { "vet", 118, c3n }, - { "fab", 119, c3n }, - - { "blow", 49131 }, - // %burp burp - { "busk", 0x5ff57 }, - { "buss", 94 }, - { "crop", 4 }, - { "duck", 48087 }, - { "dune", 1524 }, - { "dunk", 763 }, - { "epla", 12283 }, - { "emin", 5998 }, - { "emul", 86 }, - // %feel feel - { "felt", 24046 }, - { "fine", 3004 }, - { "fire", 700 }, - { "fish", 1498 }, - { "fond", 92 }, - { "fund", 1402 }, - { "funk", 0x1757c, c3y, 31 }, - { "fuse", 1534 }, - { "gain", 748 }, - { "lose", 22 }, - // %mile mile - // %mine mine - { "mint", 0x17fd4 }, - { "moot", 2807 }, - { "mull", 11995 }, - { "nest", 380 }, - { "peel", 5999 }, - { "play", 12022 }, - { "peek", 5996 }, - { "repo", 3050 }, - { "rest", 382 }, - { "tack", 351 }, - { "toss", 24042 }, - { "wrap", 6143 }, - {}, -}; - // XX figure out why this is disabled #if 0 static u3j_harm _141_pen__ap_a[] = @@ -456,17 +347,13 @@ static u3j_core _141_pen_d[] = { "flip", 7, _141_pen_flip_a, 0, _141_pen_flip_ha }, { "flor", 7, _141_pen_flor_a, 0, _141_pen_flor_ha }, { "fork", 7, _141_pen_fork_a, 0, _141_pen_fork_ha }, - { "stage-fork", 7, _141_pen_stage_fork_a, 0, _141_pen_stage_fork_ha }, // { "hike", 7, _141_pen_hike_a, 0, _141_pen_hike_ha }, { "look", 7, _141_pen_look_a, 0, _141_pen_look_ha }, - { "stage-look", 7, _141_pen_stage_look_a, 0, _141_pen_stage_look_ha }, { "loot", 7, _141_pen_loot_a, 0, _141_pen_loot_ha }, - { "stage-loot", 7, _141_pen_stage_loot_a, 0, _141_pen_stage_loot_ha }, // { "ap", 7, _141_pen__ap_a, 0, _141_pen__ap_ha }, // { "al", 7, _141_pen__al_a, 0, _141_pen__al_ha }, { "ut", 15, _141_pen__ut_a, _141_pen__ut_d, _141_pen__ut_ha, _141_pen__ut_ho }, - { "stage-ut", 15, _141_pen__stage_ut_a, _141_pen__stage_ut_d, _141_pen__stage_ut_ha, _141_pen__stage_ut_ho }, {} }; static c3_c* _141_pen_ha[] = {0}; @@ -965,15 +852,6 @@ static c3_c* _141_two_sqt_ha[] = {0}; static u3j_harm _141_two_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}}; static c3_c* _141_two_xeb_ha[] = {0}; -// mug staging -// -static u3j_harm _141_two_stage_gor_a[] = {{".2", u3wc__stage_gor, c3y}, {}}; -static c3_c* _141_two_stage_gor_ha[] = {0}; -static u3j_harm _141_two_stage_hor_a[] = {{".2", u3wc__stage_hor, c3y}, {}}; -static c3_c* _141_two_stage_hor_ha[] = {0}; -static u3j_harm _141_two_stage_vor_a[] = {{".2", u3wc__stage_vor, c3y}, {}}; -static c3_c* _141_two_stage_vor_ha[] = {0}; - static u3j_harm _141_two__in_bif_a[] = {{".2", u3wdi_bif}, {}}; static c3_c* _141_two__in_bif_ha[] = {0}; static u3j_harm _141_two__in_del_a[] = {{".2", u3wdi_del}, {}}; @@ -1015,40 +893,6 @@ static u3j_core _141_two__in_d[] = }; static c3_c* _141_two__in_ha[] = {0}; -// mug staging -// - - static u3j_harm _141_two__stage_in_bif_a[] = {{".2", u3wdi__stage_bif}, {}}; - static c3_c* _141_two__stage_in_bif_ha[] = {0}; - static u3j_harm _141_two__stage_in_del_a[] = {{".2", u3wdi__stage_del}, {}}; - static c3_c* _141_two__stage_in_del_ha[] = {0}; - static u3j_harm _141_two__stage_in_dif_a[] = {{".2", u3wdi__stage_dif}, {}}; - static c3_c* _141_two__stage_in_dif_ha[] = {0}; - static u3j_harm _141_two__stage_in_gas_a[] = {{".2", u3wdi__stage_gas}, {}}; - static c3_c* _141_two__stage_in_gas_ha[] = {0}; - static u3j_harm _141_two__stage_in_has_a[] = {{".2", u3wdi__stage_has}, {}}; - static c3_c* _141_two__stage_in_has_ha[] = {0}; - static u3j_harm _141_two__stage_in_mer_a[] = {{".2", u3wdi__stage_mer}, {}}; - static c3_c* _141_two__stage_in_mer_ha[] = {0}; - static u3j_harm _141_two__stage_in_put_a[] = {{".2", u3wdi__stage_put}, {}}; - static c3_c* _141_two__stage_in_put_ha[] = {0}; - static u3j_harm _141_two__stage_in_uni_a[] = {{".2", u3wdi__stage_uni}, {}}; - static c3_c* _141_two__stage_in_uni_ha[] = {0}; -static u3j_core _141_two__stage_in_d[] = - { { "bif", 7, _141_two__stage_in_bif_a, 0, _141_two__stage_in_bif_ha }, - { "del", 7, _141_two__stage_in_del_a, 0, _141_two__stage_in_del_ha }, - { "dif", 7, _141_two__stage_in_dif_a, 0, _141_two__stage_in_dif_ha }, - { "gas", 7, _141_two__stage_in_gas_a, 0, _141_two__stage_in_gas_ha }, - { "has", 7, _141_two__stage_in_has_a, 0, _141_two__stage_in_has_ha }, - { "mer", 7, _141_two__stage_in_mer_a, 0, _141_two__stage_in_mer_ha }, - { "put", 7, _141_two__stage_in_put_a, 0, _141_two__stage_in_put_ha }, - { "tap", 7, _141_two__in_tap_a, 0, _141_two__in_tap_ha }, - { "uni", 7, _141_two__stage_in_uni_a, 0, _141_two__stage_in_uni_ha }, - { "wyt", 7, _141_two__in_wyt_a, 0, _141_two__in_wyt_ha }, - {} - }; -static c3_c* _141_two__stage_in_ha[] = {0}; - static u3j_harm _141_two__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}}; static c3_c* _141_two__by_bif_ha[] = {0}; static u3j_harm _141_two__by_del_a[] = {{".2", u3wdb_del, c3y}, {}}; @@ -1093,43 +937,6 @@ static u3j_core _141_two__by_d[] = }; static c3_c* _141_two__by_ha[] = {0}; -// mug staging -// - - static u3j_harm _141_two__stage_by_bif_a[] = {{".2", u3wdb__stage_bif, c3y}, {}}; - static c3_c* _141_two__stage_by_bif_ha[] = {0}; - static u3j_harm _141_two__stage_by_del_a[] = {{".2", u3wdb__stage_del, c3y}, {}}; - static c3_c* _141_two__stage_by_del_ha[] = {0}; - static u3j_harm _141_two__stage_by_dif_a[] = {{".2", u3wdb__stage_dif, c3y}, {}}; - static c3_c* _141_two__stage_by_dif_ha[] = {0}; - static u3j_harm _141_two__stage_by_gas_a[] = {{".2", u3wdb__stage_gas, c3y}, {}}; - static c3_c* _141_two__stage_by_gas_ha[] = {0}; - static u3j_harm _141_two__stage_by_get_a[] = {{".2", u3wdb__stage_get, c3y}, {}}; - static c3_c* _141_two__stage_by_get_ha[] = {0}; - static u3j_harm _141_two__stage_by_has_a[] = {{".2", u3wdb__stage_has, c3y}, {}}; - static c3_c* _141_two__stage_by_has_ha[] = {0}; - - static u3j_harm _141_two__stage_by_jab_a[] = {{".2", u3wdb__stage_jab, c3y}, {}}; - static c3_c* _141_two__stage_by_jab_ha[] = {0}; - static u3j_harm _141_two__stage_by_put_a[] = {{".2", u3wdb__stage_put, c3y}, {}}; - static c3_c* _141_two__stage_by_put_ha[] = {0}; - static u3j_harm _141_two__stage_by_tap_a[] = {{".2", u3wdb__stage_tap, c3y}, {}}; - static c3_c* _141_two__stage_by_tap_ha[] = {0}; - -static u3j_core _141_two__stage_by_d[] = - { { "bif", 7, _141_two__stage_by_bif_a, 0, _141_two__stage_by_bif_ha }, - { "del", 7, _141_two__stage_by_del_a, 0, _141_two__stage_by_del_ha }, - { "dif", 7, _141_two__stage_by_dif_a, 0, _141_two__stage_by_dif_ha }, - { "gas", 7, _141_two__stage_by_gas_a, 0, _141_two__stage_by_gas_ha }, - { "get", 7, _141_two__stage_by_get_a, 0, _141_two__stage_by_get_ha }, - { "has", 7, _141_two__stage_by_has_a, 0, _141_two__stage_by_has_ha }, - { "jab", 7, _141_two__stage_by_jab_a, 0, _141_two__stage_by_jab_ha }, - { "put", 7, _141_two__stage_by_put_a, 0, _141_two__stage_by_put_ha }, - { "tap", 7, _141_two__stage_by_tap_a, 0, _141_two__stage_by_tap_ha }, - {} - }; -static c3_c* _141_two__stage_by_ha[] = {0}; - static u3j_harm _141_two_cue_a[] = {{".2", u3we_cue}, {}}; static c3_c* _141_two_cue_ha[] = {0}; static u3j_harm _141_two_jam_a[] = {{".2", u3we_jam}, {}}; @@ -1173,9 +980,7 @@ static u3j_core _141_two_d[] = { "dvr", 7, _141_two_dvr_a, 0, _141_two_dvr_ha }, { "end", 7, _141_two_end_a, 0, _141_two_end_ha }, { "gor", 7, _141_two_gor_a, 0, _141_two_gor_ha }, - { "stage-gor", 7, _141_two_stage_gor_a, 0, _141_two_stage_gor_ha }, { "hor", 7, _141_two_hor_a, 0, _141_two_hor_ha }, - { "stage-hor", 7, _141_two_stage_hor_a, 0, _141_two_stage_hor_ha }, { "jam", 7, _141_two_jam_a, 0, _141_two_jam_ha }, { "lsh", 7, _141_two_lsh_a, 0, _141_two_lsh_ha }, { "mas", 7, _141_two_mas_a, 0, _141_two_mas_ha }, @@ -1198,13 +1003,10 @@ static u3j_core _141_two_d[] = // temporary alias for staging +vor -> +mor // { "vor", 7, _141_two_mor_a, 0, _141_two_mor_ha }, - { "stage-vor", 7, _141_two_stage_vor_a, 0, _141_two_stage_vor_ha }, { "xeb", 7, _141_two_xeb_a, 0, _141_two_xeb_ha }, { "by", 7, 0, _141_two__by_d, _141_two__by_ha }, - { "stage-by", 7, 0, _141_two__stage_by_d, _141_two__stage_by_ha }, { "in", 7, 0, _141_two__in_d, _141_two__in_ha }, - { "stage-in", 7, 0, _141_two__stage_in_d, _141_two__stage_in_ha }, {} }; static c3_c* _141_two_ha[] = {0}; diff --git a/meson.build b/meson.build index 7ba1d8be16..d62e1067ea 100644 --- a/meson.build +++ b/meson.build @@ -75,11 +75,7 @@ jets_c_src = [ 'jets/c/rip.c', 'jets/c/rsh.c', 'jets/c/swp.c', -'jets/c/sqt.c', - -'jets/stage/c/gor.c', -'jets/stage/c/hor.c', -'jets/stage/c/vor.c', +'jets/c/sqt.c' ] jets_d_src = [ @@ -103,25 +99,7 @@ jets_d_src = [ 'jets/d/by_put.c', 'jets/d/by_uni.c', 'jets/d/by_bif.c', -'jets/d/by_dif.c', - -'jets/stage/d/in_bif.c', -'jets/stage/d/in_del.c', -'jets/stage/d/in_dif.c', -'jets/stage/d/in_gas.c', -'jets/stage/d/in_has.c', -'jets/stage/d/in_mer.c', -'jets/stage/d/in_put.c', -'jets/stage/d/in_uni.c', - -'jets/stage/d/by_bif.c', -'jets/stage/d/by_del.c', -'jets/stage/d/by_dif.c', -'jets/stage/d/by_gas.c', -'jets/stage/d/by_get.c', -'jets/stage/d/by_has.c', -'jets/stage/d/by_jab.c', -'jets/stage/d/by_put.c', +'jets/d/by_dif.c' ] jets_e_src = [ @@ -176,11 +154,7 @@ jets_f_src = [ 'jets/f/hint.c', 'jets/f/hike.c', 'jets/f/look.c', -'jets/f/loot.c', - -'jets/stage/f/fork.c', -'jets/stage/f/look.c', -'jets/stage/f/loot.c' +'jets/f/loot.c' ] jets_f_ut_src = [ @@ -203,28 +177,7 @@ jets_f_ut_src = [ 'jets/f/ut_rest.c', 'jets/f/ut_tack.c', 'jets/f/ut_toss.c', -'jets/f/ut_wrap.c', - -'jets/stage/f/ut.c', -'jets/stage/f/ut_buss.c', -'jets/stage/f/ut_crop.c', -'jets/stage/f/ut_find.c', -'jets/stage/f/ut_fire.c', -'jets/stage/f/ut_fish.c', -'jets/stage/f/ut_fuse.c', -'jets/stage/f/ut_gain.c', -'jets/stage/f/ut_lose.c', -'jets/stage/f/ut_mint.c', -'jets/stage/f/ut_mull.c', -'jets/stage/f/ut_nest.c', -'jets/stage/f/ut_peek.c', -'jets/stage/f/ut_peel.c', -'jets/stage/f/ut_play.c', -'jets/stage/f/ut_repo.c', -'jets/stage/f/ut_rest.c', -'jets/stage/f/ut_tack.c', -'jets/stage/f/ut_toss.c', -'jets/stage/f/ut_wrap.c', +'jets/f/ut_wrap.c' ] jets_src = [