diff --git a/Makefile b/Makefile index a38ca453db..36bf91721c 100644 --- a/Makefile +++ b/Makefile @@ -334,7 +334,8 @@ $(BIN)/meme: f/meme.o \ $(J164_1_OFILES) \ $(J164_2_OFILES) \ $(J164_3_OFILES) \ - $(J164_4_OFILES) + $(J164_4_OFILES) \ + $(J164_5_OFILES) $(CC) -g $< -lgmp -o $@ tags: diff --git a/gen164/5/aesc.c b/gen164/5/aesc.c index 5eb0baa280..ab9c6bd5a4 100644 --- a/gen164/5/aesc.c +++ b/gen164/5/aesc.c @@ -19,7 +19,7 @@ /* functions */ u2_weak - j2_mcd(Pt5, aesc, en)(u2_wire wir_r, + j2_mcd(Pt5, aesc, en)( u2_atom a, u2_atom b) { @@ -42,12 +42,12 @@ kCCOptionECBMode, a_y, kCCKeySizeAES256, 0, b_y, 16, b_y, 16, &siz_i) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else c3_assert(16 == siz_i); #else if ( 0 != AES_set_encrypt_key(a_y, 256, &key_u) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { AES_encrypt(b_y, b_y, &key_u); @@ -58,24 +58,24 @@ } u2_weak - j2_mc(Pt5, aesc, en)(u2_wire wir_r, + j2_mc(Pt5, aesc, en)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, aesc, en)(wir_r, a, b); + return j2_mcd(Pt5, aesc, en)(a, b); } } u2_weak - j2_mcd(Pt5, aesc, de)(u2_wire wir_r, + j2_mcd(Pt5, aesc, de)( u2_atom a, u2_atom b) { @@ -98,12 +98,12 @@ kCCOptionECBMode, a_y, kCCKeySizeAES256, 0, b_y, 16, b_y, 16, &siz_i) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else c3_assert(16 == siz_i); #else if ( 0 != AES_set_decrypt_key(a_y, 256, &key_u) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { AES_decrypt(b_y, b_y, &key_u); @@ -114,19 +114,19 @@ } u2_weak - j2_mc(Pt5, aesc, de)(u2_wire wir_r, + j2_mc(Pt5, aesc, de)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, aesc, de)(wir_r, a, b); + return j2_mcd(Pt5, aesc, de)(a, b); } } diff --git a/gen164/5/co_emco.c b/gen164/5/co_emco.c index 67d0cf4f81..0ec00a5fe6 100644 --- a/gen164/5/co_emco.c +++ b/gen164/5/co_emco.c @@ -14,7 +14,7 @@ */ u2_weak - j2_md(Pt5, coco, co, emco)(u2_wire wir_r, + j2_md(Pt5, coco, co, emco)( u2_noun cor) { u2_atom bas, min; @@ -23,13 +23,13 @@ u2_atom hol = 0; mpz_t bas_mp, dar_mp, hol_mp, rad_mp; - if ( u2_no == u2_mean(cor, u2_cv_sam_4, &bas, + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_4, &bas, u2_cv_sam_5, &min, u2_cv_sam_3, &par, u2_cv_sam_6, &rex, 0) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } while ( 1 ) { @@ -37,8 +37,8 @@ return rex; } - u2_mp(bas_mp, bas); - u2_mp(hol_mp, hol); + u2_cr_mp(bas_mp, bas); + u2_cr_mp(hol_mp, hol); mpz_tdiv_q(rad_mp, hol_mp, bas_mp); mpz_tdiv_r(dar_mp, hol_mp, bas_mp); @@ -47,7 +47,7 @@ min--; } - u2_rl_mp(hol, dar_mp); + u2_ci_mp(hol, dar_mp); // rex (par =(0 dar) rad rex) } diff --git a/gen164/5/co_oxco.c b/gen164/5/co_oxco.c index 4fece9d934..047552e82e 100644 --- a/gen164/5/co_oxco.c +++ b/gen164/5/co_oxco.c @@ -9,17 +9,17 @@ /* functions */ u2_weak - j2_md(Pt5, coco, co, oxco)(u2_wire wir_r, + j2_md(Pt5, coco, co, oxco)( u2_noun cor) { u2_atom bas, gop; u2_noun dug; - if ( u2_no == u2_mean(cor, u2_cv_sam_4, &bas, + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_4, &bas, u2_cv_sam_5, &gop, u2_cv_sam_3, &dug, 0) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } return 0; diff --git a/gen164/5/co_roco.c b/gen164/5/co_roco.c index bdcf17b254..d63a5163c9 100644 --- a/gen164/5/co_roco.c +++ b/gen164/5/co_roco.c @@ -9,7 +9,7 @@ /* functions */ u2_weak - j2_md(Pt5, coco, co, roco)(u2_wire wir_r, + j2_md(Pt5, coco, co, roco)( u2_noun cor) { /* tree axes */ @@ -18,12 +18,12 @@ /* dop => 11 */ /* dug => 3 */ - /* if ( u2_no == u2_mean(cor, u2_cv_sam_4, &bas, */ + /* if ( u2_no == u2_cr_mean(cor, u2_cv_sam_4, &bas, */ /* u2_cv_sam_5, &min, */ /* u2_cv_sam_3, &par, */ /* 0) ) */ /* { */ - /* return u2_bl_bail(wir_r, c3__exit); */ + /* return u2_cm_bail(c3__exit); */ /* } */ return 0; diff --git a/gen164/5/cue.c b/gen164/5/cue.c index 95a5883730..b68859be34 100644 --- a/gen164/5/cue.c +++ b/gen164/5/cue.c @@ -11,89 +11,89 @@ struct u2_nash* T_r; static u2_noun // produce - _cue_in(u2_wire wir_r, + _cue_in( u2_atom a, // retain u2_atom b) // retain { u2_noun p, q; - if ( _0 == j2_mbc(Pt3, cut)(wir_r, 0, b, 1, a) ) { - u2_noun x = j2_mbc(Pt1, inc)(wir_r, b); - u2_noun c = j2_mby(Pt5, rub)(wir_r, x, a); + if ( 0 == j2_mbc(Pt3, cut)(0, b, 1, a) ) { + u2_noun x = j2_mbc(Pt1, inc)(b); + u2_noun c = j2_mby(Pt5, rub)(x, a); - p = j2_mbc(Pt1, inc)(wir_r, u2_h(c)); - q = u2_rx(wir_r, u2_t(c)); + p = j2_mbc(Pt1, inc)(u2h(c)); + q = u2k(u2t(c)); u2_na_put(T_r, b, (void*)(c3_p)q); - u2_rz(wir_r, c); - u2_rz(wir_r, x); + u2z(c); + u2z(x); } else { - u2_noun c = j2_mbc(Pt1, add)(wir_r, _2, b); - u2_noun l = j2_mbc(Pt1, inc)(wir_r, b); + u2_noun c = j2_mbc(Pt1, add)(2, b); + u2_noun l = j2_mbc(Pt1, inc)(b); - if ( _0 == j2_mbc(Pt3, cut)(wir_r, 0, l, 1, a) ) { + if ( 0 == j2_mbc(Pt3, cut)(0, l, 1, a) ) { u2_noun u, v, w; u2_noun x, y; - u = _cue_in(wir_r, a, c); - x = j2_mbc(Pt1, add)(wir_r, u2_h(u), c); - v = _cue_in(wir_r, a, x); + u = _cue_in(a, c); + x = j2_mbc(Pt1, add)(u2h(u), c); + v = _cue_in(a, x); - w = u2_bc(wir_r, u2_rx(wir_r, u2_h(u2_t(u))), - u2_rx(wir_r, u2_h(u2_t(v)))); + w = u2nc(u2k(u2h(u2t(u))), + u2k(u2h(u2t(v)))); - y = j2_mbc(Pt1, add)(wir_r, u2_h(u), u2_h(v)); + y = j2_mbc(Pt1, add)(u2h(u), u2h(v)); - p = j2_mbc(Pt1, add)(wir_r, _2, y); + p = j2_mbc(Pt1, add)(2, y); q = w; u2_na_put(T_r, b, (void*)(c3_p)q); - u2_rz(wir_r, u); u2_rz(wir_r, v); u2_rz(wir_r, x); u2_rz(wir_r, y); + u2z(u); u2z(v); u2z(x); u2z(y); } else { - u2_noun d = j2_mby(Pt5, rub)(wir_r, c, a); - u2_noun x = u2_na_get(T_r, u2_t(d)); + u2_noun d = j2_mby(Pt5, rub)(c, a); + u2_noun x = u2_na_get(T_r, u2t(d)); - p = j2_mbc(Pt1, add)(wir_r, _2, u2_h(d)); + p = j2_mbc(Pt1, add)(2, u2h(d)); if ( u2_none == x ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } - q = u2_rx(wir_r, x); + q = u2k(x); - u2_rz(wir_r, d); + u2z(d); } - u2_rz(wir_r, l); - u2_rz(wir_r, c); + u2z(l); + u2z(c); } - return u2_bt(wir_r, p, q, 0); + return u2nt(p, q, 0); } u2_noun // transfer - j2_mby(Pt5, cue)(u2_wire wir_r, + j2_mby(Pt5, cue)( u2_atom a) // retain { T_r = u2_na_make(); - u2_noun x = _cue_in(wir_r, a, _0); - u2_noun y = u2_rx(wir_r, u2_h(u2_t(x))); + u2_noun x = _cue_in(a, 0); + u2_noun y = u2k(u2h(u2t(x))); u2_na_take(T_r); T_r = 0; - u2_rz(wir_r, x); + u2z(x); return y; } u2_noun // transfer - j2_mb(Pt5, cue)(u2_wire wir_r, + j2_mb(Pt5, cue)( u2_noun cor) // retain { u2_noun a; - if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ) { + return u2_cm_bail(c3__fail); } else { - return j2_mby(Pt5, cue)(wir_r, a); + return j2_mby(Pt5, cue)(a); } } diff --git a/gen164/5/ed_puck.c b/gen164/5/ed_puck.c index 0804ac93bf..a379c47ec2 100644 --- a/gen164/5/ed_puck.c +++ b/gen164/5/ed_puck.c @@ -10,22 +10,22 @@ /* functions */ u2_weak - j2_md(Pt5, coed, ed, puck)(u2_wire wir_r, + j2_md(Pt5, coed, ed, puck)( u2_noun cor) { c3_y pub_y[32]; c3_y sec_y[64]; c3_y sed_y[32]; c3_w met_w; - u2_noun a = u2_frag(u2_cv_sam, cor); + u2_noun a = u2_cr_at(u2_cv_sam, cor); - if ( (u2_none == a) || (u2_no == u2_stud(a)) ) { - return u2_bl_bail(wir_r, c3__exit); + if ( (u2_none == a) || (u2_no == u2ud(a)) ) { + return u2_cm_bail(c3__exit); } - met_w = u2_met(3, a); + met_w = u2_cr_met(3, a); if ( met_w > 32 ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } memset(sed_y, 0, 32); diff --git a/gen164/5/ed_sign.c b/gen164/5/ed_sign.c index 29e1c8b81b..b706c1879f 100644 --- a/gen164/5/ed_sign.c +++ b/gen164/5/ed_sign.c @@ -10,7 +10,7 @@ /* functions */ u2_weak // transfer - j2_mcc(Pt5, ed, sign)(u2_wire wir_r, + j2_mcc(Pt5, ed, sign)( u2_noun a, // retain u2_noun b) // retain { @@ -19,8 +19,8 @@ c3_y pub_y[64]; c3_y sec_y[64]; - c3_w mesm_w = u2_met(3, a); - c3_w mess_w = u2_met(3, b); + c3_w mesm_w = u2_cr_met(3, a); + c3_w mess_w = u2_cr_met(3, b); c3_y* mes_y = 0; @@ -40,15 +40,15 @@ return u2_ci_bytes(64, sig_y); } u2_weak - j2_md(Pt5, coed, ed, sign)(u2_wire wir_r, + j2_md(Pt5, coed, ed, sign)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcc(Pt5, ed, sign)(wir_r, a, b); + return j2_mcc(Pt5, ed, sign)(a, b); } } /* structures diff --git a/gen164/5/ed_veri.c b/gen164/5/ed_veri.c index b50e9e75b3..c96d458a72 100644 --- a/gen164/5/ed_veri.c +++ b/gen164/5/ed_veri.c @@ -10,7 +10,7 @@ /* functions */ u2_weak - j2_mdc(Pt5, coed, ed, veri)(u2_wire wir_r, + j2_mdc(Pt5, coed, ed, veri)( u2_noun s, u2_noun m, u2_noun pk) @@ -20,7 +20,7 @@ c3_w ret; c3_y* mes_y; - c3_w mesm_w = u2_met(3, m); + c3_w mesm_w = u2_cr_met(3, m); memset(sig_y, 0, 64); memset(pub_y, 0, 32); @@ -36,16 +36,16 @@ return ret; } u2_weak - j2_md(Pt5, coed, ed, veri)(u2_wire wir_r, + j2_md(Pt5, coed, ed, veri)( u2_noun cor) { u2_noun a, b, c; - if ( u2_no == u2_mean(cor, + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_6, &b, u2_cv_sam_7, &c, 0) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mdc(Pt5, coed, ed, veri)(wir_r, a, b, c); + return j2_mdc(Pt5, coed, ed, veri)(a, b, c); } } diff --git a/gen164/5/jam.c b/gen164/5/jam.c index 237c80c2b1..29235a2b0d 100644 --- a/gen164/5/jam.c +++ b/gen164/5/jam.c @@ -9,90 +9,90 @@ */ struct u2_nash* T_m; static u2_noun - _jam_in(u2_wire, u2_atom, u2_atom, u2_noun); + _jam_in(u2_atom, u2_atom, u2_noun); static u2_noun // produce - _jam_in_pair(u2_wire wir_r, + _jam_in_pair( u2_atom h_a, // retain u2_atom t_a, // retain u2_atom b, // retain u2_noun l) // retain { - u2_noun w = u2_bc(wir_r, u2_bc(wir_r, _2, _1), u2_rx(wir_r, l)); - u2_noun x = j2_mbc(Pt1, add)(wir_r, _2, b); - u2_noun d = _jam_in(wir_r, h_a, x, w); + u2_noun w = u2nc(u2nc(2, 1), u2k(l)); + u2_noun x = j2_mbc(Pt1, add)(2, b); + u2_noun d = _jam_in(h_a, x, w); u2_noun p_d, q_d, r_d; u2_noun r; - u2_as_trel(d, &p_d, &q_d, &r_d); + u2_cr_trel(d, &p_d, &q_d, &r_d); { - u2_noun y = j2_mbc(Pt1, add)(wir_r, x, p_d); - u2_noun e = _jam_in(wir_r, t_a, y, q_d); + u2_noun y = j2_mbc(Pt1, add)(x, p_d); + u2_noun e = _jam_in(t_a, y, q_d); u2_noun p_e, q_e, r_e; - u2_as_trel(e, &p_e, &q_e, &r_e); + u2_cr_trel(e, &p_e, &q_e, &r_e); { - u2_noun z = j2_mbc(Pt1, add)(wir_r, p_d, p_e); + u2_noun z = j2_mbc(Pt1, add)(p_d, p_e); - r = u2_bt - (wir_r, j2_mbc(Pt1, add)(wir_r, _2, z), - u2_rx(wir_r, q_e), + r = u2nt + (j2_mbc(Pt1, add)(2, z), + u2k(q_e), 0); - u2_rz(wir_r, z); + u2z(z); } - u2_rz(wir_r, e); - u2_rz(wir_r, y); + u2z(e); + u2z(y); } - u2_rz(wir_r, d); - u2_rz(wir_r, x); - u2_rz(wir_r, w); + u2z(d); + u2z(x); + u2z(w); return r; } static u2_noun // produce - _jam_in_flat(u2_wire wir_r, + _jam_in_flat( u2_atom a, // retain u2_noun l) // retain { - u2_noun d = j2_mby(Pt5, mat)(wir_r, a); - u2_noun x = j2_mbc(Pt1, add)(wir_r, _1, u2_h(d)); - u2_noun y = u2_bt - (wir_r, u2_rx(wir_r, x), - u2_bc(wir_r, u2_bc(wir_r, + u2_noun d = j2_mby(Pt5, mat)(a); + u2_noun x = j2_mbc(Pt1, add)(1, u2h(d)); + u2_noun y = u2nt + (u2k(x), + u2nc(u2nc( x, - j2_mbc(Pt3, lsh)(wir_r, _0, _1, u2_t(d))), - u2_rx(wir_r, l)), + j2_mbc(Pt3, lsh)(0, 1, u2t(d))), + u2k(l)), 0); - u2_rz(wir_r, d); + u2z(d); return y; } static u2_noun // produce - _jam_in_ptr(u2_wire wir_r, + _jam_in_ptr( u2_atom u_c, // retain u2_noun l) // retain { - u2_noun d = j2_mby(Pt5, mat)(wir_r, u_c); - u2_atom x = j2_mbc(Pt3, lsh)(wir_r, _0, _2, u2_t(d)); - u2_atom y = j2_mbc(Pt1, add)(wir_r, _2, u2_h(d)); - u2_noun z = u2_bt - (wir_r, u2_rx(wir_r, y), - u2_bc(wir_r, u2_bc(wir_r, y, j2_mbc(Pt3, mix)(wir_r, _3, x)), - u2_rx(wir_r, l)), + u2_noun d = j2_mby(Pt5, mat)(u_c); + u2_atom x = j2_mbc(Pt3, lsh)(0, 2, u2t(d)); + u2_atom y = j2_mbc(Pt1, add)(2, u2h(d)); + u2_noun z = u2nt + (u2k(y), + u2nc(u2nc(y, j2_mbc(Pt3, mix)(3, x)), + u2k(l)), 0); - u2_rz(wir_r, d); - u2_rz(wir_r, x); + u2z(d); + u2z(x); return z; } static u2_noun // produce - _jam_in(u2_wire wir_r, + _jam_in( u2_noun a, // retain u2_atom b, // retain u2_noun l) // retain @@ -103,48 +103,48 @@ if ( u2_none == c ) { u2_na_put(T_m, a, (void*)(c3_p)b); - if ( u2_yes == u2_stud(a) ) { - x = _jam_in_flat(wir_r, a, l); + if ( u2_yes == u2ud(a) ) { + x = _jam_in_flat(a, l); } else { - x = _jam_in_pair(wir_r, u2_h(a), u2_t(a), b, l); + x = _jam_in_pair(u2h(a), u2t(a), b, l); } } else { - if ( u2_yes == u2_stud(a) && u2_met(0, a) <= u2_met(0, c) ) { - x = _jam_in_flat(wir_r, a, l); + if ( u2_yes == u2ud(a) && u2_cr_met(0, a) <= u2_cr_met(0, c) ) { + x = _jam_in_flat(a, l); } else { - x = _jam_in_ptr(wir_r, c, l); + x = _jam_in_ptr(c, l); } } return x; } u2_noun // transfer - j2_mby(Pt5, jam)(u2_wire wir_r, + j2_mby(Pt5, jam)( u2_atom a) // retain { T_m = u2_na_make(); - u2_noun x = _jam_in(wir_r, a, _0, u2_nul); - u2_noun q = j2_mbc(Pt2, flop)(wir_r, u2_h(u2_t(x))); - u2_noun r = j2_mbc(Pt3, can)(wir_r, _0, q); + u2_noun x = _jam_in(a, 0, u2_nul); + u2_noun q = j2_mbc(Pt2, flop)(u2h(u2t(x))); + u2_noun r = j2_mbc(Pt3, can)(0, q); - u2_rz(wir_r, x); - u2_rz(wir_r, q); + u2z(x); + u2z(q); u2_na_take(T_m); T_m = NULL; return r; } u2_noun // transfer - j2_mb(Pt5, jam)(u2_wire wir_r, + j2_mb(Pt5, jam)( u2_noun cor) // retain { u2_noun a; - if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ) { + return u2_cm_bail(c3__fail); } else { - return j2_mby(Pt5, jam)(wir_r, a); + return j2_mby(Pt5, jam)(a); } } diff --git a/gen164/5/lore.c b/gen164/5/lore.c index 6f04566cbd..6b8e3efa8a 100644 --- a/gen164/5/lore.c +++ b/gen164/5/lore.c @@ -6,7 +6,7 @@ #include "../pit.h" u2_noun // produce - j2_mbc(Pt5, lore)(u2_wire wir_r, + j2_mbc(Pt5, lore)( u2_atom lub) // retain { c3_w len_w = u2_cr_met(3, lub); @@ -23,7 +23,7 @@ c3_y byt_y; while ( 1 ) { - byt_y = u2_byte(pos_w + meg_w, lub); + byt_y = u2_cr_byte(pos_w + meg_w, lub); if ( (10 == byt_y) || (0 == byt_y) ) { break; @@ -31,13 +31,13 @@ } if ((byt_y == 0) && ((pos_w + meg_w + 1) < len_w)) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } { c3_y* byts_y = alloca(meg_w); - u2_bytes(pos_w, meg_w, byts_y, lub); + u2_cr_bytes(pos_w, meg_w, byts_y, lub); tez = u2nc(u2_ci_bytes(meg_w, byts_y), tez); pos_w += (meg_w + 1); } @@ -46,17 +46,17 @@ } u2_weak // produce - j2_mb(Pt5, lore)(u2_wire wir_r, + j2_mb(Pt5, lore)( u2_noun cor) // retain { u2_noun lub; - if ( (u2_none == (lub = u2_frag(u2_cv_sam, cor))) || + if ( (u2_none == (lub = u2_cr_at(u2_cv_sam, cor))) || (u2_no == u2ud(lub)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mbc(Pt5, lore)(wir_r, lub); + return j2_mbc(Pt5, lore)(lub); } } diff --git a/gen164/5/loss.c b/gen164/5/loss.c index 56d8954fa5..cbcd2b4374 100644 --- a/gen164/5/loss.c +++ b/gen164/5/loss.c @@ -256,7 +256,7 @@ } u2_noun // produce - j2_mbc(Pt5, loss)(u2_wire wir_r, + j2_mbc(Pt5, loss)( u2_noun hel, // retain u2_noun hev) // retain { @@ -282,19 +282,19 @@ } u2_weak // produce - j2_mb(Pt5, loss)(u2_wire wir_r, + j2_mb(Pt5, loss)( u2_noun cor) // retain { u2_noun hel, hev; - if ( (u2_none == (hel = u2_frag(u2_cv_sam_2, cor))) || - (u2_none == (hev = u2_frag(u2_cv_sam_3, cor))) || + if ( (u2_none == (hel = u2_cr_at(u2_cv_sam_2, cor))) || + (u2_none == (hev = u2_cr_at(u2_cv_sam_3, cor))) || (u2_no == _listp(hel)) || (u2_no == _listp(hev)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mbc(Pt5, loss)(wir_r, hel, hev); + return j2_mbc(Pt5, loss)(hel, hev); } } diff --git a/gen164/5/mat.c b/gen164/5/mat.c index 60c9ae5602..9af70a1f76 100644 --- a/gen164/5/mat.c +++ b/gen164/5/mat.c @@ -8,47 +8,47 @@ /* functions */ u2_noun // produce - j2_mby(Pt5, mat)(u2_wire wir_r, + j2_mby(Pt5, mat)( u2_atom a) // retain { - if ( _0 == a ) { - return u2_bc(wir_r, 1, 1); + if ( 0 == a ) { + return u2nc(1, 1); } else { - u2_atom b = j2_mbc(Pt3, met)(wir_r, 0, a); - u2_atom c = j2_mbc(Pt3, met)(wir_r, 0, b); + u2_atom b = j2_mbc(Pt3, met)(0, a); + u2_atom c = j2_mbc(Pt3, met)(0, b); u2_atom u, v, w, x, y, z; u2_atom p, q; - u = j2_mbc(Pt1, dec)(wir_r, c); - v = j2_mbc(Pt1, add)(wir_r, c, c); - w = j2_mbc(Pt3, bex)(wir_r, c); - x = j2_mbc(Pt3, end)(wir_r, _0, u, b); - y = j2_mbc(Pt3, lsh)(wir_r, _0, u, a); - z = j2_mbc(Pt3, mix)(wir_r, x, y); + u = j2_mbc(Pt1, dec)(c); + v = j2_mbc(Pt1, add)(c, c); + w = j2_mbc(Pt3, bex)(c); + x = j2_mbc(Pt3, end)(0, u, b); + y = j2_mbc(Pt3, lsh)(0, u, a); + z = j2_mbc(Pt3, mix)(x, y); - p = j2_mbc(Pt1, add)(wir_r, v, b); - q = j2_mbc(Pt3, cat)(wir_r, _0, w, z); + p = j2_mbc(Pt1, add)(v, b); + q = j2_mbc(Pt3, cat)(0, w, z); - u2_rz(wir_r, u); - u2_rz(wir_r, v); - u2_rz(wir_r, w); - u2_rz(wir_r, x); - u2_rz(wir_r, y); - u2_rz(wir_r, z); + u2z(u); + u2z(v); + u2z(w); + u2z(x); + u2z(y); + u2z(z); - return u2_bc(wir_r, p, q); + return u2nc(p, q); } } u2_noun // transfer - j2_mb(Pt5, mat)(u2_wire wir_r, + j2_mb(Pt5, mat)( u2_noun cor) // retain { u2_noun a; - if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ) { + return u2_cm_bail(c3__fail); } else { - return j2_mby(Pt5, mat)(wir_r, a); + return j2_mby(Pt5, mat)(a); } } diff --git a/gen164/5/mink.c b/gen164/5/mink.c index d436ec3834..7aed58efd3 100644 --- a/gen164/5/mink.c +++ b/gen164/5/mink.c @@ -6,20 +6,20 @@ #include "../pit.h" u2_weak // produce - j2_mb(Pt5, mink)(u2_wire wir_r, + j2_mb(Pt5, mink)( u2_noun cor) // retain { u2_noun bus, fol, fly; - if ( u2_no == u2_mean(cor, u2_cv_sam_4, &bus, + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_4, &bus, u2_cv_sam_5, &fol, u2_cv_sam_3, &fly, 0) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return u2_cn_mink(u2k(bus), u2k(fol), u2k(fly)); + return u2_cn_nock_in(u2k(bus), u2k(fol), u2k(fly)); } } diff --git a/gen164/5/mule.c b/gen164/5/mule.c index 4eb8abdf85..e5be87bf38 100644 --- a/gen164/5/mule.c +++ b/gen164/5/mule.c @@ -1,4 +1,4 @@ -/* j/5/mink.c +/* j/5/mule.c ** ** This file is in the public domain. */ @@ -6,21 +6,21 @@ #include "../pit.h" u2_weak // produce - j2_mb(Pt5, mule)(u2_wire wir_r, - u2_noun cor) // retain + j2_mb(Pt5, mule)(u2_noun cor) // retain { u2_noun tap; - if ( u2_no == u2_mean(cor, u2_cv_sam, &tap, 0) ) { - return u2_bl_bail(wir_r, c3__exit); + if ( u2_no == u2_cr_mean(cor, u2_cv_sam, &tap, 0) ) { + return u2_cm_bail(c3__exit); } else { - u2_noun hok = u2_bn_hook(wir_r, cor, "mute"); + u2_noun hok = u2_cn_hook(u2k(cor), "mute"); + /* this takes advantage of the fact that mute's result, at the typeless * C/Nock level, is identical to what a typed mule would produce, * without running the formula twice. */ - return u2_bn_mong(wir_r, hok, u2k(tap));; + return u2_cn_slam_on(hok, u2k(tap));; } } diff --git a/gen164/5/parse.c b/gen164/5/parse.c index b14188d2de..122f5ce07f 100644 --- a/gen164/5/parse.c +++ b/gen164/5/parse.c @@ -6,208 +6,153 @@ #include "../pit.h" static u2_noun // produce - _slip(u2_wire wir_r, + _slip( u2_noun weq, // retain u2_noun naz) // retain { u2_noun p_naz, q_naz; - u2_bi_cell(wir_r, naz, &p_naz, &q_naz); + u2_cx_cell(naz, &p_naz, &q_naz); if ( 10 == weq ) { - return u2_bc(wir_r, u2_bl_good(wir_r, - u2_rl_vint(wir_r, u2_rx(wir_r, p_naz))), + return u2nc(u2_cx_good( + u2_ci_vint(u2k(p_naz))), 1); } else { - return u2_bc(wir_r, u2_rx(wir_r, p_naz), - u2_bl_good(wir_r, - u2_rl_vint(wir_r, u2_rx(wir_r, q_naz)))); + return u2nc(u2k(p_naz), + u2_cx_good( + u2_ci_vint(u2k(q_naz)))); } } static u2_noun // produce - _fail(u2_wire wir_r, + _fail( u2_noun tub) // retain { u2_noun p_tub, q_tub; - u2_bi_cell(wir_r, tub, &p_tub, &q_tub); - return u2_bc(wir_r, u2_rx(wir_r, p_tub), u2_nul); + u2_cx_cell(tub, &p_tub, &q_tub); + return u2nc(u2k(p_tub), u2_nul); } static u2_noun // produce - _last(u2_wire wir_r, + _last( u2_noun zyc, // retain u2_noun naz) // retain { u2_noun p_zyc, q_zyc, p_naz, q_naz; - u2_bi_cell(wir_r, zyc, &p_zyc, &q_zyc); - u2_bi_cell(wir_r, naz, &p_naz, &q_naz); + u2_cx_cell(zyc, &p_zyc, &q_zyc); + u2_cx_cell(naz, &p_naz, &q_naz); - if ( !u2_fly_is_cat(p_zyc) || !u2_fly_is_cat(q_zyc) || - !u2_fly_is_cat(p_naz) || !u2_fly_is_cat(q_naz) ) + if ( u2_ne(u2_co_is_cat(p_zyc)) || u2_ne(u2_co_is_cat(q_zyc)) || + u2_ne(u2_co_is_cat(p_naz)) || u2_ne(u2_co_is_cat(q_naz)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { if ( p_zyc == p_naz ) { - return (q_zyc > q_naz) ? u2_rx(wir_r, zyc) : u2_rx(wir_r, naz); + return (q_zyc > q_naz) ? u2k(zyc) : u2k(naz); } else { - return (p_zyc > p_naz) ? u2_rx(wir_r, zyc) : u2_rx(wir_r, naz); + return (p_zyc > p_naz) ? u2k(zyc) : u2k(naz); } } } static u2_noun // produce - _next(u2_wire wir_r, + _next( u2_noun tub) // retain { u2_noun p_tub, q_tub; u2_noun zac; - u2_bi_cell(wir_r, tub, &p_tub, &q_tub); - if ( u2_no == u2_dust(q_tub) ) { - return _fail(wir_r, tub); + u2_cx_cell(tub, &p_tub, &q_tub); + if ( u2_no == u2du(q_tub) ) { + return _fail(tub); } else { - u2_noun iq_tub = u2_h(q_tub); - u2_noun tq_tub = u2_t(q_tub); + u2_noun iq_tub = u2h(q_tub); + u2_noun tq_tub = u2t(q_tub); - zac = _slip(wir_r, iq_tub, p_tub); + zac = _slip(iq_tub, p_tub); - return u2_bc - (wir_r, zac, - u2_bq(wir_r, u2_nul, - u2_rx(wir_r, iq_tub), - u2_rx(wir_r, zac), - u2_rx(wir_r, tq_tub))); + return u2nc + (zac, + u2nq(u2_nul, + u2k(iq_tub), + u2k(zac), + u2k(tq_tub))); } } -#if 1 /* bend */ u2_noun // produce - j2_mcx(Pt5, bend, fun)(u2_wire wir_r, - u2_noun raq, // retain + j2_mcx(Pt5, bend, fun)(u2_noun raq, // retain u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { - return u2_rx(wir_r, vex); + u2_cx_cell(vex, &p_vex, &q_vex); + if ( u2_no == u2du(q_vex) ) { + return u2k(vex); } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun yit, yur; u2_noun p_yit, q_yit; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + yit = u2_cx_good(u2_cn_slam_on(u2k(sab), u2k(quq_vex))); - u2_bi_cell(wir_r, yit, &p_yit, &q_yit); - yur = _last(wir_r, p_vex, p_yit); + u2_cx_cell(yit, &p_yit, &q_yit); + yur = _last(p_vex, p_yit); - if ( u2_no == u2_dust(q_yit) ) { - ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_vex)); + if ( u2_no == u2du(q_yit) ) { + ret = u2nc(yur, u2k(q_vex)); } else { - u2_noun uq_yit = u2_t(q_yit); + u2_noun uq_yit = u2t(q_yit); u2_noun puq_yit, quq_yit; u2_noun vux; - u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); + u2_cx_cell(uq_yit, &puq_yit, &quq_yit); - vux = u2_bl_good - (wir_r, - u2_nk_mong - (wir_r, raq, - u2_bc(wir_r, u2_rx(wir_r, puq_vex), - u2_rx(wir_r, puq_yit)))); + vux = u2_cx_good + (u2_cn_slam_on + (u2k(raq), + u2nc(u2k(puq_vex), + u2k(puq_yit)))); if ( u2_nul == vux ) { - ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_vex)); + ret = u2nc(yur, u2k(q_vex)); } else { - ret = u2_bq(wir_r, yur, + ret = u2nq(yur, u2_nul, u2k(u2t(vux)), - u2_rx(wir_r, quq_yit)); + u2k(quq_yit)); u2z(vux); } } - u2_rz(wir_r, yit); + u2z(yit); return ret; } } -#else - -/* bend -*/ - u2_noun // produce - j2_mcx(Pt5, bend, fun)(u2_wire wir_r, - u2_noun raq, // retain - u2_noun vex, // retain - u2_noun sab) // retain - { - u2_noun p_vex, q_vex; - - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { - return u2_rx(wir_r, vex); - } else { - u2_noun uq_vex = u2_t(q_vex); - u2_noun puq_vex, quq_vex; - u2_noun yit, yur; - u2_noun p_yit, q_yit; - u2_noun ret; - - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); - - u2_bi_cell(wir_r, yit, &p_yit, &q_yit); - yur = _last(wir_r, p_vex, p_yit); - - if ( u2_no == u2_dust(q_yit) ) { - ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_vex)); - } - else { - u2_noun uq_yit = u2_t(q_yit); - u2_noun puq_yit, quq_yit; - - u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); - ret = u2_bq(wir_r, yur, - u2_nul, - u2_bl_good - (wir_r, - u2_nk_mong - (wir_r, raq, - u2_bc(wir_r, u2_rx(wir_r, puq_vex), - u2_rx(wir_r, puq_yit)))), - u2_rx(wir_r, quq_yit)); - } - u2_rz(wir_r, yit); - return ret; - } - } -#endif u2_noun // produce - j2_mc(Pt5, bend, fun)(u2_wire wir_r, - u2_noun cor) // retain + j2_mc(Pt5, bend, fun)(u2_noun cor) // retain { u2_noun van, raq, vex, sab; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &vex, + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, u2_cv_con, &van, 0)) || - (u2_none == (raq = u2_frag(u2_cv_sam, van))) ) + (u2_none == (raq = u2_cr_at(u2_cv_sam, van))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, bend, fun)(wir_r, raq, vex, sab); + return j2_mcx(Pt5, bend, fun)(raq, vex, sab); } } u2_ho_jet @@ -219,47 +164,47 @@ /* cold */ u2_noun // produce - j2_mcx(Pt5, cold, fun)(u2_wire wir_r, + j2_mcx(Pt5, cold, fun)( u2_noun cus, // retain u2_noun sef, // retain u2_noun tub) // retain { - u2_noun vex = u2_bl_good(wir_r, u2_nk_mong(wir_r, sef, u2_rx(wir_r, tub))); + u2_noun vex = u2_cx_good(u2_cn_slam_on(u2k(sef), u2k(tub))); u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); + u2_cx_cell(vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { + if ( u2_no == u2du(q_vex) ) { return vex; } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun quq_vex; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, 0, &quq_vex); - ret = u2_bq(wir_r, u2_rx(wir_r, p_vex), + u2_cx_cell(uq_vex, 0, &quq_vex); + ret = u2nq(u2k(p_vex), u2_nul, - u2_rx(wir_r, cus), - u2_rx(wir_r, quq_vex)); + u2k(cus), + u2k(quq_vex)); - u2_rz(wir_r, vex); + u2z(vex); return ret; } } u2_noun // produce - j2_mc(Pt5, cold, fun)(u2_wire wir_r, + j2_mc(Pt5, cold, fun)( u2_noun cor) // retain { u2_noun van, cus, sef, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_no == u2_mean(van, u2_cv_sam_2, &cus, u2_cv_sam_3, &sef, 0)) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_no == u2_cr_mean(van, u2_cv_sam_2, &cus, u2_cv_sam_3, &sef, 0)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, cold, fun)(wir_r, cus, sef, tub); + return j2_mcx(Pt5, cold, fun)(cus, sef, tub); } } u2_ho_jet @@ -271,49 +216,49 @@ /* cook */ u2_noun // produce - j2_mcx(Pt5, cook, fun)(u2_wire wir_r, + j2_mcx(Pt5, cook, fun)( u2_noun poq, // retain u2_noun sef, // retain u2_noun tub) // retain { - u2_noun vex = u2_bl_good(wir_r, u2_nk_mong(wir_r, sef, u2_rx(wir_r, tub))); + u2_noun vex = u2_cx_good(u2_cn_slam_on(u2k(sef), u2k(tub))); u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); + u2_cx_cell(vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { + if ( u2_no == u2du(q_vex) ) { return vex; } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun wag; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - wag = u2_bl_good(wir_r, u2_nk_mong(wir_r, poq, u2_rx(wir_r, puq_vex))); - ret = u2_bq(wir_r, u2_rx(wir_r, p_vex), + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + wag = u2_cx_good(u2_cn_slam_on(u2k(poq), u2k(puq_vex))); + ret = u2nq(u2k(p_vex), u2_nul, wag, - u2_rx(wir_r, quq_vex)); + u2k(quq_vex)); - u2_rz(wir_r, vex); + u2z(vex); return ret; } } u2_noun // produce - j2_mc(Pt5, cook, fun)(u2_wire wir_r, + j2_mc(Pt5, cook, fun)( u2_noun cor) // retain { u2_noun van, poq, sef, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_no == u2_mean(van, u2_cv_sam_2, &poq, u2_cv_sam_3, &sef, 0)) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_no == u2_cr_mean(van, u2_cv_sam_2, &poq, u2_cv_sam_3, &sef, 0)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, cook, fun)(wir_r, poq, sef, tub); + return j2_mcx(Pt5, cook, fun)(poq, sef, tub); } } u2_ho_jet @@ -325,66 +270,66 @@ /* comp */ u2_noun // produce - j2_mcx(Pt5, comp, fun)(u2_wire wir_r, + j2_mcx(Pt5, comp, fun)( u2_noun raq, // retain u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { - return u2_rx(wir_r, vex); + u2_cx_cell(vex, &p_vex, &q_vex); + if ( u2_no == u2du(q_vex) ) { + return u2k(vex); } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun yit, yur; u2_noun p_yit, q_yit; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + yit = u2_cx_good(u2_cn_slam_on(u2k(sab), u2k(quq_vex))); - u2_bi_cell(wir_r, yit, &p_yit, &q_yit); - yur = _last(wir_r, p_vex, p_yit); + u2_cx_cell(yit, &p_yit, &q_yit); + yur = _last(p_vex, p_yit); - if ( u2_no == u2_dust(q_yit) ) { - ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_yit)); + if ( u2_no == u2du(q_yit) ) { + ret = u2nc(yur, u2k(q_yit)); } else { - u2_noun uq_yit = u2_t(q_yit); + u2_noun uq_yit = u2t(q_yit); u2_noun puq_yit, quq_yit; - u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); - ret = u2_bq(wir_r, yur, + u2_cx_cell(uq_yit, &puq_yit, &quq_yit); + ret = u2nq(yur, u2_nul, - u2_bl_good - (wir_r, - u2_nk_mong - (wir_r, raq, - u2_bc(wir_r, u2_rx(wir_r, puq_vex), - u2_rx(wir_r, puq_yit)))), - u2_rx(wir_r, quq_yit)); + u2_cx_good + ( + u2_cn_slam_on + (u2k(raq), + u2nc(u2k(puq_vex), + u2k(puq_yit)))), + u2k(quq_yit)); } - u2_rz(wir_r, yit); + u2z(yit); return ret; } } u2_noun // produce - j2_mc(Pt5, comp, fun)(u2_wire wir_r, + j2_mc(Pt5, comp, fun)( u2_noun cor) // retain { u2_noun van, raq, vex, sab; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &vex, + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, u2_cv_con, &van, 0)) || - (u2_none == (raq = u2_frag(u2_cv_sam, van))) ) + (u2_none == (raq = u2_cr_at(u2_cv_sam, van))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, comp, fun)(wir_r, raq, vex, sab); + return j2_mcx(Pt5, comp, fun)(raq, vex, sab); } } u2_ho_jet @@ -396,30 +341,30 @@ /* easy */ u2_noun // produce - j2_mcx(Pt5, easy, fun)(u2_wire wir_r, + j2_mcx(Pt5, easy, fun)( u2_noun huf, // retain u2_noun tub) // retain { u2_noun p_tub, q_tub; - u2_bi_cell(wir_r, tub, &p_tub, &q_tub); - return u2_bq(wir_r, u2_rx(wir_r, p_tub), + u2_cx_cell(tub, &p_tub, &q_tub); + return u2nq(u2k(p_tub), u2_nul, - u2_rx(wir_r, huf), - u2_rx(wir_r, tub)); + u2k(huf), + u2k(tub)); } u2_noun // produce - j2_mc(Pt5, easy, fun)(u2_wire wir_r, + j2_mc(Pt5, easy, fun)( u2_noun cor) // retain { u2_noun van, huf, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_none == (huf = u2_frag(u2_cv_sam, van))) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_none == (huf = u2_cr_at(u2_cv_sam, van))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, easy, fun)(wir_r, huf, tub); + return j2_mcx(Pt5, easy, fun)(huf, tub); } } u2_ho_jet @@ -431,79 +376,79 @@ /* glue */ u2_noun // produce - j2_mcx(Pt5, glue, fun)(u2_wire wir_r, + j2_mcx(Pt5, glue, fun)( u2_noun bus, // retain u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { - return u2_rx(wir_r, vex); + u2_cx_cell(vex, &p_vex, &q_vex); + if ( u2_no == u2du(q_vex) ) { + return u2k(vex); } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun yit, yur; u2_noun p_yit, q_yit; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, bus, u2_rx(wir_r, quq_vex))); + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + yit = u2_cx_good(u2_cn_slam_on(u2k(bus), u2k(quq_vex))); - u2_bi_cell(wir_r, yit, &p_yit, &q_yit); - yur = _last(wir_r, p_vex, p_yit); + u2_cx_cell(yit, &p_yit, &q_yit); + yur = _last(p_vex, p_yit); - if ( u2_no == u2_dust(q_yit) ) { - ret = u2_bc(wir_r, yur, u2_nul); + if ( u2_no == u2du(q_yit) ) { + ret = u2nc(yur, u2_nul); } else { - u2_noun uq_yit = u2_t(q_yit); + u2_noun uq_yit = u2t(q_yit); u2_noun puq_yit, quq_yit; u2_noun wam, p_wam, q_wam, goy; - u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); - wam = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_yit))); + u2_cx_cell(uq_yit, &puq_yit, &quq_yit); + wam = u2_cx_good(u2_cn_slam_on(u2k(sab), u2k(quq_yit))); - u2_bi_cell(wir_r, wam, &p_wam, &q_wam); - goy = _last(wir_r, yur, p_wam); - u2_rz(wir_r, yur); + u2_cx_cell(wam, &p_wam, &q_wam); + goy = _last(yur, p_wam); + u2z(yur); - if ( u2_no == u2_dust(q_wam) ) { - ret = u2_bc(wir_r, goy, u2_nul); + if ( u2_no == u2du(q_wam) ) { + ret = u2nc(goy, u2_nul); } else { - u2_noun uq_wam = u2_t(q_wam); + u2_noun uq_wam = u2t(q_wam); u2_noun puq_wam, quq_wam; - u2_bi_cell(wir_r, uq_wam, &puq_wam, &quq_wam); - ret = u2_bq(wir_r, goy, + u2_cx_cell(uq_wam, &puq_wam, &quq_wam); + ret = u2nq(goy, u2_nul, - u2_bc(wir_r, u2_rx(wir_r, puq_vex), - u2_rx(wir_r, puq_wam)), - u2_rx(wir_r, quq_wam)); + u2nc(u2k(puq_vex), + u2k(puq_wam)), + u2k(quq_wam)); } - u2_rz(wir_r, wam); + u2z(wam); } - u2_rz(wir_r, yit); + u2z(yit); return ret; } } u2_noun // produce - j2_mc(Pt5, glue, fun)(u2_wire wir_r, + j2_mc(Pt5, glue, fun)( u2_noun cor) // retain { u2_noun van, bus, vex, sab; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &vex, + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, u2_cv_con, &van, 0)) || - (u2_none == (bus = u2_frag(u2_cv_sam, van))) ) + (u2_none == (bus = u2_cr_at(u2_cv_sam, van))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, glue, fun)(wir_r, bus, vex, sab); + return j2_mcx(Pt5, glue, fun)(bus, vex, sab); } } u2_ho_jet @@ -515,57 +460,57 @@ /* here */ u2_noun // produce - j2_mcx(Pt5, here, fun)(u2_wire wir_r, + j2_mcx(Pt5, here, fun)( u2_noun hez, // retain u2_noun sef, // retain u2_noun tub) // retain { - u2_noun vex = u2_bl_good(wir_r, u2_nk_mong(wir_r, sef, u2_rx(wir_r, tub))); + u2_noun vex = u2_cx_good(u2_cn_slam_on(u2k(sef), u2k(tub))); u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); + u2_cx_cell(vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { + if ( u2_no == u2du(q_vex) ) { return vex; } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun p_tub, q_tub; u2_noun puq_vex, quq_vex, pquq_vex; u2_noun gud, wag; u2_noun ret; - u2_bi_cell(wir_r, tub, &p_tub, &q_tub); - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - u2_bi_cell(wir_r, quq_vex, &pquq_vex, 0); - gud = u2_bc(wir_r, - u2_bc(wir_r, u2_rx(wir_r, p_tub), - u2_rx(wir_r, pquq_vex)), - u2_rx(wir_r, puq_vex)); + u2_cx_cell(tub, &p_tub, &q_tub); + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + u2_cx_cell(quq_vex, &pquq_vex, 0); + gud = u2nc( + u2nc(u2k(p_tub), + u2k(pquq_vex)), + u2k(puq_vex)); - wag = u2_bl_good(wir_r, u2_nk_mong(wir_r, hez, gud)); - ret = u2_bq(wir_r, u2_rx(wir_r, p_vex), + wag = u2_cx_good(u2_cn_slam_on(u2k(hez), gud)); + ret = u2nq(u2k(p_vex), u2_nul, wag, - u2_rx(wir_r, quq_vex)); + u2k(quq_vex)); - u2_rz(wir_r, vex); + u2z(vex); return ret; } } u2_noun // produce - j2_mc(Pt5, here, fun)(u2_wire wir_r, + j2_mc(Pt5, here, fun)( u2_noun cor) // retain { u2_noun van, hez, sef, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_no == u2_mean(van, u2_cv_sam_2, &hez, u2_cv_sam_3, &sef, 0)) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_no == u2_cr_mean(van, u2_cv_sam_2, &hez, u2_cv_sam_3, &sef, 0)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, here, fun)(wir_r, hez, sef, tub); + return j2_mcx(Pt5, here, fun)(hez, sef, tub); } } u2_ho_jet @@ -577,38 +522,38 @@ /* just */ u2_noun // produce - j2_mcx(Pt5, just, fun)(u2_wire wir_r, + j2_mcx(Pt5, just, fun)( u2_noun daf, // retain u2_noun tub) // retain { u2_noun p_tub, q_tub; - u2_bi_cell(wir_r, tub, &p_tub, &q_tub); + u2_cx_cell(tub, &p_tub, &q_tub); - if ( u2_no == u2_dust(q_tub) ) { - return _fail(wir_r, tub); + if ( u2_no == u2du(q_tub) ) { + return _fail(tub); } else { - u2_noun iq_tub = u2_h(q_tub); + u2_noun iq_tub = u2h(q_tub); - if ( u2_yes == u2_sing(daf, iq_tub) ) { - return _next(wir_r, tub); + if ( u2_yes == u2_cr_sing(daf, iq_tub) ) { + return _next(tub); } - else return _fail(wir_r, tub); + else return _fail(tub); } } u2_noun // produce - j2_mc(Pt5, just, fun)(u2_wire wir_r, + j2_mc(Pt5, just, fun)( u2_noun cor) // retain { u2_noun van, daf, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_none == (daf = u2_frag(u2_cv_sam, van))) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_none == (daf = u2_cr_at(u2_cv_sam, van))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, just, fun)(wir_r, daf, tub); + return j2_mcx(Pt5, just, fun)(daf, tub); } } u2_ho_jet @@ -620,41 +565,41 @@ /* mask */ u2_noun // produce - j2_mcx(Pt5, mask, fun)(u2_wire wir_r, + j2_mcx(Pt5, mask, fun)( u2_noun bud, // retain u2_noun tub) // retain { u2_noun p_tub, q_tub; - u2_bi_cell(wir_r, tub, &p_tub, &q_tub); + u2_cx_cell(tub, &p_tub, &q_tub); - if ( u2_no == u2_dust(q_tub) ) { - return _fail(wir_r, tub); + if ( u2_no == u2du(q_tub) ) { + return _fail(tub); } else { - u2_noun iq_tub = u2_h(q_tub); + u2_noun iq_tub = u2h(q_tub); - while ( u2_yes == u2_dust(bud) ) { - if ( u2_yes == u2_sing(u2_h(bud), iq_tub) ) { - return _next(wir_r, tub); + while ( u2_yes == u2du(bud) ) { + if ( u2_yes == u2_cr_sing(u2h(bud), iq_tub) ) { + return _next(tub); } - bud = u2_t(bud); + bud = u2t(bud); } - return _fail(wir_r, tub); + return _fail(tub); } } u2_noun // produce - j2_mc(Pt5, mask, fun)(u2_wire wir_r, + j2_mc(Pt5, mask, fun)( u2_noun cor) // retain { u2_noun van, bud, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_none == (bud = u2_frag(u2_cv_sam, van))) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_none == (bud = u2_cr_at(u2_cv_sam, van))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, mask, fun)(wir_r, bud, tub); + return j2_mcx(Pt5, mask, fun)(bud, tub); } } u2_ho_jet @@ -666,45 +611,45 @@ /* pfix */ u2_noun // produce - j2_mbx(Pt5, pfix)(u2_wire wir_r, + j2_mbx(Pt5, pfix)( u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { - return u2_rx(wir_r, vex); + u2_cx_cell(vex, &p_vex, &q_vex); + if ( u2_no == u2du(q_vex) ) { + return u2k(vex); } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun yit, p_yit, q_yit; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + yit = u2_cx_good(u2_cn_slam_on(u2k(sab), u2k(quq_vex))); - u2_bi_cell(wir_r, yit, &p_yit, &q_yit); - ret = u2_bc - (wir_r, - _last(wir_r, p_vex, p_yit), - u2_rx(wir_r, q_yit)); + u2_cx_cell(yit, &p_yit, &q_yit); + ret = u2nc + ( + _last(p_vex, p_yit), + u2k(q_yit)); - u2_rz(wir_r, yit); + u2z(yit); return ret; } } u2_noun // produce - j2_mb(Pt5, pfix)(u2_wire wir_r, + j2_mb(Pt5, pfix)( u2_noun cor) // retain { u2_noun vex, sab; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, 0)) ) { - return u2_bl_bail(wir_r, c3__exit); + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, 0)) ) { + return u2_cm_bail(c3__exit); } else { - return j2_mbx(Pt5, pfix)(wir_r, vex, sab); + return j2_mbx(Pt5, pfix)(vex, sab); } } u2_ho_jet @@ -716,57 +661,57 @@ /* plug */ u2_noun // produce - j2_mbx(Pt5, plug)(u2_wire wir_r, + j2_mbx(Pt5, plug)( u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { - return u2_rx(wir_r, vex); + u2_cx_cell(vex, &p_vex, &q_vex); + if ( u2_no == u2du(q_vex) ) { + return u2k(vex); } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun yit, yur; u2_noun p_yit, q_yit; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + yit = u2_cx_good(u2_cn_slam_on(u2k(sab), u2k(quq_vex))); - u2_bi_cell(wir_r, yit, &p_yit, &q_yit); - yur = _last(wir_r, p_vex, p_yit); + u2_cx_cell(yit, &p_yit, &q_yit); + yur = _last(p_vex, p_yit); - if ( u2_no == u2_dust(q_yit) ) { - ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_yit)); + if ( u2_no == u2du(q_yit) ) { + ret = u2nc(yur, u2k(q_yit)); } else { - u2_noun uq_yit = u2_t(q_yit); + u2_noun uq_yit = u2t(q_yit); u2_noun puq_yit, quq_yit; - u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); - ret = u2_bq(wir_r, yur, + u2_cx_cell(uq_yit, &puq_yit, &quq_yit); + ret = u2nq(yur, u2_nul, - u2_bc(wir_r, u2_rx(wir_r, puq_vex), - u2_rx(wir_r, puq_yit)), - u2_rx(wir_r, quq_yit)); + u2nc(u2k(puq_vex), + u2k(puq_yit)), + u2k(quq_yit)); } - u2_rz(wir_r, yit); + u2z(yit); return ret; } } u2_noun // produce - j2_mb(Pt5, plug)(u2_wire wir_r, + j2_mb(Pt5, plug)( u2_noun cor) // retain { u2_noun vex, sab; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, 0)) ) { - return u2_bl_bail(wir_r, c3__exit); + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, 0)) ) { + return u2_cm_bail(c3__exit); } else { - return j2_mbx(Pt5, plug)(wir_r, vex, sab); + return j2_mbx(Pt5, plug)(vex, sab); } } u2_ho_jet @@ -778,40 +723,39 @@ /* pose */ u2_noun // produce - j2_mbx(Pt5, pose)(u2_wire wir_r, - u2_noun vex, // retain + j2_mbx(Pt5, pose)(u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_yes == u2_dust(q_vex) ) { - return u2_rx(wir_r, vex); + u2_cx_cell(vex, &p_vex, &q_vex); + if ( u2_yes == u2du(q_vex) ) { + return u2k(vex); } else { - u2_noun roq = u2_bl_good(wir_r, u2_nk_kick(wir_r, sab)); + u2_noun roq = u2_cx_good(u2_cn_kick_on(u2k(sab))); u2_noun p_roq, q_roq; u2_noun ret; - u2_bi_cell(wir_r, roq, &p_roq, &q_roq); - ret = u2_bc - (wir_r, - _last(wir_r, p_vex, p_roq), - u2_rx(wir_r, q_roq)); + u2_cx_cell(roq, &p_roq, &q_roq); + ret = u2nc + ( + _last(p_vex, p_roq), + u2k(q_roq)); - u2_rz(wir_r, roq); + u2z(roq); return ret; } } u2_noun // produce - j2_mb(Pt5, pose)(u2_wire wir_r, + j2_mb(Pt5, pose)( u2_noun cor) // retain { u2_noun vex, sab; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, 0)) ) { - return u2_bl_bail(wir_r, c3__exit); + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, 0)) ) { + return u2_cm_bail(c3__exit); } else { - return j2_mbx(Pt5, pose)(wir_r, vex, sab); + return j2_mbx(Pt5, pose)(vex, sab); } } u2_ho_jet @@ -823,56 +767,56 @@ /* sfix */ u2_noun // produce - j2_mbx(Pt5, sfix)(u2_wire wir_r, + j2_mbx(Pt5, sfix)( u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { - return u2_rx(wir_r, vex); + u2_cx_cell(vex, &p_vex, &q_vex); + if ( u2_no == u2du(q_vex) ) { + return u2k(vex); } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun yit, p_yit, q_yit, yur; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + yit = u2_cx_good(u2_cn_slam_on(u2k(sab), u2k(quq_vex))); - u2_bi_cell(wir_r, yit, &p_yit, &q_yit); - yur = _last(wir_r, p_vex, p_yit); + u2_cx_cell(yit, &p_yit, &q_yit); + yur = _last(p_vex, p_yit); - if ( u2_no == u2_dust(q_yit) ) { - ret = u2_bc(wir_r, yur, u2_nul); + if ( u2_no == u2du(q_yit) ) { + ret = u2nc(yur, u2_nul); } else { - u2_noun uq_yit = u2_t(q_yit); + u2_noun uq_yit = u2t(q_yit); u2_noun puq_yit, quq_yit; - u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); + u2_cx_cell(uq_yit, &puq_yit, &quq_yit); - ret = u2_bq(wir_r, yur, + ret = u2nq(yur, u2_nul, - u2_rx(wir_r, puq_vex), - u2_rx(wir_r, quq_yit)); + u2k(puq_vex), + u2k(quq_yit)); } - u2_rz(wir_r, yit); + u2z(yit); return ret; } } u2_noun // produce - j2_mb(Pt5, sfix)(u2_wire wir_r, + j2_mb(Pt5, sfix)( u2_noun cor) // retain { u2_noun vex, sab; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, 0)) ) { - return u2_bl_bail(wir_r, c3__exit); + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &vex, u2_cv_sam_3, &sab, 0)) ) { + return u2_cm_bail(c3__exit); } else { - return j2_mbx(Pt5, sfix)(wir_r, vex, sab); + return j2_mbx(Pt5, sfix)(vex, sab); } } u2_ho_jet @@ -884,48 +828,47 @@ /* shim */ u2_noun // produce - j2_mcx(Pt5, shim, fun)(u2_wire wir_r, - u2_noun zep, // retain + j2_mcx(Pt5, shim, fun)(u2_noun zep, // retain u2_noun tub) // retain { u2_noun p_tub, q_tub; - u2_bi_cell(wir_r, tub, &p_tub, &q_tub); + u2_cx_cell(tub, &p_tub, &q_tub); - if ( u2_no == u2_dust(q_tub) ) { - return _fail(wir_r, tub); + if ( u2_no == u2du(q_tub) ) { + return _fail(tub); } else { u2_noun p_zep, q_zep; - u2_noun iq_tub = u2_h(q_tub); + u2_noun iq_tub = u2h(q_tub); - u2_bi_cell(wir_r, zep, &p_zep, &q_zep); - if ( u2_fly_is_cat(p_zep) && - u2_fly_is_cat(q_zep) && - u2_fly_is_cat(iq_tub) ) + u2_cx_cell(zep, &p_zep, &q_zep); + if ( u2_so(u2_co_is_cat(p_zep)) && + u2_so(u2_co_is_cat(q_zep)) && + u2_so(u2_co_is_cat(iq_tub)) ) { if ( (iq_tub >= p_zep) && (iq_tub <= q_zep) ) { - return _next(wir_r, tub); + return _next(tub); } - else return _fail(wir_r, tub); + else return _fail(tub); } else { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } } } u2_noun // produce - j2_mc(Pt5, shim, fun)(u2_wire wir_r, + j2_mc(Pt5, shim, fun)( u2_noun cor) // retain { u2_noun van, zep, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_none == (zep = u2_frag(u2_cv_sam, van))) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_none == (zep = u2_cr_at(u2_cv_sam, van))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, shim, fun)(wir_r, zep, tub); + return j2_mcx(Pt5, shim, fun)(zep, tub); } } u2_ho_jet @@ -937,49 +880,49 @@ /* stag */ u2_noun // produce - j2_mcx(Pt5, stag, fun)(u2_wire wir_r, + j2_mcx(Pt5, stag, fun)( u2_noun gob, // retain u2_noun sef, // retain u2_noun tub) // retain { - u2_noun vex = u2_bl_good(wir_r, u2_nk_mong(wir_r, sef, u2_rx(wir_r, tub))); + u2_noun vex = u2_cx_good(u2_cn_slam_on(u2k(sef), u2k(tub))); u2_noun p_vex, q_vex; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); + u2_cx_cell(vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { + if ( u2_no == u2du(q_vex) ) { return vex; } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun wag; u2_noun ret; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - wag = u2_bc(wir_r, u2_rx(wir_r, gob), u2_rx(wir_r, puq_vex)); - ret = u2_bq(wir_r, u2_rx(wir_r, p_vex), + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + wag = u2nc(u2k(gob), u2k(puq_vex)); + ret = u2nq(u2k(p_vex), u2_nul, wag, - u2_rx(wir_r, quq_vex)); + u2k(quq_vex)); - u2_rz(wir_r, vex); + u2z(vex); return ret; } } u2_noun // produce - j2_mc(Pt5, stag, fun)(u2_wire wir_r, + j2_mc(Pt5, stag, fun)( u2_noun cor) // retain { u2_noun van, gob, sef, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_no == u2_mean(van, u2_cv_sam_2, &gob, u2_cv_sam_3, &sef, 0)) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_no == u2_cr_mean(van, u2_cv_sam_2, &gob, u2_cv_sam_3, &sef, 0)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, stag, fun)(wir_r, gob, sef, tub); + return j2_mcx(Pt5, stag, fun)(gob, sef, tub); } } u2_ho_jet @@ -991,25 +934,25 @@ /* stew */ static u2_bean - _stew_wor(u2_wire wir_r, + _stew_wor( u2_noun ort, u2_noun wan) { - if ( !u2_fly_is_cat(ort) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( u2_ne(u2_co_is_cat(ort)) ) { + return u2_cm_bail(c3__fail); } else { - if ( u2_no == u2_dust(wan) ) { - if ( !u2_fly_is_cat(wan) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( u2_no == u2du(wan) ) { + if ( u2_ne(u2_co_is_cat(wan)) ) { + return u2_cm_bail(c3__fail); } else return (ort < wan) ? u2_yes : u2_no; } else { - u2_noun h_wan = u2_h(wan); + u2_noun h_wan = u2h(wan); - if ( !u2_fly_is_cat(h_wan) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( u2_ne(u2_co_is_cat(h_wan)) ) { + return u2_cm_bail(c3__fail); } else return (ort < h_wan) ? u2_yes : u2_no; } @@ -1017,51 +960,53 @@ } u2_noun // produce - j2_mcx(Pt5, stew, fun)(u2_wire wir_r, + j2_mcx(Pt5, stew, fun)( u2_noun hel, // retain u2_noun tub) // retain { u2_noun p_tub, q_tub; - u2_bi_cell(wir_r, tub, &p_tub, &q_tub); - if ( u2_no == u2_dust(q_tub) ) { - return _fail(wir_r, tub); + u2_cx_cell(tub, &p_tub, &q_tub); + if ( u2_no == u2du(q_tub) ) { + return _fail(tub); } else { - u2_noun iq_tub = u2_h(q_tub); + u2_noun iq_tub = u2h(q_tub); - if ( !u2_fly_is_cat(iq_tub) ) { - return u2_bl_bail(wir_r, c3__fail); - } else while ( 1 ) { - if ( u2_no == u2_dust(hel) ) { - return _fail(wir_r, tub); + if ( u2_ne(u2_co_is_cat(iq_tub)) ) { + return u2_cm_bail(c3__fail); + } + else while ( 1 ) { + if ( u2_no == u2du(hel) ) { + return _fail(tub); } else { u2_noun n_hel, l_hel, r_hel; u2_noun pn_hel, qn_hel; c3_t bit_t; - u2_bi_trel(wir_r, hel, &n_hel, &l_hel, &r_hel); - u2_bi_cell(wir_r, n_hel, &pn_hel, &qn_hel); + u2_cx_trel(hel, &n_hel, &l_hel, &r_hel); + u2_cx_cell(n_hel, &pn_hel, &qn_hel); - if ( (u2_no == u2_dust(pn_hel)) ) { + if ( (u2_no == u2du(pn_hel)) ) { bit_t = (iq_tub == pn_hel); } else { - u2_noun hpn_hel = u2_h(pn_hel); - u2_noun tpn_hel = u2_t(pn_hel); + u2_noun hpn_hel = u2h(pn_hel); + u2_noun tpn_hel = u2t(pn_hel); - if ( !u2_fly_is_cat(hpn_hel) || !u2_fly_is_cat(tpn_hel) ) { - return _fail(wir_r, tub); + if ( u2_ne(u2_co_is_cat(hpn_hel)) || + u2_ne(u2_co_is_cat(tpn_hel)) ) { + return _fail(tub); } else bit_t = (iq_tub >= hpn_hel) && (iq_tub <= tpn_hel); } if ( bit_t ) { - return u2_bl_good - (wir_r, u2_nk_mong(wir_r, qn_hel, u2_rx(wir_r, tub))); + return u2_cx_good + (u2_cn_slam_on(u2k(qn_hel), u2k(tub))); } else { - if ( u2_yes == _stew_wor(wir_r, iq_tub, pn_hel) ) { + if ( u2_yes == _stew_wor(iq_tub, pn_hel) ) { hel = l_hel; } else hel = r_hel; @@ -1071,17 +1016,17 @@ } } u2_noun // produce - j2_mc(Pt5, stew, fun)(u2_wire wir_r, + j2_mc(Pt5, stew, fun)( u2_noun cor) // retain { u2_noun con, hel, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &con, 0)) || - (u2_none == (hel = u2_frag(2, con))) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &con, 0)) || + (u2_none == (hel = u2_cr_at(2, con))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, stew, fun)(wir_r, hel, tub); + return j2_mcx(Pt5, stew, fun)(hel, tub); } } u2_ho_jet @@ -1093,68 +1038,66 @@ /* stir */ u2_noun // produce - j2_mcx(Pt5, stir, fun)(u2_wire wir_r, - u2_noun rud, // retain + j2_mcx(Pt5, stir, fun)(u2_noun rud, // retain u2_noun raq, // retain u2_noun fel, // retain u2_noun tub) // retain { - u2_noun vex = u2_bl_good(wir_r, u2_nk_mong(wir_r, fel, u2_rx(wir_r, tub))); + u2_noun vex = u2_cx_good(u2_cn_slam_on(u2k(fel), u2k(tub))); u2_noun p_vex, q_vex; u2_noun ret; - u2_bi_cell(wir_r, vex, &p_vex, &q_vex); - if ( u2_no == u2_dust(q_vex) ) { - ret = u2_bq(wir_r, u2_rx(wir_r, p_vex), + u2_cx_cell(vex, &p_vex, &q_vex); + if ( u2_no == u2du(q_vex) ) { + ret = u2nq(u2k(p_vex), u2_nul, - u2_rx(wir_r, rud), - u2_rx(wir_r, tub)); + u2k(rud), + u2k(tub)); } else { - u2_noun uq_vex = u2_t(q_vex); + u2_noun uq_vex = u2t(q_vex); u2_noun puq_vex, quq_vex; u2_noun wag, p_wag, q_wag, uq_wag, puq_wag, quq_wag; - u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); - wag = j2_mcx(Pt5, stir, fun)(wir_r, rud, raq, fel, quq_vex); + u2_cx_cell(uq_vex, &puq_vex, &quq_vex); + wag = j2_mcx(Pt5, stir, fun)(rud, raq, fel, quq_vex); - u2_bi_cell(wir_r, wag, &p_wag, &q_wag); - if ( u2_no == u2_dust(q_wag) ) { - return u2_bl_bail(wir_r, c3__fail); + u2_cx_cell(wag, &p_wag, &q_wag); + if ( u2_no == u2du(q_wag) ) { + return u2_cm_bail(c3__fail); } - uq_wag = u2_t(q_wag); - u2_bi_cell(wir_r, uq_wag, &puq_wag, &quq_wag); + uq_wag = u2t(q_wag); + u2_cx_cell(uq_wag, &puq_wag, &quq_wag); - ret = u2_bq - (wir_r, _last(wir_r, p_vex, p_wag), + ret = u2nq + (_last(p_vex, p_wag), u2_nul, - u2_bl_good(wir_r, - u2_nk_mong - (wir_r, raq, - u2_bc(wir_r, u2_rx(wir_r, puq_vex), - u2_rx(wir_r, puq_wag)))), - u2_rx(wir_r, quq_wag)); - u2_rz(wir_r, wag); + u2_cx_good(u2_cn_slam_on + (u2k(raq), + u2nc(u2k(puq_vex), + u2k(puq_wag)))), + u2k(quq_wag)); + u2z(wag); } - u2_rz(wir_r, vex); + u2z(vex); return ret; } u2_noun // produce - j2_mc(Pt5, stir, fun)(u2_wire wir_r, + j2_mc(Pt5, stir, fun)( u2_noun cor) // retain { u2_noun van, rud, raq, fel, tub; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_no == u2_mean(van, u2_cv_sam_2, &rud, + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || + (u2_no == u2_cr_mean(van, u2_cv_sam_2, &rud, u2_cv_sam_6, &raq, u2_cv_sam_7, &fel, 0)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mcx(Pt5, stir, fun)(wir_r, rud, raq, fel, tub); + return j2_mcx(Pt5, stir, fun)(rud, raq, fel, tub); } } u2_ho_jet diff --git a/gen164/5/rd.c b/gen164/5/rd.c index e3f4479650..be3ce9aee7 100644 --- a/gen164/5/rd.c +++ b/gen164/5/rd.c @@ -27,279 +27,279 @@ union doub { /* sun */ u2_weak - j2_mcd(Pt5, rd, sun)(u2_wire wir_r, + j2_mcd(Pt5, rd, sun)( u2_atom a) { union doub b; - b.d = (double) u2_chub(0, a); + b.d = (double) u2_cr_chub(0, a); return u2_ci_chubs(1, &b.c); } u2_weak - j2_mc(Pt5, rd, sun)(u2_wire wir_r, + j2_mc(Pt5, rd, sun)( u2_noun cor) { u2_noun a; - if (u2_no == u2_mean(cor, u2_cv_sam, &a, 0) - || u2_no == u2_stud(a)) { - return u2_bl_bail(wir_r, c3__exit); + if (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, 0) + || u2_no == u2ud(a)) { + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, sun)(wir_r, a); + return j2_mcd(Pt5, rd, sun)(a); } } /* mul */ u2_weak - j2_mcd(Pt5, rd, mul)(u2_wire wir_r, + j2_mcd(Pt5, rd, mul)( u2_atom a, u2_atom b) { union doub c, d, e; - c.c = u2_chub(0, a); - d.c = u2_chub(0, b); + c.c = u2_cr_chub(0, a); + d.c = u2_cr_chub(0, b); e.d = c.d * d.d; return u2_ci_chubs(1, &e.c); } u2_weak - j2_mc(Pt5, rd, mul)(u2_wire wir_r, + j2_mc(Pt5, rd, mul)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, mul)(wir_r, a, b); + return j2_mcd(Pt5, rd, mul)(a, b); } } /* div */ u2_weak - j2_mcd(Pt5, rd, div)(u2_wire wir_r, + j2_mcd(Pt5, rd, div)( u2_atom a, u2_atom b) { union doub c, d, e; - c.c = u2_chub(0, a); - d.c = u2_chub(0, b); + c.c = u2_cr_chub(0, a); + d.c = u2_cr_chub(0, b); e.d = c.d / d.d; return u2_ci_chubs(1, &e.c); } u2_weak - j2_mc(Pt5, rd, div)(u2_wire wir_r, + j2_mc(Pt5, rd, div)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, div)(wir_r, a, b); + return j2_mcd(Pt5, rd, div)(a, b); } } /* add */ u2_weak - j2_mcd(Pt5, rd, add)(u2_wire wir_r, + j2_mcd(Pt5, rd, add)( u2_atom a, u2_atom b) { union doub c, d, e; - c.c = u2_chub(0, a); - d.c = u2_chub(0, b); + c.c = u2_cr_chub(0, a); + d.c = u2_cr_chub(0, b); e.d = c.d + d.d; return u2_ci_chubs(1, &e.c); } u2_weak - j2_mc(Pt5, rd, add)(u2_wire wir_r, + j2_mc(Pt5, rd, add)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, add)(wir_r, a, b); + return j2_mcd(Pt5, rd, add)(a, b); } } /* sub */ u2_weak - j2_mcd(Pt5, rd, sub)(u2_wire wir_r, + j2_mcd(Pt5, rd, sub)( u2_atom a, u2_atom b) { union doub c, d, e; - c.c = u2_chub(0, a); - d.c = u2_chub(0, b); + c.c = u2_cr_chub(0, a); + d.c = u2_cr_chub(0, b); e.d = c.d - d.d; return u2_ci_chubs(1, &e.c); } u2_weak - j2_mc(Pt5, rd, sub)(u2_wire wir_r, + j2_mc(Pt5, rd, sub)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, sub)(wir_r, a, b); + return j2_mcd(Pt5, rd, sub)(a, b); } } /* lte */ u2_weak - j2_mcd(Pt5, rd, lte)(u2_wire wir_r, + j2_mcd(Pt5, rd, lte)( u2_atom a, u2_atom b) { union doub c, d; - c.c = u2_chub(0, a); - d.c = u2_chub(0, b); + c.c = u2_cr_chub(0, a); + d.c = u2_cr_chub(0, b); return u2_say(c.d <= d.d); } u2_weak - j2_mc(Pt5, rd, lte)(u2_wire wir_r, + j2_mc(Pt5, rd, lte)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, lte)(wir_r, a, b); + return j2_mcd(Pt5, rd, lte)(a, b); } } /* lth */ u2_weak - j2_mcd(Pt5, rd, lth)(u2_wire wir_r, + j2_mcd(Pt5, rd, lth)( u2_atom a, u2_atom b) { union doub c, d; - c.c = u2_chub(0, a); - d.c = u2_chub(0, b); + c.c = u2_cr_chub(0, a); + d.c = u2_cr_chub(0, b); return u2_say(c.d < d.d); } u2_weak - j2_mc(Pt5, rd, lth)(u2_wire wir_r, + j2_mc(Pt5, rd, lth)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, lth)(wir_r, a, b); + return j2_mcd(Pt5, rd, lth)(a, b); } } /* gte */ u2_weak - j2_mcd(Pt5, rd, gte)(u2_wire wir_r, + j2_mcd(Pt5, rd, gte)( u2_atom a, u2_atom b) { union doub c, d; - c.c = u2_chub(0, a); - d.c = u2_chub(0, b); + c.c = u2_cr_chub(0, a); + d.c = u2_cr_chub(0, b); return u2_say(c.d >= d.d); } u2_weak - j2_mc(Pt5, rd, gte)(u2_wire wir_r, + j2_mc(Pt5, rd, gte)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, gte)(wir_r, a, b); + return j2_mcd(Pt5, rd, gte)(a, b); } } /* gth */ u2_weak - j2_mcd(Pt5, rd, gth)(u2_wire wir_r, + j2_mcd(Pt5, rd, gth)( u2_atom a, u2_atom b) { union doub c, d; - c.c = u2_chub(0, a); - d.c = u2_chub(0, b); + c.c = u2_cr_chub(0, a); + d.c = u2_cr_chub(0, b); return u2_say(c.d > d.d); } u2_weak - j2_mc(Pt5, rd, gth)(u2_wire wir_r, + j2_mc(Pt5, rd, gth)( u2_noun cor) { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || - u2_no == u2_stud(a) || - u2_no == u2_stud(b) ) + if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) || + u2_no == u2ud(a) || + u2_no == u2ud(b) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mcd(Pt5, rd, gth)(wir_r, a, b); + return j2_mcd(Pt5, rd, gth)(a, b); } } diff --git a/gen164/5/repg.c b/gen164/5/repg.c index dc7a595a96..9f271bc73a 100644 --- a/gen164/5/repg.c +++ b/gen164/5/repg.c @@ -8,7 +8,7 @@ #include u2_noun // produce - j2_mbc(Pt5, repg)(u2_wire wir_r, + j2_mbc(Pt5, repg)( u2_noun lub, u2_noun rad, u2_noun rep) // retain @@ -75,7 +75,7 @@ if (!match) { if(rad_y[ic]) - ret = u2_cn_cell((c3_y)rad_y[ic], ret); + ret = u2_ci_cell((c3_y)rad_y[ic], ret); ic++; } else { @@ -95,7 +95,7 @@ free(lub_y); free(rad_y); free(rep_y); - return u2_cn_cell(u2_nul, u2_ckb_flop(ret)); + return u2_ci_cell(u2_nul, u2_ckb_flop(ret)); } else { // Compiling the regular expression failed @@ -113,32 +113,32 @@ cre2_opt_delete(opt); free(lub_y); free(rad_y); - u2_bl_bail(wir_r, c3__exit); + u2_cm_bail(c3__exit); } cre2_opt_delete(opt); } // opt Allocation Error free(lub_y); free(rad_y); - u2_bl_bail(wir_r, c3__exit); + u2_cm_bail(c3__exit); return u2_nul; } u2_weak // produce - j2_mb(Pt5, repg)(u2_wire wir_r, + j2_mb(Pt5, repg)( u2_noun cor) // retain { u2_noun lub; u2_noun rad; u2_noun rep; - if ( (u2_none == (lub = u2_frag(u2_cv_sam_2, cor))) || - (u2_none == (rad = u2_frag(u2_cv_sam_6, cor))) || - (u2_none == (rep = u2_frag(u2_cv_sam_7, cor))) ) + if ( (u2_none == (lub = u2_cr_at(u2_cv_sam_2, cor))) || + (u2_none == (rad = u2_cr_at(u2_cv_sam_6, cor))) || + (u2_none == (rep = u2_cr_at(u2_cv_sam_7, cor))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mbc(Pt5, repg)(wir_r, lub, rad, rep); + return j2_mbc(Pt5, repg)(lub, rad, rep); } } diff --git a/gen164/5/rexp.c b/gen164/5/rexp.c index 84deab73ef..fb04ff5f44 100644 --- a/gen164/5/rexp.c +++ b/gen164/5/rexp.c @@ -8,7 +8,7 @@ #include u2_noun // produce - j2_mbc(Pt5, rexp)(u2_wire wir_r, + j2_mbc(Pt5, rexp)( u2_noun lub, u2_noun rad) // retain { @@ -86,7 +86,7 @@ cre2_delete(rex); free(lub_y); free(rad_y); - return u2_cn_cell(u2_nul, u2_nul); + return u2_ci_cell(u2_nul, u2_nul); } u2_noun map = u2_nul; @@ -104,7 +104,7 @@ cre2_delete(rex); free(lub_y); free(rad_y); - return u2_cn_cell(u2_nul, u2_cn_cell(u2_nul, map)); + return u2_ci_cell(u2_nul, u2_ci_cell(u2_nul, map)); } else { @@ -121,23 +121,23 @@ } free(lub_y); free(rad_y); - u2_bl_bail(wir_r, c3__exit); + u2_cm_bail(c3__exit); return u2_nul; } u2_weak // produce - j2_mb(Pt5, rexp)(u2_wire wir_r, + j2_mb(Pt5, rexp)( u2_noun cor) // retain { u2_noun lub; u2_noun rad; - if ( (u2_none == (lub = u2_frag(u2_cv_sam_2, cor))) || - (u2_none == (rad = u2_frag(u2_cv_sam_3, cor))) ) + if ( (u2_none == (lub = u2_cr_at(u2_cv_sam_2, cor))) || + (u2_none == (rad = u2_cr_at(u2_cv_sam_3, cor))) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mbc(Pt5, rexp)(wir_r, lub, rad); + return j2_mbc(Pt5, rexp)(lub, rad); } } diff --git a/gen164/5/rub.c b/gen164/5/rub.c index 923780ea5e..091b6f0620 100644 --- a/gen164/5/rub.c +++ b/gen164/5/rub.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // produce - j2_mby(Pt5, rub)(u2_wire wir_r, + j2_mby(Pt5, rub)( u2_atom a, // retain u2_atom b) // retain { @@ -16,68 +16,68 @@ u2_atom w, x, y, z; u2_atom p, q; - u2_atom m = j2_mbc(Pt1, add)(wir_r, a, u2_met(0, b)); + u2_atom m = j2_mbc(Pt1, add)(a, u2_cr_met(0, b)); // Compute c and d. { - x = u2_rx(wir_r, a); + x = u2k(a); - while ( _0 == j2_mbc(Pt3, cut)(wir_r, _0, x, _1, b) ) { - u2_atom y = j2_mbc(Pt1, inc)(wir_r, x); + while ( 0 == j2_mbc(Pt3, cut)(0, x, 1, b) ) { + u2_atom y = j2_mbc(Pt1, inc)(x); // Sanity check: crash if decoding more bits than available - if ( u2_yes == j2_mbc(Pt1, gth)(wir_r, x, m)) { + if ( u2_yes == j2_mbc(Pt1, gth)(x, m)) { // fprintf(stderr, "[%%rub-hard %d %d %d]\r\n", a, x, m); - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } - u2_rz(wir_r, x); + u2z(x); x = y; } - if ( u2_yes == u2_sing(x, a) ) { - u2_rz(wir_r, x); - return u2_bc(wir_r, _1, _0); + if ( u2_yes == u2_cr_sing(x, a) ) { + u2z(x); + return u2nc(1, 0); } - c = j2_mbc(Pt1, sub)(wir_r, x, a); - d = j2_mbc(Pt1, inc)(wir_r, x); + c = j2_mbc(Pt1, sub)(x, a); + d = j2_mbc(Pt1, inc)(x); - u2_rz(wir_r, x); + u2z(x); } // Compute e, p, q. { - x = j2_mbc(Pt1, dec)(wir_r, c); - y = j2_mbc(Pt3, bex)(wir_r, x); - z = j2_mbc(Pt3, cut)(wir_r, _0, d, x, b); + x = j2_mbc(Pt1, dec)(c); + y = j2_mbc(Pt3, bex)(x); + z = j2_mbc(Pt3, cut)(0, d, x, b); - e = j2_mbc(Pt1, add)(wir_r, y, z); - u2_rz(wir_r, y); u2_rz(wir_r, z); + e = j2_mbc(Pt1, add)(y, z); + u2z(y); u2z(z); - w = j2_mbc(Pt1, add)(wir_r, c, c); - y = j2_mbc(Pt1, add)(wir_r, w, e); - z = j2_mbc(Pt1, add)(wir_r, d, x); + w = j2_mbc(Pt1, add)(c, c); + y = j2_mbc(Pt1, add)(w, e); + z = j2_mbc(Pt1, add)(d, x); - p = j2_mbc(Pt1, add)(wir_r, w, e); - q = j2_mbc(Pt3, cut)(wir_r, _0, z, e, b); + p = j2_mbc(Pt1, add)(w, e); + q = j2_mbc(Pt3, cut)(0, z, e, b); - u2_rz(wir_r, w); u2_rz(wir_r, x); u2_rz(wir_r, y); u2_rz(wir_r, z); + u2z(w); u2z(x); u2z(y); u2z(z); - return u2_bc(wir_r, p, q); + return u2nc(p, q); } } u2_noun // transfer - j2_mb(Pt5, rub)(u2_wire wir_r, + j2_mb(Pt5, rub)( u2_noun cor) // retain { u2_noun a, b; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || - (u2_no == u2_stud(a)) || - (u2_no == u2_stud(b)) ) + if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || + (u2_no == u2ud(a)) || + (u2_no == u2ud(b)) ) { - return u2_bl_bail(wir_r, c3__fail); + return u2_cm_bail(c3__fail); } else { - return j2_mby(Pt5, rub)(wir_r, a, b); + return j2_mby(Pt5, rub)(a, b); } } diff --git a/gen164/5/shax.c b/gen164/5/shax.c index 02724cf8d6..ccd3010769 100644 --- a/gen164/5/shax.c +++ b/gen164/5/shax.c @@ -14,13 +14,13 @@ /* functions */ u2_weak // produce - j2_mbc(Pt5, shax)(u2_wire wir_r, + j2_mbc(Pt5, shax)( u2_atom a) // retain { - c3_w met_w = u2_met(3, a); + c3_w met_w = u2_cr_met(3, a); c3_y* fat_y = c3_malloc(met_w + 1); - u2_bytes(0, met_w, fat_y, a); + u2_cr_bytes(0, met_w, fat_y, a); { c3_y dig_y[32]; #if defined(U2_OS_osx) @@ -37,19 +37,18 @@ SHA256_Final(dig_y, &ctx_h); #endif free(fat_y); - return u2_rl_bytes(wir_r, 32, dig_y); + return u2_ci_bytes(32, dig_y); } } u2_weak // produce - j2_mbc(Pt5, shal)(u2_wire wir_r, - u2_atom a, // retain + j2_mbc(Pt5, shal)(u2_atom a, // retain u2_atom b) // retain { - c3_assert(u2_fly_is_cat(a)); + c3_assert(u2_so(u2_co_is_cat(a))); c3_y* fat_y = c3_malloc(a + 1); - u2_bytes(0, a, fat_y, b); + u2_cr_bytes(0, a, fat_y, b); { c3_y dig_y[64]; #if defined(U2_OS_osx) @@ -66,93 +65,92 @@ SHA512_Final(dig_y, &ctx_h); #endif free(fat_y); - return u2_rl_bytes(wir_r, 64, dig_y); + return u2_ci_bytes(64, dig_y); } } u2_weak // produce - j2_mbc(Pt5, shas)(u2_wire wir_r, + j2_mbc(Pt5, shas)( u2_atom sal, // retain u2_atom ruz) // retain { - u2_noun one = j2_mbc(Pt5, shax)(wir_r, ruz); - u2_noun two = j2_mbc(Pt3, mix)(wir_r, sal, one); - u2_noun tri = j2_mbc(Pt5, shax)(wir_r, two); + u2_noun one = j2_mbc(Pt5, shax)(ruz); + u2_noun two = j2_mbc(Pt3, mix)(sal, one); + u2_noun tri = j2_mbc(Pt5, shax)(two); u2z(one); u2z(two); return tri; } u2_weak // produce - j2_mb(Pt5, shax)(u2_wire wir_r, + j2_mb(Pt5, shax)( u2_noun cor) // retain { u2_noun a; - if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) || - (u2_no == u2_stud(a)) ) + if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) || + (u2_no == u2ud(a)) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mbc(Pt5, shax)(wir_r, a); + return j2_mbc(Pt5, shax)(a); } } u2_weak // produce - j2_mb(Pt5, shal)(u2_wire wir_r, - u2_noun cor) // retain + j2_mb(Pt5, shal)(u2_noun cor) // retain { u2_noun a, b; - if ( (u2_none == (a = u2_frag(u2_cv_sam_2, cor))) || - (u2_none == (b = u2_frag(u2_cv_sam_3, cor))) || - (u2_no == u2_stud(a)) || - (u2_no == u2_fly_is_cat(a)) || - (u2_no == u2_stud(b)) ) + if ( (u2_none == (a = u2_cr_at(u2_cv_sam_2, cor))) || + (u2_none == (b = u2_cr_at(u2_cv_sam_3, cor))) || + (u2_no == u2ud(a)) || + (u2_no == u2_co_is_cat(a)) || + (u2_no == u2ud(b)) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mbc(Pt5, shal)(wir_r, a, b); + return j2_mbc(Pt5, shal)(a, b); } } u2_weak // produce - j2_mb(Pt5, shas)(u2_wire wir_r, + j2_mb(Pt5, shas)( u2_noun cor) // retain { u2_noun sal, ruz; - if ( (u2_none == (sal = u2_frag(u2_cv_sam_2, cor))) || - (u2_none == (ruz = u2_frag(u2_cv_sam_3, cor))) || - (u2_no == u2_stud(sal)) || - (u2_no == u2_stud(ruz)) ) + if ( (u2_none == (sal = u2_cr_at(u2_cv_sam_2, cor))) || + (u2_none == (ruz = u2_cr_at(u2_cv_sam_3, cor))) || + (u2_no == u2ud(sal)) || + (u2_no == u2ud(ruz)) ) { - return u2_bl_bail(wir_r, c3__exit); + return u2_cm_bail(c3__exit); } else { - return j2_mbc(Pt5, shas)(wir_r, sal, ruz); + return j2_mbc(Pt5, shas)(sal, ruz); } } static u2_noun // produce - _og_list(u2_wire wir_r, + _og_list( u2_noun a, // retain u2_noun b, // retain u2_noun c) // retain { u2_noun l = u2_nul; - if ( !u2_fly_is_cat(b) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( u2_ne(u2_co_is_cat(b)) ) { + return u2_cm_bail(c3__fail); } while ( 0 != b ) { - u2_noun x = j2_mbc(Pt3, mix)(wir_r, a, c); - u2_noun y = j2_mbc(Pt3, mix)(wir_r, b, x); - u2_noun d = j2_mbc(Pt5, shas)(wir_r, c3_s4('o','g','-','b'), y); + u2_noun x = j2_mbc(Pt3, mix)(a, c); + u2_noun y = j2_mbc(Pt3, mix)(b, x); + u2_noun d = j2_mbc(Pt5, shas)(c3_s4('o','g','-','b'), y); u2_noun m; u2z(x); u2z(y); if ( b < 256 ) { - u2_noun e = j2_mbc(Pt3, end)(wir_r, 0, b, d); + u2_noun e = j2_mbc(Pt3, end)(0, b, d); u2z(d); m = u2nc(b, e); @@ -169,14 +167,14 @@ } u2_noun // produce - j2_mcc(Pt5, og, raw)(u2_wire wir_r, + j2_mcc(Pt5, og, raw)( u2_noun a, // retain u2_noun b) // retain { - u2_noun x = j2_mbc(Pt3, mix)(wir_r, b, a); - u2_noun c = j2_mbc(Pt5, shas)(wir_r, c3_s4('o','g','-','a'), x); - u2_noun l = _og_list(wir_r, a, b, c); - u2_noun r = j2_mbc(Pt3, can)(wir_r, 0, l); + u2_noun x = j2_mbc(Pt3, mix)(b, a); + u2_noun c = j2_mbc(Pt5, shas)(c3_s4('o','g','-','a'), x); + u2_noun l = _og_list(a, b, c); + u2_noun r = j2_mbc(Pt3, can)(0, l); u2z(l); u2z(c); @@ -186,15 +184,15 @@ } u2_weak // transfer - j2_mc(Pt5, og, raw)(u2_wire wir_r, + j2_mc(Pt5, og, raw)( u2_noun cor) // retain { u2_noun a, b; - if ( u2_no == u2_mean(cor, u2_cv_sam, &b, u2_cv_con_sam, &a, 0) ) { - return u2_bl_bail(wir_r, c3__exit); + if ( u2_no == u2_cr_mean(cor, u2_cv_sam, &b, u2_cv_con_sam, &a, 0) ) { + return u2_cm_bail(c3__exit); } else { - return j2_mcc(Pt5, og, raw)(wir_r, a, b); + return j2_mcc(Pt5, og, raw)(a, b); } } diff --git a/gen164/5/tape.c b/gen164/5/tape.c index 53100426f4..50de39ca18 100644 --- a/gen164/5/tape.c +++ b/gen164/5/tape.c @@ -8,19 +8,19 @@ /* functions */ static u2_noun // transfer - _norm(u2_wire wir_r, + _norm( u2_noun a) // retain { if ( u2_no == u2du(a) ) { return u2_nul; } else { return u2nc(((u2_yes == u2du(u2h(a))) ? u2_nul : u2k(u2h(a))), - _norm(wir_r, u2t(a))); + _norm(u2t(a))); } } static u2_bean - _good(u2_wire wir_r, + _good( u2_noun a) // retain { while ( 1 ) { @@ -35,26 +35,26 @@ } u2_noun // transfer - j2_mby(PtM, tape)(u2_wire wir_r, + j2_mby(PtM, tape)( u2_noun a) // retain { - if ( u2_yes == _good(wir_r, a) ) { + if ( u2_yes == _good(a) ) { fprintf(stderr, "good!\r\n"); return u2k(a); } else { - return _norm(wir_r, a); + return _norm(a); } } u2_noun // transfer - j2_mb(PtM, tape)(u2_wire wir_r, + j2_mb(PtM, tape)( u2_noun cor) // retain { u2_noun a; - if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ) { + return u2_cm_bail(c3__fail); } else { - return j2_mby(PtM, tape)(wir_r, a); + return j2_mby(PtM, tape)(a); } } diff --git a/gen164/5/trip.c b/gen164/5/trip.c index 612d054666..498997fb34 100644 --- a/gen164/5/trip.c +++ b/gen164/5/trip.c @@ -8,24 +8,24 @@ /* functions */ u2_noun // transfer - j2_mby(Pt5, trip)(u2_wire wir_r, + j2_mby(Pt5, trip)( u2_atom a) // retain { - if ( u2_no == u2_stud(a) ) { - return u2_bl_bail(wir_r, c3__exit); + if ( u2_no == u2ud(a) ) { + return u2_cm_bail(c3__exit); } - return j2_mbc(Pt3, rip)(wir_r, _3, a); + return j2_mbc(Pt3, rip)(3, a); } u2_noun // transfer - j2_mb(Pt5, trip)(u2_wire wir_r, + j2_mb(Pt5, trip)( u2_noun cor) // retain { u2_noun a; - if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) ) { - return u2_bl_bail(wir_r, c3__fail); + if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ) { + return u2_cm_bail(c3__fail); } else { - return j2_mby(Pt5, trip)(wir_r, a); + return j2_mby(Pt5, trip)(a); } } diff --git a/include/f/meme.h b/include/f/meme.h index 2b09d70cd3..2844036eb8 100644 --- a/include/f/meme.h +++ b/include/f/meme.h @@ -412,6 +412,11 @@ u2_noun u2_cx_t(u2_noun som); #endif + /* u2_cx_good(): test for u2_none. + */ + u2_noun + u2_cx_good(u2_weak som); + /* u2_cx_at (u2at): fragment. */ u2_noun @@ -795,6 +800,14 @@ u2_cr_word(c3_w a_w, u2_atom b); + /* u2_cr_chub(): + ** + ** Return double-word (a_w) of (b). + */ + c3_d + u2_cr_chub(c3_w a_w, + u2_atom b); + /* u2_cr_words(): ** ** Copy words (a_w) through (a_w + b_w - 1) from (d) to (c). @@ -1069,6 +1082,11 @@ u2_noun u2_cn_slam_on(u2_noun gat, u2_noun sam); + /* u2_cn_kick_on(): fire `gat` without changing the sample. + */ + u2_noun + u2_cn_kick_on(u2_noun gat); + /* u2_cn_nock_un(): produce .*(bus fol), as ++toon. */ u2_noun @@ -1090,6 +1108,16 @@ u2_cn_slam_in(u2_noun fly, u2_noun gat, u2_noun sam); + /** Jet firing. + **/ + /* u2_cn_hook(): + ** + ** Execute hook from core. + */ + u2_noun + u2_cn_hook(u2_noun cor, + const c3_c* tam_c); + /** Memoization. *** *** The memo cache is keyed by an arbitrary symbolic function