diff --git a/jets/f/al.c b/jets/f/al.c index d3f5732d85..22692e9718 100644 --- a/jets/f/al.c +++ b/jets/f/al.c @@ -19,7 +19,8 @@ _al_core(u3_noun van, /* ~(bunt al gen) */ u3_noun -u3qfl_bunt(u3_noun van, u3_noun gen) +u3qfl_bunt(u3_noun van, + u3_noun gen) { u3_noun cor = _al_core(van, gen); @@ -30,8 +31,8 @@ u3qfl_bunt(u3_noun van, u3_noun gen) */ u3_noun u3qfl_whip(u3_noun van, - u3_noun gen, - u3_noun axe) // + u3_noun gen, + u3_noun axe) // { u3_noun cor = _al_core(van, gen); u3_noun gat = u3j_hook(u3k(cor), "whip"); diff --git a/jets/f/ap.c b/jets/f/ap.c index 6228f712c2..8670954978 100644 --- a/jets/f/ap.c +++ b/jets/f/ap.c @@ -25,7 +25,8 @@ /* ~(. al gen) */ static u3_noun - _al_core(u3_noun ter, u3_noun gen) + _al_core(u3_noun ter, + u3_noun gen) { u3_noun gat = u3j_hook(u3k(ter), "al"); @@ -35,7 +36,8 @@ /* van is transferred, gen is retained */ static u3_noun - _ap_bunt(u3_noun van, u3_noun gen) + _ap_bunt(u3_noun van, + u3_noun gen) { u3_noun pro = u3qfl_bunt(van, gen); @@ -68,50 +70,48 @@ ***/ _open_do_pq(tsbr) // =: { - return - u3nt(c3__tsls, - _ap_bunt( - _al_core(ter, p_gen), p_gen), - u3k(q_gen)); + return u3nt(c3__tsls, + _ap_bunt(_al_core(ter, p_gen), p_gen), + u3k(q_gen)); } _open_do_pq(tscl) // =: { return u3nt(c3__tsgr, u3nt(c3__cncb, - u3nc(u3nc(u3_nul, 1), - u3_nul), - u3k(p_gen)), - u3k(q_gen)); + u3nc(u3nc(u3_nul, 1), + u3_nul), + u3k(p_gen)), + u3k(q_gen)); } _open_do_pqr(tsdt) // =. { - return - u3nt(c3__tsgr, - u3nt(c3__cncb, - u3nc(u3nc(u3_nul, 1), - u3_nul), - u3nc(u3nc(u3k(p_gen), - u3k(q_gen)), - u3_nul)), - u3k(r_gen)); + return u3nt(c3__tsgr, + u3nt(c3__cncb, + u3nc(u3nc(u3_nul, 1), + u3_nul), + u3nc(u3nc(u3k(p_gen), + u3k(q_gen)), + u3_nul)), + u3k(r_gen)); } _open_do_pq(tsgl) // =< { - return u3nt(c3__tsgr, u3k(q_gen), - u3k(p_gen)); + return u3nt(c3__tsgr, + u3k(q_gen), + u3k(p_gen)); } _open_do_pq(tshp) // =- { - return u3nt(c3__tsls, u3k(q_gen), - u3k(p_gen)); + return u3nt(c3__tsls, + u3k(q_gen), + u3k(p_gen)); } _open_do_pq(tsls) // =+ { - return u3nt - (c3__tsgr, - u3nc(u3k(p_gen), - u3nc(u3_nul, 1)), - u3k(q_gen)); + return u3nt(c3__tsgr, + u3nc(u3k(p_gen), + u3nc(u3_nul, 1)), + u3k(q_gen)); } _open_do_p(tssg) // =~ { @@ -129,8 +129,8 @@ } else { return u3nt(c3__tsgr, - u3k(ip_gen), - _open_in_tssg(ter, tp_gen)); + u3k(ip_gen), + _open_in_tssg(ter, tp_gen)); } } } @@ -145,33 +145,30 @@ { return u3nc(c3__ktsg, - _ap_bunt( - _al_core(ter, p_gen), - p_gen)); + _ap_bunt(_al_core(ter, p_gen), + p_gen)); } _open_do_p(bczp) // $! { - return u3nt - (c3__bccb, c3__axil, u3k(p_gen)); + return u3nt(c3__bccb, + c3__axil, + u3k(p_gen)); } /*** **** ***/ _open_do_p(brhp) // |- { - return u3nt - (c3__tsgl, - u3nc(c3__cnzy, u3_blip), - u3nc(c3__brdt, u3k(p_gen))); + return u3nt(c3__tsgl, + u3nc(c3__cnzy, u3_blip), + u3nc(c3__brdt, u3k(p_gen))); } _open_do_p(brdt) // |. { - return u3nc - (c3__brcn, - u3nt( - u3nt(u3_blip, c3__ash, u3k(p_gen)), - u3_nul, - u3_nul)); + return u3nc(c3__brcn, + u3nt(u3nt(u3_blip, c3__ash, u3k(p_gen)), + u3_nul, + u3_nul)); } /*** @@ -186,52 +183,48 @@ u3_noun ip_gen = u3h(p_gen); u3_noun tp_gen = u3t(p_gen); - return u3nq - (c3__wtcl, - u3k(ip_gen), - u3nt(c3__dtzz, 'f', c3y), - _open_in_wtbr(ter, tp_gen)); + return u3nq(c3__wtcl, + u3k(ip_gen), + u3nt(c3__dtzz, 'f', c3y), + _open_in_wtbr(ter, tp_gen)); } } _open_do_pqr(wtkt) // ?^ { - return u3nq - (c3__wtcl, - u3nt(c3__wtts, - u3nt(c3__axil, c3__atom, u3_blip), - u3k(p_gen)), - u3k(r_gen), - u3k(q_gen)); + return u3nq(c3__wtcl, + u3nt(c3__wtts, + u3nt(c3__axil, c3__atom, u3_blip), + u3k(p_gen)), + u3k(r_gen), + u3k(q_gen)); } _open_do_pq(wtgl) // ?< { - return u3nq - (c3__wtcl, - u3k(p_gen), - u3nc(c3__zpzp, u3_nul), - u3k(q_gen)); + return u3nq(c3__wtcl, + u3k(p_gen), + u3nc(c3__zpzp, u3_nul), + u3k(q_gen)); } _open_do_pqr(wtdt) // ?. { return u3nq(c3__wtcl, - u3k(p_gen), - u3k(r_gen), - u3k(q_gen)); + u3k(p_gen), + u3k(r_gen), + u3k(q_gen)); } _open_do_pq(wtgr) // ?> { - return u3nq - (c3__wtcl, - u3k(p_gen), - u3k(q_gen), - u3nc(c3__zpzp, u3_nul)); + return u3nq(c3__wtcl, + u3k(p_gen), + u3k(q_gen), + u3nc(c3__zpzp, u3_nul)); } _open_do_pq(wthp) // ?- { if ( (u3_nul == q_gen) ) { return u3nc(c3__zpfs, - u3nc(c3__cnzz, - u3k(p_gen))); + u3nc(c3__cnzz, + u3k(p_gen))); } else { u3_noun iq_gen = u3h(q_gen); @@ -239,14 +232,12 @@ u3_noun piq_gen = u3h(iq_gen); u3_noun qiq_gen = u3t(iq_gen); - return u3nq - ( - c3__wtcl, - u3nt(c3__wtts, - u3k(piq_gen), - u3k(p_gen)), - u3k(qiq_gen), - _open_in_wthp(ter, p_gen, tq_gen)); + return u3nq(c3__wtcl, + u3nt(c3__wtts, + u3k(piq_gen), + u3k(p_gen)), + u3k(qiq_gen), + _open_in_wthp(ter, p_gen, tq_gen)); } } _open_do_p(wtpm) // ?& @@ -258,18 +249,16 @@ u3_noun ip_gen = u3h(p_gen); u3_noun tp_gen = u3t(p_gen); - return u3nq - (c3__wtcl, - u3k(ip_gen), - _open_in_wtpm(ter, tp_gen), - u3nt(c3__dtzz, 'f', c3n)); + return u3nq(c3__wtcl, + u3k(ip_gen), + _open_in_wtpm(ter, tp_gen), + u3nt(c3__dtzz, 'f', c3n)); } } _open_do_pqr(wtls) // ?+ - { u3_noun tul = u3nc( - u3nc(u3nc(c3__axil, c3__noun), - u3k(q_gen)), - u3_nul); + { u3_noun tul = u3nc(u3nc(u3nc(c3__axil, c3__noun), + u3k(q_gen)), + u3_nul); u3_noun zal = u3qb_weld(r_gen, tul); u3_noun ret = u3nt(c3__wthp, u3k(p_gen), zal); @@ -280,30 +269,29 @@ _open_do_pqr(wtpt) // ?@ { return u3nq(c3__wtcl, - u3nt(c3__wtts, - u3nt(c3__axil, - c3__atom, - u3_blip), - u3k(p_gen)), + u3nt(c3__wtts, + u3nt(c3__axil, + c3__atom, + u3_blip), + u3k(p_gen)), u3k(q_gen), - u3k(r_gen)); + u3k(r_gen)); } _open_do_pqr(wtsg) // ?~ { return u3nq(c3__wtcl, - u3nt(c3__wtts, - u3nc(c3__axil, c3__null), - u3k(p_gen)), - u3k(q_gen), - u3k(r_gen)); + u3nt(c3__wtts, + u3nc(c3__axil, c3__null), + u3k(p_gen)), + u3k(q_gen), + u3k(r_gen)); } _open_do_p(wtzp) // ?! { - return u3nq - (c3__wtcl, - u3k(p_gen), - u3nt(c3__dtzz, 'f', c3n), - u3nt(c3__dtzz, 'f', c3y)); + return u3nq(c3__wtcl, + u3k(p_gen), + u3nt(c3__dtzz, 'f', c3n), + u3nt(c3__dtzz, 'f', c3y)); } /*** **** @@ -314,51 +302,47 @@ } _open_do_p(zpgr) // !> { - return u3nq - (c3__cnhp, - u3nc(c3__cnzy, c3__onan), - u3nt(c3__zpsm, - u3nc(c3__bctr, - u3nc(c3__herb, - u3nc(c3__cnzy, - c3__abel))), - u3k(p_gen)), - u3_nul); + return u3nq(c3__cnhp, + u3nc(c3__cnzy, c3__onan), + u3nt(c3__zpsm, + u3nc(c3__bctr, + u3nc(c3__herb, + u3nc(c3__cnzy, + c3__abel))), + u3k(p_gen)), + u3_nul); } /*** **** ***/ _open_do_pq(clhp) // :- { - return u3nc - (u3k(p_gen), - u3k(q_gen)); + return u3nc(u3k(p_gen), + u3k(q_gen)); } _open_do_pq(clcb) // :_ { - return u3nc - (u3k(q_gen), - u3k(p_gen)); + return u3nc(u3k(q_gen), + u3k(p_gen)); } _open_do_p(clcn) // :% { - return u3nc - (u3nc(c3__clsg, - u3k(p_gen)), - u3nc(c3__bczp, c3__null)); + return u3nc(u3nc(c3__clsg, + u3k(p_gen)), + u3nc(c3__bczp, c3__null)); } _open_do_pqrs(clkt) // :^ { - return u3nq - (u3k(p_gen), - u3k(q_gen), - u3k(r_gen), - u3k(s_gen)); + return u3nq(u3k(p_gen), + u3k(q_gen), + u3k(r_gen), + u3k(s_gen)); } _open_do_pqr(clls) // :+ { - return u3nt - (u3k(p_gen), u3k(q_gen), u3k(r_gen)); + return u3nt(u3k(p_gen), + u3k(q_gen), + u3k(r_gen)); } _open_do_p(clsg) // :~ { @@ -385,9 +369,8 @@ if ( (u3_nul == tp_gen) ) { return u3k(ip_gen); } else { - return u3nc - (u3k(ip_gen), - _open_in_cltr(ter, tp_gen)); + return u3nc(u3k(ip_gen), + _open_in_cltr(ter, tp_gen)); } } } @@ -396,12 +379,11 @@ ***/ _open_do_pq(cncb) // %_ { - return u3nc - (c3__ktls, - u3nq(u3nc(c3__cnzz, u3k(p_gen)), - c3__cnts, - u3k(p_gen), - u3k(q_gen))); + return u3nc(c3__ktls, + u3nq(u3nc(c3__cnzz, u3k(p_gen)), + c3__cnts, + u3k(p_gen), + u3k(q_gen))); } #if 0 _open_do_pq(cncl) // %: @@ -415,101 +397,90 @@ #endif _open_do_pq(cndt) // %. { - return u3nt - (c3__cnhp, - u3k(q_gen), - u3nc(u3k(p_gen), u3_nul)); + return u3nt(c3__cnhp, + u3k(q_gen), + u3nc(u3k(p_gen), u3_nul)); } _open_do_pqrs(cnkt) // %^ { - return u3nq - (c3__cnhp, - u3k(p_gen), - u3k(q_gen), - u3nt(u3k(r_gen), - u3k(s_gen), - u3_nul)); + return u3nq(c3__cnhp, + u3k(p_gen), + u3k(q_gen), + u3nt(u3k(r_gen), + u3k(s_gen), + u3_nul)); } _open_do_pq(cnhp) // %- { if ( (u3_nul == q_gen) ) { - return u3nt - (c3__tsgr, - u3k(p_gen), - u3nc(c3__cnzy, u3_blip)); + return u3nt(c3__tsgr, + u3k(p_gen), + u3nc(c3__cnzy, u3_blip)); } else { return u3nq(c3__cncl, - u3k(p_gen), - c3__cltr, - u3k(q_gen)); + u3k(p_gen), + c3__cltr, + u3k(q_gen)); } } _open_do_pqr(cnls) // %+ { - return u3nc - (c3__cnhp, - u3nq(u3k(p_gen), - u3k(q_gen), - u3k(r_gen), - u3_nul)); + return u3nc(c3__cnhp, + u3nq(u3k(p_gen), + u3k(q_gen), + u3k(r_gen), + u3_nul)); } _open_do_pqr(cnsg) // %~ { - return u3nq - (c3__cntr, - u3k(p_gen), - u3k(q_gen), - u3nc(u3nc(u3nc(u3nc(u3_nul, 6), 0), u3k(r_gen)), 0)); + return u3nq(c3__cntr, + u3k(p_gen), + u3k(q_gen), + u3nc(u3nc(u3nc(u3nc(u3_nul, 6), 0), u3k(r_gen)), 0)); } _open_do_p(cnzy) // %cnzy { - return u3nt - (c3__cnts, - u3nc(u3k(p_gen), u3_nul), - u3_nul); + return u3nt(c3__cnts, + u3nc(u3k(p_gen), u3_nul), + u3_nul); } _open_do_p(cnzz) // %cnzz { - return u3nt - (c3__cnts, u3k(p_gen), u3_nul); + return u3nt(c3__cnts, u3k(p_gen), u3_nul); } /*** **** ***/ _open_do_p(hxgl) // #< { - return u3nq - (c3__cnhp, - u3nc(c3__cnzy, c3__noah), - u3nc(c3__zpgr, - u3nc(c3__cltr, u3k(p_gen))), - u3_nul); + return u3nq(c3__cnhp, + u3nc(c3__cnzy, c3__noah), + u3nc(c3__zpgr, + u3nc(c3__cltr, u3k(p_gen))), + u3_nul); } _open_do_p(hxgr) // #> { - return u3nq - (c3__cnhp, - u3nc(c3__cnzy, c3__cain), - u3nc(c3__zpgr, - u3nc(c3__cltr, u3k(p_gen))), - u3_nul); + return u3nq(c3__cnhp, + u3nc(c3__cnzy, c3__cain), + u3nc(c3__zpgr, + u3nc(c3__cltr, u3k(p_gen))), + u3_nul); } /*** **** ***/ _open_do_pq(ktdt) // ^. { - return u3nt - (c3__ktls, - u3nq(c3__cnhp, u3k(p_gen), u3k(q_gen), u3_nul), - u3k(q_gen)); + return u3nt(c3__ktls, + u3nq(c3__cnhp, u3k(p_gen), u3k(q_gen), u3_nul), + u3k(q_gen)); } _open_do_pq(kthp) // ^- { - return u3nt - (c3__ktls, - _ap_bunt(_al_core(ter, p_gen), p_gen), - u3k(q_gen)); + return u3nt(c3__ktls, + _ap_bunt(_al_core(ter, p_gen), p_gen), + u3k(q_gen)); } /*** **** @@ -523,13 +494,10 @@ _open_do_pq(brkt) // |^ { u3_noun diz = u3nc(c3__ash, u3k(p_gen)); - u3_noun ret = u3nt - ( - c3__tsgr, - u3nc( - c3__brcn, - u3qdb_put(q_gen, u3_blip, diz)), - u3nc(c3__cnzy, u3_blip)); + u3_noun ret = u3nt(c3__tsgr, + u3nc(c3__brcn, + u3qdb_put(q_gen, u3_blip, diz)), + u3nc(c3__cnzy, u3_blip)); u3z(diz); return ret; @@ -537,25 +505,24 @@ _open_do_pq(brls) // |+ { return u3nc(c3__ktbr, - u3nt(c3__brts, - u3k(p_gen), - u3k(q_gen))); + u3nt(c3__brts, + u3k(p_gen), + u3k(q_gen))); } _open_do_p(brwt) // |? { return u3nt(c3__ktwt, - c3__brdt, - u3k(p_gen)); + c3__brdt, + u3k(p_gen)); } /*** **** ***/ _open_do_pq(sgts) // ~= { - return u3nt - (c3__sggr, - u3nc(c3__germ, u3k(p_gen)), - u3k(q_gen)); + return u3nt(c3__sggr, + u3nc(c3__germ, u3k(p_gen)), + u3k(q_gen)); } #if 0 _open_do_pq(sgbr) // ~| @@ -568,30 +535,29 @@ #endif _open_do_pq(sggl) // ~> { - return u3nt - (c3__tsgl, - u3nq(c3__sggr, u3k(p_gen), u3_nul, 1), - u3k(q_gen)); + return u3nt(c3__tsgl, + u3nq(c3__sggr, u3k(p_gen), u3_nul, 1), + u3k(q_gen)); } _open_do_pq(sgbc) // ~$ { return u3nt(c3__sggr, - u3nq(c3__live, - c3__dtzz, u3_blip, u3k(p_gen)), - u3k(q_gen)); + u3nq(c3__live, + c3__dtzz, + u3_blip, + u3k(p_gen)), + u3k(q_gen)); } _open_do_pq(sgcb) // ~_ { - return u3nt - (c3__sggr, - u3nc(c3__mean, - u3nc(c3__brdt, - u3k(p_gen))), - u3k(q_gen)); + return u3nt(c3__sggr, + u3nc(c3__mean, + u3nc(c3__brdt, + u3k(p_gen))), + u3k(q_gen)); } static u3_noun - _sgcn_a( - u3_noun r_gen, + _sgcn_a(u3_noun r_gen, u3_noun nob) { if ( c3n == u3du(r_gen) ) { @@ -603,101 +569,85 @@ u3x_cell(ir_gen, &pir_gen, &qir_gen); - return u3nc - (u3nc - ( - u3nt(c3__dtzz, u3_blip, u3k(pir_gen)), - u3nc(c3__zpts, u3k(qir_gen))), - _sgcn_a(tr_gen, nob)); + return u3nc(u3nc(u3nt(c3__dtzz, u3_blip, u3k(pir_gen)), + u3nc(c3__zpts, u3k(qir_gen))), + _sgcn_a(tr_gen, nob)); } } _open_do_pqrs(sgcn) // ~% { - return u3nt - (c3__sggl, - u3nq - (c3__fast, - c3__clls, - u3nt(c3__dtzz, u3_blip, u3k(p_gen)), - u3nt - (u3nc(c3__zpts, u3k(q_gen)), - c3__clsg, - _sgcn_a(r_gen, u3_nul))), - u3k(s_gen)); + return u3nt(c3__sggl, + u3nq(c3__fast, + c3__clls, + u3nt(c3__dtzz, u3_blip, u3k(p_gen)), + u3nt(u3nc(c3__zpts, u3k(q_gen)), + c3__clsg, + _sgcn_a(r_gen, u3_nul))), + u3k(s_gen)); } _open_do_pq(sgfs) // ~/ { - return u3nc - (c3__sgcn, - u3nq(u3k(p_gen), - u3nc(u3_nul, 7), - u3_nul, - u3k(q_gen))); + return u3nc(c3__sgcn, + u3nq(u3k(p_gen), + u3nc(u3_nul, 7), + u3_nul, + u3k(q_gen))); } _open_do_pq(sgls) // ~+ { - return u3nt - (c3__sggr, - u3nq(c3__memo, c3__dtzz, u3_blip, u3k(p_gen)), - u3k(q_gen)); + return u3nt(c3__sggr, + u3nq(c3__memo, c3__dtzz, u3_blip, u3k(p_gen)), + u3k(q_gen)); } _open_do_pqr(sgpm) // ~& { - return u3nt - ( - c3__sggr, - u3nt( - c3__slog, - u3nt(c3__dtzy, u3_blip, u3k(p_gen)), - u3nq(c3__cnhp, u3nc(c3__cnzy, c3__cain), - u3nc(c3__zpgr, u3k(q_gen)), u3_nul)), - u3k(r_gen)); + return u3nt(c3__sggr, + u3nt(c3__slog, + u3nt(c3__dtzy, u3_blip, u3k(p_gen)), + u3nq(c3__cnhp, u3nc(c3__cnzy, c3__cain), + u3nc(c3__zpgr, u3k(q_gen)), u3_nul)), + u3k(r_gen)); } _open_do_pqrs(sgwt) // ~? { - return u3nt - (c3__tsls, - u3nq(c3__wtdt, - u3k(q_gen), - u3nc(c3__bczp, c3__null), - u3nc(u3nc(c3__bczp, c3__null), u3k(r_gen))), - u3nq(c3__wtsg, - u3nc(u3nc(u3_nul, 2),u3_nul), - u3nt(c3__tsgr, - u3nc(u3_nul, 3), - u3k(s_gen)), - u3nq(c3__sgpm, - u3k(p_gen), - u3nc(u3_nul, 5), - u3nt(c3__tsgr, - u3nc(u3_nul, 3), - u3k(s_gen))))); + return u3nt(c3__tsls, + u3nq(c3__wtdt, + u3k(q_gen), + u3nc(c3__bczp, c3__null), + u3nc(u3nc(c3__bczp, c3__null), u3k(r_gen))), + u3nq(c3__wtsg, + u3nc(u3nc(u3_nul, 2),u3_nul), + u3nt(c3__tsgr, + u3nc(u3_nul, 3), + u3k(s_gen)), + u3nq(c3__sgpm, + u3k(p_gen), + u3nc(u3_nul, 5), + u3nt(c3__tsgr, + u3nc(u3_nul, 3), + u3k(s_gen))))); } /*** **** ***/ static u3_noun - _smcl_in( - u3_noun q_gen) + _smcl_in(u3_noun q_gen) { u3_noun hq_gen = u3h(q_gen); u3_noun tq_gen = u3t(q_gen); if ( c3n == u3du(tq_gen) ) { return u3nt(c3__tsgr, - u3nc(u3_nul, 3), - u3k(hq_gen)); + u3nc(u3_nul, 3), + u3k(hq_gen)); } else { - return u3nc - ( - c3__cnhp, - u3nq( - u3nc(u3_nul, 2), - u3nt(c3__tsgr, + return u3nc(c3__cnhp, + u3nq(u3nc(u3_nul, 2), + u3nt(c3__tsgr, u3nc(u3_nul, 3), u3k(hq_gen)), - _smcl_in(tq_gen), - u3_nul)); + _smcl_in(tq_gen), + u3_nul)); } } _open_do_pq(smcl) @@ -709,11 +659,9 @@ return u3k(u3h(q_gen)); } else { - return u3nt - ( - c3__tsls, - u3k(p_gen), - _smcl_in(q_gen)); + return u3nt(c3__tsls, + u3k(p_gen), + _smcl_in(q_gen)); } } #if 0 @@ -749,8 +697,7 @@ /** open **/ static u3_noun - _open_in( - u3_noun ter, + _open_in(u3_noun ter, u3_noun gen) { u3_noun p_gen, q_gen, r_gen, s_gen; @@ -760,19 +707,17 @@ // u3_err("stud m", gen); return u3m_bail(c3__exit); - return u3nt - (c3__cnts, - u3nc(u3k(gen), u3_nul), - u3_nul); + return u3nt(c3__cnts, + u3nc(u3k(gen), u3_nul), + u3_nul); } else switch ( u3h(gen) ) { default: return u3_none; case u3_nul: { - return u3nt - (c3__cnts, - u3nc(u3k(gen), u3_nul), - u3_nul); + return u3nt(c3__cnts, + u3nc(u3k(gen), u3_nul), + u3_nul); } # define _open_p(stem) \ @@ -875,8 +820,7 @@ /** rake **/ u3_noun - u3qfp_rake( - u3_noun gen) + u3qfp_rake(u3_noun gen) { u3_noun p_gen, q_gen; @@ -916,8 +860,7 @@ } } u3_noun - u3wfp_rake( - u3_noun cor) + u3wfp_rake(u3_noun cor) { u3_noun gen; @@ -931,17 +874,16 @@ /** hack **/ u3_noun - u3qfp_hack( - u3_noun ter, - u3_noun gen) + u3qfp_hack(u3_noun ter, + u3_noun gen) { u3_noun p_gen, q_gen; u3_noun ret; if ( c3y == u3du(u3h(gen)) ) { return u3nt(c3y, - u3k(u3h(gen)), - u3k(u3t(gen))); + u3k(u3h(gen)), + u3k(u3t(gen))); } else switch ( u3h(gen) ) { case c3__tsgr: u3x_cell(u3t(gen), &p_gen, &q_gen); @@ -953,21 +895,19 @@ u3_noun pyr = u3qfp_hack(ter, q_gen); if ( c3y == u3h(pyr) ) { - ret = u3nt - (c3y, - u3nt(c3__tsgr, - u3k(p_gen), - u3k(u3h(u3t(pyr)))), - u3nt(c3__tsgr, - u3k(p_gen), - u3k(u3t(u3t(pyr))))); + ret = u3nt(c3y, + u3nt(c3__tsgr, + u3k(p_gen), + u3k(u3h(u3t(pyr)))), + u3nt(c3__tsgr, + u3k(p_gen), + u3k(u3t(u3t(pyr))))); } else { - ret = u3nc - (c3n, - u3nt(c3__tsgr, - u3k(p_gen), - u3k(u3t(pyr)))); + ret = u3nc(c3n, + u3nt(c3__tsgr, + u3k(p_gen), + u3k(u3t(pyr)))); } u3z(pyr); return ret; @@ -978,21 +918,19 @@ u3_noun pyr = u3qfp_hack(ter, q_gen); if ( c3y == u3h(pyr) ) { - ret = u3nt - (c3y, - u3nt(c3__zpcb, - u3k(p_gen), - u3k(u3h(u3t(pyr)))), - u3nt(c3__zpcb, - u3k(p_gen), - u3k(u3t(u3t(pyr))))); + ret = u3nt(c3y, + u3nt(c3__zpcb, + u3k(p_gen), + u3k(u3h(u3t(pyr)))), + u3nt(c3__zpcb, + u3k(p_gen), + u3k(u3t(u3t(pyr))))); } else { - ret = u3nc - (c3n, - u3nt(c3__zpcb, - u3k(p_gen), - u3k(u3t(pyr)))); + ret = u3nc(c3n, + u3nt(c3__zpcb, + u3k(p_gen), + u3k(u3t(pyr)))); } u3z(pyr); return ret; @@ -1019,8 +957,7 @@ } u3_noun - u3wfp_hack( - u3_noun cor) + u3wfp_hack(u3_noun cor) { u3_noun gen; @@ -1036,7 +973,8 @@ /* boilerplate */ u3_noun - _ap_core(u3_noun ter, u3_noun gen) + _ap_core(u3_noun ter, + u3_noun gen) { u3_noun gat = u3j_hook(u3k(ter), "ap"); @@ -1054,7 +992,8 @@ return u3j_soft(cor, "open"); } static u3_noun - _ap_open_l(u3_noun ter, u3_noun gen) + _ap_open_l(u3_noun ter, + u3_noun gen) { u3_noun pro = _open_in(ter, gen); @@ -1066,7 +1005,8 @@ } u3_noun - u3qfp_open(u3_noun ter, u3_noun gen) + u3qfp_open(u3_noun ter, + u3_noun gen) { return _ap_open_l(ter, gen); } diff --git a/jets/f/bull.c b/jets/f/bull.c index 57c070db4f..1896d88a83 100644 --- a/jets/f/bull.c +++ b/jets/f/bull.c @@ -7,9 +7,8 @@ /* functions */ u3_noun - u3qf_bull( - u3_noun bid, - u3_noun der) + u3qf_bull(u3_noun bid, + u3_noun der) { if ( (c3__void == der) || (c3__void == u3t(u3t(u3t(bid)))) ) @@ -20,8 +19,7 @@ (c3__bull, u3k(bid), u3k(der)); } u3_noun - u3wf_bull( - u3_noun cor) + u3wf_bull(u3_noun cor) { u3_noun bid, der; diff --git a/jets/f/cell.c b/jets/f/cell.c index e7a69be9fd..f4987eb8b6 100644 --- a/jets/f/cell.c +++ b/jets/f/cell.c @@ -7,7 +7,8 @@ /* functions */ u3_noun - u3qf_cell(u3_noun hed, u3_noun tal) + u3qf_cell(u3_noun hed, + u3_noun tal) { if ( (c3__void == hed) || (c3__void == tal) ) { return c3__void; @@ -16,8 +17,7 @@ } } u3_noun - u3wf_cell( - u3_noun cor) + u3wf_cell(u3_noun cor) { u3_noun hed, tal; diff --git a/jets/f/comb.c b/jets/f/comb.c index 5614c081bb..acbe0e5d73 100644 --- a/jets/f/comb.c +++ b/jets/f/comb.c @@ -7,9 +7,8 @@ /* functions */ u3_noun - u3qf_comb( - u3_noun mal, - u3_noun buz) + u3qf_comb(u3_noun mal, + u3_noun buz) { if ( (u3_none == mal) || (u3_none == buz) ) { return u3_none; @@ -19,23 +18,22 @@ if ( (c3y == u3r_p(mal, 0, &p_mal)) && (0 != p_mal) ) { if ( (c3y == u3r_p(buz, 0, &p_buz)) && (0 != p_buz) ) { - return u3nc( - 0, - u3qc_peg(p_mal, p_buz)); + return u3nc(0, + u3qc_peg(p_mal, p_buz)); } else if ( c3y == u3r_pq(buz, 2, &p_buz, &q_buz) && c3y == u3r_p(p_buz, 0, &pp_buz) && c3y == u3r_p(q_buz, 0, &pq_buz) ) { - return u3nt - (2, - u3nc(0, - u3qc_peg(p_mal, pp_buz)), - u3nc(0, - u3qc_peg(p_mal, pq_buz))); + return u3nt(2, + u3nc(0, + u3qc_peg(p_mal, pp_buz)), + u3nc(0, + u3qc_peg(p_mal, pq_buz))); } - else return u3nt(7, u3k(mal), - u3k(buz)); + else return u3nt(7, + u3k(mal), + u3k(buz)); } #if 1 else if ( (c3y == u3r_bush(mal, &p_mal, &q_mal)) && @@ -44,8 +42,9 @@ (0 == u3h(q_mal)) && (1 == u3t(q_mal)) ) { - return u3nt(8, u3k(p_mal), - u3k(buz)); + return u3nt(8, + u3k(p_mal), + u3k(buz)); } #endif else if ( (c3y == u3r_p(buz, 0, &p_buz)) && @@ -53,13 +52,13 @@ { return u3k(mal); } - else return u3nt(7, u3k(mal), - u3k(buz)); + else return u3nt(7, + u3k(mal), + u3k(buz)); } } u3_noun - u3wf_comb( - u3_noun cor) + u3wf_comb(u3_noun cor) { u3_noun mal, buz; diff --git a/jets/f/cons.c b/jets/f/cons.c index f7f4ad3861..afa641c271 100644 --- a/jets/f/cons.c +++ b/jets/f/cons.c @@ -7,17 +7,16 @@ /* functions */ u3_noun - u3qf_cons( - u3_noun vur, - u3_noun sed) + u3qf_cons(u3_noun vur, + u3_noun sed) { u3_noun p_vur, p_sed; if ( c3y == u3r_p(vur, 1, &p_vur) && c3y == u3r_p(sed, 1, &p_sed) ) { return u3nt(1, - u3k(p_vur), - u3k(p_sed)); + u3k(p_vur), + u3k(p_sed)); } else if ( c3y == u3r_p(vur, 0, &p_vur) && c3y == u3r_p(sed, 0, &p_sed) && @@ -41,8 +40,7 @@ return u3nc(u3k(vur), u3k(sed)); } u3_noun - u3wf_cons( - u3_noun cor) + u3wf_cons(u3_noun cor) { u3_noun vur, sed; diff --git a/jets/f/core.c b/jets/f/core.c index 3fcadc788d..fddb8f8134 100644 --- a/jets/f/core.c +++ b/jets/f/core.c @@ -7,9 +7,8 @@ /* functions */ u3_noun - u3qf_core( - u3_noun pac, - u3_noun con) + u3qf_core(u3_noun pac, + u3_noun con) { if ( (c3__void == pac) ) { return c3__void; @@ -18,8 +17,7 @@ } } u3_noun - u3wf_core( - u3_noun cor) + u3wf_core(u3_noun cor) { u3_noun pac, con; diff --git a/jets/f/cube.c b/jets/f/cube.c index cd60ccf15b..d42fe9a73e 100644 --- a/jets/f/cube.c +++ b/jets/f/cube.c @@ -7,19 +7,18 @@ /* functions */ u3_noun - u3qf_cube( - u3_noun dil, - u3_noun goq) + u3qf_cube(u3_noun dil, + u3_noun goq) { if ( c3__void == goq ) { return c3__void; } - else return u3nt - (c3__cube, u3k(dil), u3k(goq)); + else return u3nt(c3__cube, + u3k(dil), + u3k(goq)); } u3_noun - u3wf_cube( - u3_noun cor) + u3wf_cube(u3_noun cor) { u3_noun dil, goq; diff --git a/jets/f/face.c b/jets/f/face.c index 8ca3130b63..d14d200176 100644 --- a/jets/f/face.c +++ b/jets/f/face.c @@ -7,19 +7,18 @@ /* functions */ u3_noun - u3qf_face( - u3_noun cog, - u3_noun tip) + u3qf_face(u3_noun cog, + u3_noun tip) { if ( c3__void == tip ) { return c3__void; } - else return u3nt - (c3__face, u3k(cog), u3k(tip)); + else return u3nt(c3__face, + u3k(cog), + u3k(tip)); } u3_noun - u3wf_face( - u3_noun cor) + u3wf_face(u3_noun cor) { u3_noun cog, tip; diff --git a/jets/f/fine.c b/jets/f/fine.c index 44c991391f..c6b0439e8e 100644 --- a/jets/f/fine.c +++ b/jets/f/fine.c @@ -7,28 +7,27 @@ /* functions */ u3_noun - u3qf_fine( - u3_noun fuv, - u3_noun lup, - u3_noun mar) + u3qf_fine(u3_noun fuv, + u3_noun lup, + u3_noun mar) { if ( (c3__void == lup) || (c3__void == mar) ) { return c3__void; } else { - return u3nq(c3__fine, u3k(fuv), - u3k(lup), - u3k(mar)); + return u3nq(c3__fine, + u3k(fuv), + u3k(lup), + u3k(mar)); } } u3_noun - u3wf_fine( - u3_noun cor) + u3wf_fine(u3_noun cor) { u3_noun fuv, lup, mar; if ( c3n == u3r_mean(cor, u3x_sam_2, &fuv, - u3x_sam_6, &lup, - u3x_sam_7, &mar, 0) ) { + u3x_sam_6, &lup, + u3x_sam_7, &mar, 0) ) { return u3m_bail(c3__fail); } else { return u3qf_fine(fuv, lup, mar); diff --git a/jets/f/fitz.c b/jets/f/fitz.c index 008ceb3be2..9350098a9f 100644 --- a/jets/f/fitz.c +++ b/jets/f/fitz.c @@ -7,8 +7,7 @@ /* functions */ static u3_noun - _fitz_fiz( - u3_noun yaz, + _fitz_fiz(u3_noun yaz, u3_noun wix) { c3_w yaz_w = u3r_met(3, yaz); @@ -30,9 +29,8 @@ } u3_noun - u3qf_fitz( - u3_noun yaz, - u3_noun wix) + u3qf_fitz(u3_noun yaz, + u3_noun wix) { c3_w i_w, met_w = c3_min(u3r_met(3, yaz), u3r_met(3, wix)); @@ -54,8 +52,7 @@ } u3_noun - u3wf_fitz( - u3_noun cor) + u3wf_fitz(u3_noun cor) { u3_noun yaz, wix; diff --git a/jets/f/flan.c b/jets/f/flan.c index 8e19f4f23e..813436b429 100644 --- a/jets/f/flan.c +++ b/jets/f/flan.c @@ -7,9 +7,8 @@ /* functions */ u3_noun - u3qf_flan( - u3_noun bos, - u3_noun nif) + u3qf_flan(u3_noun bos, + u3_noun nif) { if ( c3y == u3r_sing(1, u3h(bos)) ) { if ( (u3_nul == u3t(bos)) ) { @@ -25,17 +24,15 @@ else return u3k(nif); } else { - return u3nq - (6, - u3k(bos), - u3k(nif), - u3nc(1, c3n)); + return u3nq(6, + u3k(bos), + u3k(nif), + u3nc(1, c3n)); } } } u3_noun - u3wf_flan( - u3_noun cor) + u3wf_flan(u3_noun cor) { u3_noun bos, nif; diff --git a/jets/f/flay.c b/jets/f/flay.c index 2420c869e7..44294ed58f 100644 --- a/jets/f/flay.c +++ b/jets/f/flay.c @@ -7,8 +7,7 @@ /* functions */ static u3_noun - _flay_roll( - u3_noun quz) + _flay_roll(u3_noun quz) { if ( c3n == u3du(quz) ) { return c3__void; @@ -22,8 +21,7 @@ } u3_noun - u3qf_flay( - u3_noun pok) + u3qf_flay(u3_noun pok) { u3_noun p_pok = u3h(pok); u3_noun q_pok = u3t(pok); @@ -41,8 +39,7 @@ } u3_noun - u3wf_flay( - u3_noun cor) + u3wf_flay(u3_noun cor) { u3_noun pok; diff --git a/jets/f/flip.c b/jets/f/flip.c index fe0c5e6d4e..32f489061c 100644 --- a/jets/f/flip.c +++ b/jets/f/flip.c @@ -7,8 +7,7 @@ /* functions */ u3_noun - u3qf_flip( - u3_noun hel) + u3qf_flip(u3_noun hel) { if ( c3y == u3r_sing(1, u3h(hel)) ) { if ( (c3y == u3t(hel)) ) { @@ -21,16 +20,14 @@ } } else { - return u3nq - (6, - u3k(hel), - u3nc(1, c3n), - u3nc(1, c3y)); + return u3nq(6, + u3k(hel), + u3nc(1, c3n), + u3nc(1, c3y)); } } u3_noun - u3wf_flip( - u3_noun cor) + u3wf_flip(u3_noun cor) { u3_noun hel; diff --git a/jets/f/flor.c b/jets/f/flor.c index 26a6146273..d06deabaa0 100644 --- a/jets/f/flor.c +++ b/jets/f/flor.c @@ -7,9 +7,8 @@ /* functions */ u3_noun - u3qf_flor( - u3_noun bos, - u3_noun nif) + u3qf_flor(u3_noun bos, + u3_noun nif) { if ( c3y == u3r_sing(1, u3h(bos)) ) { if ( (u3_nul == u3t(bos)) ) { @@ -25,17 +24,15 @@ else return u3k(bos); } else { - return u3nq - (6, - u3k(bos), - u3nc(1, c3y), - u3k(nif)); + return u3nq(6, + u3k(bos), + u3nc(1, c3y), + u3k(nif)); } } } u3_noun - u3wf_flor( - u3_noun cor) + u3wf_flor(u3_noun cor) { u3_noun bos, nif; diff --git a/jets/f/fork.c b/jets/f/fork.c index 6b4d051bee..7c6b38b1bc 100644 --- a/jets/f/fork.c +++ b/jets/f/fork.c @@ -7,9 +7,8 @@ /* functions */ u3_noun - u3qf_fork( - u3_noun hoz, - u3_noun bur) + u3qf_fork(u3_noun hoz, + u3_noun bur) { if ( c3y == u3r_sing(hoz, bur) ) { return u3k(hoz); @@ -24,8 +23,7 @@ (c3__fork, u3k(hoz), u3k(bur)); } u3_noun - u3wf_fork( - u3_noun cor) + u3wf_fork(u3_noun cor) { u3_noun hoz, bur; diff --git a/jets/f/hike.c b/jets/f/hike.c index d39fc4a902..567b1ca0d5 100644 --- a/jets/f/hike.c +++ b/jets/f/hike.c @@ -9,20 +9,19 @@ /* _lily_hike_belt_root(): convert (pac) to a list of root tools. */ static u3_noun - _lily_hike_belt_root( - u3_noun pac) + _lily_hike_belt_root(u3_noun pac) { if ( (u3_nul == pac) ) { return u3_nul; } else { - u3_atom axis = u3h(u3h(pac)); - u3_noun tool = u3t(u3h(pac)); + u3_atom axis = u3h(u3h(pac)); + u3_noun tool = u3t(u3h(pac)); u3_noun list_tool = _lily_hike_belt_root(u3t(pac)); if ( c3y == u3r_sing(1, axis) ) { return u3nc(u3k(tool), - list_tool); + list_tool); } else return list_tool; } @@ -31,8 +30,7 @@ /* _lily_hike_belt_l(): factor (pac) left. */ static u3_noun - _lily_hike_belt_l( - u3_noun pac) + _lily_hike_belt_l(u3_noun pac) { if ( (u3_nul == pac) ) { return u3_nul; @@ -40,7 +38,7 @@ else { u3_atom axis = u3h(u3h(pac)); u3_noun tool = u3t(u3h(pac)); - u3_noun belt_l = _lily_hike_belt_l(u3t(pac)); + u3_noun belt_l = _lily_hike_belt_l(u3t(pac)); { if ( (1 != axis) && @@ -48,11 +46,9 @@ { u3_atom axis_tap = u3qc_mas(axis); - return u3nc( - u3nc( - u3k(axis_tap), - u3k(tool)), - belt_l); + return u3nc(u3nc(u3k(axis_tap), + u3k(tool)), + belt_l); } else return belt_l; } @@ -62,8 +58,7 @@ /* _lily_hike_belt_r(): factor (pac) right. */ static u3_noun - _lily_hike_belt_r( - u3_noun pac) + _lily_hike_belt_r(u3_noun pac) { if ( (u3_nul == pac) ) { return u3_nul; @@ -71,7 +66,7 @@ else { u3_atom axis = u3h(u3h(pac)); u3_noun tool = u3t(u3h(pac)); - u3_noun belt_r = _lily_hike_belt_r(u3t(pac)); + u3_noun belt_r = _lily_hike_belt_r(u3t(pac)); { if ( (1 != axis) && @@ -79,10 +74,9 @@ { u3_atom axis_tap = u3qc_mas(axis); - return u3nc( - u3nc(u3k(axis_tap), - u3k(tool)), - belt_r); + return u3nc(u3nc(u3k(axis_tap), + u3k(tool)), + belt_r); } else return belt_r; } @@ -92,9 +86,8 @@ /* functions */ u3_noun - u3qf_hike( - u3_noun axe, - u3_noun pac) + u3qf_hike(u3_noun axe, + u3_noun pac) { if ( (u3_nul == pac) ) { return u3nc(0, u3k(axe)); @@ -129,8 +122,7 @@ } } u3_noun - u3wf_hike( - u3_noun cor) + u3wf_hike(u3_noun cor) { u3_noun axe, pac; diff --git a/jets/f/look.c b/jets/f/look.c index aeb5768a71..09c8d88303 100644 --- a/jets/f/look.c +++ b/jets/f/look.c @@ -7,8 +7,7 @@ /* internals */ static u3_noun - _look_in( - u3_noun cog, + _look_in(u3_noun cog, u3_noun dab, u3_atom axe) { @@ -30,8 +29,8 @@ if ( (c3y == u3du(qn_dab)) && (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, - u3k(axe), - u3k(qn_dab)); + u3k(axe), + u3k(qn_dab)); } else { return u3_nul; @@ -41,8 +40,8 @@ if ( (c3y == u3du(qn_dab)) && (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, - u3qc_peg(axe, 2), - u3k(qn_dab)); + u3qc_peg(axe, 2), + u3k(qn_dab)); } else { if ( c3y == u3qc_gor(cog, pn_dab) ) { @@ -62,8 +61,8 @@ if ( (c3y == u3du(qn_dab)) && (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, - u3qc_peg(axe, 2), - u3k(qn_dab)); + u3qc_peg(axe, 2), + u3k(qn_dab)); } else { if ( c3y == u3qc_gor(cog, pn_dab) ) { @@ -83,8 +82,8 @@ if ( (c3y == u3du(qn_dab)) && (c3y == u3r_sing(cog, pn_dab)) ) { return u3nt(u3_nul, - u3qc_peg(axe, 2), - u3k(qn_dab)); + u3qc_peg(axe, 2), + u3k(qn_dab)); } else { if ( c3y == u3qc_gor(cog, pn_dab) ) { @@ -113,15 +112,13 @@ /* functions */ u3_noun - u3qf_look( - u3_noun cog, - u3_noun dab) + u3qf_look(u3_noun cog, + u3_noun dab) { return _look_in(cog, dab, 1); } u3_noun - u3wf_look( - u3_noun cor) + u3wf_look(u3_noun cor) { u3_noun cog, dab; diff --git a/jets/f/slot.c b/jets/f/slot.c index 686f149668..212934c934 100644 --- a/jets/f/slot.c +++ b/jets/f/slot.c @@ -7,7 +7,8 @@ /* functions */ u3_noun - u3qf_slot(u3_atom axe, u3_noun vax) + u3qf_slot(u3_atom axe, + u3_noun vax) { u3_noun fag = u3r_at(axe, u3t(vax)); diff --git a/jets/f/ut.c b/jets/f/ut.c index d43a844d05..3f650a6673 100644 --- a/jets/f/ut.c +++ b/jets/f/ut.c @@ -7,9 +7,8 @@ // duck: create a duck core for mean. // u3_noun - u3qfu_duck( - u3_noun van, - u3_noun typ) + u3qfu_duck(u3_noun van, + u3_noun typ) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(typ), 0); u3_noun ret = u3j_hook(u3k(von), "dune"); @@ -21,10 +20,9 @@ // dung: create a dunk core for mean (noun caption) // u3_noun - u3qfu_dung( - u3_noun van, - u3_noun paz, - u3_noun typ) + 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_hook(u3k(von), "dunk"); @@ -38,10 +36,9 @@ // dunq: create a dunk core for mean // u3_noun - u3qfu_dunq( - u3_noun van, - const c3_c* paz_c, - u3_noun typ) + 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_hook(u3k(von), "dunk"); @@ -57,7 +54,8 @@ // shew: create a show core for mean // u3_noun - u3qfu_shew(u3_noun van, u3_noun mol) + u3qfu_shew(u3_noun van, + u3_noun mol) { u3_noun sho = u3j_hook(u3k(van), "show"); u3_noun ret = u3i_molt(u3k(sho), u3x_sam, u3k(mol), 0); @@ -70,16 +68,13 @@ // shep: show with caption and style // u3_noun - u3qfu_shep( - u3_noun van, - const c3_c* paz_c, - u3_noun sty, - u3_noun mol) + u3qfu_shep(u3_noun van, + const c3_c* paz_c, + u3_noun sty, + u3_noun mol) { - return u3qfu_shew - (van, - u3nc - (u3nc('c', u3i_string(paz_c)), - u3nc(u3k(sty), mol))); + return u3qfu_shew(van, + u3nc(u3nc('c', u3i_string(paz_c)), + u3nc(u3k(sty), mol))); } diff --git a/jets/f/ut_burn.c b/jets/f/ut_burn.c index fb2e2432a8..cfb6e753ab 100644 --- a/jets/f/ut_burn.c +++ b/jets/f/ut_burn.c @@ -7,8 +7,7 @@ /* logic */ static u3_noun - _burn_in( - u3_noun van, + _burn_in(u3_noun van, u3_noun sut, u3_noun gil) { @@ -79,17 +78,15 @@ } u3_noun - _cqfu_burn( - u3_noun van, - u3_noun sut) + _cqfu_burn(u3_noun van, + u3_noun sut) { return _burn_in(van, sut, u3_nul); } u3_noun - u3qfu_burn( - u3_noun van, - u3_noun sut) + u3qfu_burn(u3_noun van, + u3_noun sut) { c3_m fun_m = c3__burn; u3_noun pro = u3z_find(fun_m, sut); @@ -105,8 +102,7 @@ } u3_noun - u3wfu_burn( - u3_noun cor) + u3wfu_burn(u3_noun cor) { u3_noun sut; diff --git a/jets/f/ut_busk.c b/jets/f/ut_busk.c index 599bb72c1d..68a81da876 100644 --- a/jets/f/ut_busk.c +++ b/jets/f/ut_busk.c @@ -7,11 +7,10 @@ /* logic */ u3_noun - _cqfu_busk( - u3_noun van, - u3_noun sut, - u3_noun cog, - u3_noun hyp) + _cqfu_busk(u3_noun van, + u3_noun sut, + u3_noun cog, + u3_noun hyp) { u3_noun sep = u3qfu_seep(van, sut, c3__both, hyp); u3_noun bid = u3nt(u3k(cog), u3k(hyp), sep); @@ -30,9 +29,9 @@ u3_noun sut, cog, hyp, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &cog, - u3x_sam_3, &hyp, - u3x_con, &van, - 0)) || + u3x_sam_3, &hyp, + u3x_con, &van, + 0)) || (c3n == u3ud(cog)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { @@ -44,9 +43,9 @@ u3_noun u3qfu_busk(u3_noun van, - u3_noun sut, - u3_noun cog, - u3_noun hyp) + u3_noun sut, + u3_noun cog, + u3_noun hyp) { return _cqfu_busk(van, sut, cog, hyp); } diff --git a/jets/f/ut_bust.c b/jets/f/ut_bust.c index 5fb3d989ac..f829bd6869 100644 --- a/jets/f/ut_bust.c +++ b/jets/f/ut_bust.c @@ -7,17 +7,14 @@ /* logic */ u3_noun - _cqfu_bust( - u3_noun van, - u3_noun sut, - u3_noun dib) + _cqfu_bust(u3_noun van, + u3_noun sut, + u3_noun dib) { u3_noun yam = u3qfu_burn(van, sut); - u3_noun yib = u3nc - ( - u3nc(u3k(u3h(u3h(yam))), - u3k(dib)), - u3k(u3t(yam))); + u3_noun yib = u3nc(u3nc(u3k(u3h(u3h(yam))), + u3k(dib)), + u3k(u3t(yam))); u3_noun woo = u3nc(c3__cnzy, u3_blip); u3_noun wox = u3qfu_mint(van, sut, c3__noun, woo); u3_noun ret = u3n_nock_on(yib, u3k(u3t(wox))); @@ -50,8 +47,8 @@ u3_noun u3qfu_bust(u3_noun van, - u3_noun sut, - u3_noun dib) + u3_noun sut, + u3_noun dib) { #if 1 return _cqfu_bust(van, sut, dib); diff --git a/jets/f/ut_conk.c b/jets/f/ut_conk.c index 5871f51b0d..b2142a2c44 100644 --- a/jets/f/ut_conk.c +++ b/jets/f/ut_conk.c @@ -7,7 +7,9 @@ /* logic */ u3_noun - _cqfu_conk(u3_noun van, u3_noun sut, u3_noun got) + _cqfu_conk(u3_noun van, + u3_noun sut, + u3_noun got) { if ( c3y == u3ud(got) ) { return u3qf_face(got, sut); @@ -62,8 +64,8 @@ u3_noun sut, got, van; if ( (c3n == u3r_mean(cor, u3x_sam, &got, - u3x_con, &van, - 0)) || + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -74,8 +76,8 @@ u3_noun u3qfu_conk(u3_noun van, - u3_noun sut, - u3_noun got) + u3_noun sut, + u3_noun got) { return _cqfu_conk(van, sut, got); } diff --git a/jets/f/ut_crop.c b/jets/f/ut_crop.c index a0c80a7378..eec42c4dd0 100644 --- a/jets/f/ut_crop.c +++ b/jets/f/ut_crop.c @@ -12,8 +12,7 @@ _crop_sint(u3_noun, u3_noun, u3_noun, u3_noun); static u3_noun - _crop_repo( - u3_noun van, + _crop_repo(u3_noun van, u3_noun sut, u3_noun ref, u3_noun bix) @@ -36,8 +35,7 @@ } static u3_noun - _crop_dext( - u3_noun van, + _crop_dext(u3_noun van, u3_noun sut, u3_noun ref, u3_noun bix) @@ -89,8 +87,7 @@ else if ( c3__cell == u3h(ref) ) { u3x_cell(u3t(ref), &p_ref, &q_ref); - if ( c3y == u3qfu_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); @@ -175,8 +172,7 @@ } static u3_noun - _crop_sint( - u3_noun van, + _crop_sint(u3_noun van, u3_noun sut, u3_noun ref, u3_noun bix) @@ -218,10 +214,9 @@ } u3_noun - _cqfu_crop( - u3_noun van, - u3_noun sut, - u3_noun ref) + _cqfu_crop(u3_noun van, + u3_noun sut, + u3_noun ref) { return _crop_dext(van, sut, ref, u3_nul); } @@ -229,8 +224,7 @@ /* boilerplate */ u3_noun - u3wfu_crop( - u3_noun cor) + u3wfu_crop(u3_noun cor) { u3_noun sut, ref, van; @@ -245,8 +239,8 @@ u3_noun u3qfu_crop(u3_noun van, - u3_noun sut, - u3_noun ref) + u3_noun sut, + u3_noun ref) { c3_m fun_m = c3__crop; u3_noun pro = u3z_find_2(fun_m, sut, ref); diff --git a/jets/f/ut_cull.c b/jets/f/ut_cull.c index 1e209c2680..1b9ae7bc5a 100644 --- a/jets/f/ut_cull.c +++ b/jets/f/ut_cull.c @@ -10,8 +10,7 @@ _cqfu_cull(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun); static u3_noun - _cull_in( - u3_noun van, + _cull_in(u3_noun van, u3_noun sut, u3_noun pol, u3_atom axe, @@ -51,8 +50,7 @@ } case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut); { - u3_noun hic = _cqfu_cull - (van, q_sut, pol, axe, ref); + u3_noun hic = _cqfu_cull(van, q_sut, pol, axe, ref); if ( c3y == u3r_sing(hic, q_sut) ) { ret = u3k(sut); @@ -82,8 +80,7 @@ if ( 3 != now ) { ret = u3k(sut); } else { - u3_noun hub = _cqfu_cull - (van, p_sut, pol, lat, ref); + u3_noun hub = _cqfu_cull(van, p_sut, pol, lat, ref); ret = u3qf_core(hub, q_sut); @@ -93,8 +90,7 @@ } case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut); { - u3_noun hic = _cqfu_cull - (van, q_sut, pol, axe, ref); + u3_noun hic = _cqfu_cull(van, q_sut, pol, axe, ref); if ( c3y == u3r_sing(hic, q_sut) ) { ret = u3k(sut); @@ -111,10 +107,8 @@ return c3__void; } else { u3_noun zoc = u3qdi_put(vil, sut); - u3_noun sin = _cull_in - (van, p_sut, pol, axe, ref, now, lat, zoc); - u3_noun dex = _cull_in - (van, q_sut, pol, axe, ref, now, lat, zoc); + u3_noun sin = _cull_in(van, p_sut, pol, axe, ref, now, lat, zoc); + u3_noun dex = _cull_in(van, q_sut, pol, axe, ref, now, lat, zoc); ret = u3qf_fork(sin, dex); u3z(sin); @@ -148,12 +142,11 @@ } u3_noun - _cqfu_cull( - u3_noun van, - u3_noun sut, - u3_noun pol, - u3_atom axe, - u3_noun ref) + _cqfu_cull(u3_noun van, + u3_noun sut, + u3_noun pol, + u3_atom axe, + u3_noun ref) { if ( 1 == axe ) { if ( c3y == pol ) { @@ -177,9 +170,9 @@ u3_noun sut, axe, pol, ref, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &pol, - u3x_sam_6, &axe, - u3x_sam_7, &ref, - u3x_con, &van, 0)) || + u3x_sam_6, &axe, + u3x_sam_7, &ref, + u3x_con, &van, 0)) || (c3n == u3ud(axe)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { @@ -191,10 +184,10 @@ u3_noun u3qfu_cull(u3_noun van, - u3_noun sut, - u3_noun pol, - u3_noun axe, - u3_noun ref) + u3_noun sut, + u3_noun pol, + u3_noun axe, + u3_noun ref) { c3_m fun_m = c3__cull; u3_noun pro = u3z_find_4(fun_m, sut, pol, axe, ref); diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c index 557484b320..47d4d80a09 100644 --- a/jets/f/ut_find.c +++ b/jets/f/ut_find.c @@ -7,8 +7,7 @@ /* logic */ static u3_noun - _fino_in( - u3_noun van, + _fino_in(u3_noun van, u3_noun sut, u3_noun dep, u3_noun way, @@ -29,22 +28,17 @@ } else { if ( c3n == u3r_sing(cog, u3h(p_sut)) ) { - return _fino_in - (van, q_sut, dep, way, cog, gil); + return _fino_in(van, q_sut, dep, way, cog, gil); } else { if ( 0 == dep ) { - return u3nc - (0, - u3nt( - u3_nul, - 1, - u3nt(2, u3k(p_sut), - u3k(q_sut)))); + return u3nc(0, + u3nt(u3_nul, + 1, + u3nt(2, u3k(p_sut), + u3k(q_sut)))); } else { - return _fino_in - ( - van, q_sut, u3qa_dec(dep), way, cog, gil); + return _fino_in(van, q_sut, u3qa_dec(dep), way, cog, gil); } } } @@ -70,11 +64,10 @@ u3_noun puq_bov, quq_bov; u3r_mean(q_bov, 6, &puq_bov, 7, &quq_bov, 0); - ret = u3nq - (u3k(p_bov), - u3_nul, - u3qc_peg(3, puq_bov), - u3k(quq_bov)); + ret = u3nq(u3k(p_bov), + u3_nul, + u3qc_peg(3, puq_bov), + u3k(quq_bov)); } u3z(bov); } @@ -82,11 +75,10 @@ u3_noun puq_taf, quq_taf; u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); - ret = u3nq - (u3k(p_taf), - u3_nul, - u3qc_peg(2, puq_taf), - u3k(quq_taf)); + ret = u3nq(u3k(p_taf), + u3_nul, + u3qc_peg(2, puq_taf), + u3k(quq_taf)); } u3z(taf); return ret; @@ -129,24 +121,20 @@ u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); - if ( c3n == u3qfu_park - (van, sut, way, puq_taf) ) + if ( c3n == u3qfu_park(van, sut, way, puq_taf) ) { - u3_noun weh = u3qfu_shep - (van, "way", 'a', u3k(way)); - u3_noun waz = u3qfu_shep - (van, "axis", 'd', u3k(puq_taf)); + u3_noun weh = u3qfu_shep(van, "way", 'a', u3k(way)); + u3_noun waz = u3qfu_shep(van, "axis", 'd', u3k(puq_taf)); u3t_push(u3nc(c3__mean, weh)); u3t_push(u3nc(c3__mean, waz)); return u3m_error("find-park"); } else { - pro = u3nq - (u3k(p_taf), - u3_nul, - u3qc_peg(3, puq_taf), - u3k(quq_taf)); + pro = u3nq(u3k(p_taf), + u3_nul, + u3qc_peg(3, puq_taf), + u3k(quq_taf)); u3z(taf); return pro; @@ -161,23 +149,18 @@ u3_noun pro; mut = u3nt(c3__core, - u3k(p_sut), - u3nt(c3__gold, - u3k(qq_sut), - u3k(rq_sut))); + u3k(p_sut), + u3nt(c3__gold, + u3k(qq_sut), + u3k(rq_sut))); - pro = u3nc - ( - 0, - u3nq( - u3_nul, - 1, - 1, - u3nc - (u3qc_peg(2, pu_zem), - u3nc( - u3nc(mut, u3k(qu_zem)), - u3_nul)))); + pro = u3nc(0, + u3nq(u3_nul, + 1, + 1, + u3nc(u3qc_peg(2, pu_zem), + u3nc(u3nc(mut, u3k(qu_zem)), + u3_nul)))); u3z(zem); return pro; } @@ -191,9 +174,7 @@ return u3nc(u3k(dep), u3_nul); } else { if ( 0 == dep ) { - return u3nc - (0, - u3nq(u3_nul, 1, 0, u3k(q_sut))); + return u3nc(0, u3nq(u3_nul, 1, 0, u3k(q_sut))); } else { return u3nc (u3qa_dec(dep), u3_nul); @@ -253,15 +234,11 @@ u3_noun pquq_hax = u3t(quq_hax); u3_noun pquq_yor = u3t(quq_yor); - ret = u3nc - ( - u3k(p_hax), - u3nq - ( - u3_nul, - u3k(puq_hax), - 0, - u3qf_fork(pquq_hax, pquq_yor))); + ret = u3nc(u3k(p_hax), + u3nq(u3_nul, + u3k(puq_hax), + 0, + u3qf_fork(pquq_hax, pquq_yor))); break; } case 1: { @@ -273,17 +250,12 @@ if ( c3n == u3r_sing(pquq_hax, pquq_yor) ) { return u3m_error("find-fork"); } else { - ret = u3nc - ( - u3k(p_hax), - u3nq - (u3_nul, - u3k(puq_hax), - 1, - u3nc - (u3k(pquq_hax), - u3qb_weld - (qquq_hax, qquq_yor)))); + ret = u3nc(u3k(p_hax), + u3nq(u3_nul, + u3k(puq_hax), + 1, + u3nc(u3k(pquq_hax), + u3qb_weld(qquq_hax, qquq_yor)))); break; } } @@ -294,12 +266,10 @@ u3x_cell(u3t(quq_hax), &pquq_hax, &qquq_hax); u3x_cell(u3t(quq_yor), &pquq_yor, &qquq_yor); - u3x_qual( - pquq_hax, - &ppquq_hax, &qpquq_hax, &rpquq_hax, &spquq_hax); - u3x_qual( - pquq_yor, - &ppquq_yor, &qpquq_yor, &rpquq_yor, &spquq_yor); + u3x_qual(pquq_hax, + &ppquq_hax, &qpquq_hax, &rpquq_hax, &spquq_hax); + u3x_qual(pquq_yor, + &ppquq_yor, &qpquq_yor, &rpquq_yor, &spquq_yor); if ( (c3n == u3r_sing(ppquq_hax, ppquq_yor)) || (c3n == u3r_sing(qpquq_hax, qpquq_yor)) || @@ -308,23 +278,16 @@ return u3m_error("find-fork"); } else { - ret = u3nc - ( - u3k(p_hax), - u3nq - ( - u3_nul, - u3k(puq_hax), - 2, - u3nc( - u3nq( - u3k(ppquq_hax), - u3k(qpquq_hax), - u3k(rpquq_hax), - u3qf_fork( - spquq_hax, - spquq_yor)), - u3qf_fork(qquq_hax, qquq_yor)))); + ret = u3nc(u3k(p_hax), + u3nq(u3_nul, + u3k(puq_hax), + 2, + u3nc(u3nq(u3k(ppquq_hax), + u3k(qpquq_hax), + u3k(rpquq_hax), + u3qf_fork(spquq_hax, + spquq_yor)), + u3qf_fork(qquq_hax, qquq_yor)))); break; } } @@ -356,8 +319,7 @@ } static u3_noun - _find_in( - u3_noun van, + _find_in(u3_noun van, u3_noun sut, u3_noun dep, u3_noun way, @@ -385,19 +347,14 @@ } else { if ( 0 == dep ) { - return u3nc - (0, - u3nq( - u3_nul, - u3k(rp_sut), - c3y, - u3k(sp_sut))); + return u3nc(0, + u3nq(u3_nul, + u3k(rp_sut), + c3y, + u3k(sp_sut))); } else { - return _find_in - ( - van, q_sut, u3qa_dec(dep), way, cog, gil); - return u3nc - (u3qa_dec(dep), u3_nul); + return _find_in(van, q_sut, u3qa_dec(dep), way, cog, gil); + return u3nc(u3qa_dec(dep), u3_nul); } } } @@ -423,11 +380,10 @@ u3_noun puq_bov, quq_bov; u3r_mean(q_bov, 6, &puq_bov, 7, &quq_bov, 0); - ret = u3nq - (u3k(p_bov), - u3_nul, - u3qc_peg(3, puq_bov), - u3k(quq_bov)); + ret = u3nq(u3k(p_bov), + u3_nul, + u3qc_peg(3, puq_bov), + u3k(quq_bov)); } u3z(bov); } @@ -435,11 +391,10 @@ u3_noun puq_taf, quq_taf; u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); - ret = u3nq - (u3k(p_taf), - u3_nul, - u3qc_peg(2, puq_taf), - u3k(quq_taf)); + ret = u3nq(u3k(p_taf), + u3_nul, + u3qc_peg(2, puq_taf), + u3k(quq_taf)); } u3z(taf); return ret; @@ -482,8 +437,7 @@ u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0); - if ( c3n == u3qfu_park - (van, sut, way, puq_taf) ) + if ( c3n == u3qfu_park(van, sut, way, puq_taf) ) { u3_noun weh = u3qfu_shep (van, "way", 'a', u3k(way)); @@ -495,11 +449,10 @@ return u3m_error("find-park"); } else { - pro = u3nq - (u3k(p_taf), - u3_nul, - u3qc_peg(3, puq_taf), - u3k(quq_taf)); + pro = u3nq(u3k(p_taf), + u3_nul, + u3qc_peg(3, puq_taf), + u3k(quq_taf)); u3z(taf); return pro; @@ -514,23 +467,18 @@ u3_noun pro; mut = u3nt(c3__core, - u3k(p_sut), - u3nt(c3__gold, - u3k(qq_sut), - u3k(rq_sut))); + u3k(p_sut), + u3nt(c3__gold, + u3k(qq_sut), + u3k(rq_sut))); - pro = u3nc - ( - 0, - u3nq( - u3_nul, - 1, - c3n, - u3nc - (u3qc_peg(2, pu_zem), - u3nc( - u3nc(mut, u3k(qu_zem)), - u3_nul)))); + pro = u3nc(0, + u3nq(u3_nul, + 1, + c3n, + u3nc(u3qc_peg(2, pu_zem), + u3nc(u3nc(mut, u3k(qu_zem)), + u3_nul)))); u3z(zem); return pro; } @@ -544,12 +492,13 @@ return u3nc(u3k(dep), u3_nul); } else { if ( 0 == dep ) { - return u3nc - (0, - u3nq(u3_nul, 1, c3y, u3k(q_sut))); + return u3nc(0, + u3nq(u3_nul, + 1, + c3y, + u3k(q_sut))); } else { - return u3nc - (u3qa_dec(dep), u3_nul); + return u3nc(u3qa_dec(dep), u3_nul); } } } @@ -606,15 +555,11 @@ u3_noun pquq_hax = u3t(quq_hax); u3_noun pquq_yor = u3t(quq_yor); - ret = u3nc - ( - u3k(p_hax), - u3nq - ( - u3_nul, - u3k(puq_hax), - c3y, - u3qf_fork(pquq_hax, pquq_yor))); + ret = u3nc(u3k(p_hax), + u3nq(u3_nul, + u3k(puq_hax), + c3y, + u3qf_fork(pquq_hax, pquq_yor))); break; } case c3n: { @@ -626,17 +571,13 @@ if ( c3n == u3r_sing(pquq_hax, pquq_yor) ) { return u3m_error("find-fork"); } else { - ret = u3nc - ( - u3k(p_hax), - u3nq - (u3_nul, - u3k(puq_hax), - c3n, - u3nc - (u3k(pquq_hax), - u3qb_weld - (qquq_hax, qquq_yor)))); + ret = u3nc(u3k(p_hax), + u3nq(u3_nul, + u3k(puq_hax), + c3n, + u3nc(u3k(pquq_hax), + u3qb_weld + (qquq_hax, qquq_yor)))); break; } } @@ -668,23 +609,21 @@ } u3_noun - _cqfu_find( - u3_noun van, - u3_noun sut, - u3_noun dep, - u3_noun way, - u3_noun cog) + _cqfu_find(u3_noun van, + u3_noun sut, + u3_noun dep, + u3_noun way, + u3_noun cog) { return _find_in(van, sut, dep, way, cog, u3_nul); } u3_noun - _cqfu_fino( - u3_noun van, - u3_noun sut, - u3_noun dep, - u3_noun way, - u3_noun cog) + _cqfu_fino(u3_noun van, + u3_noun sut, + u3_noun dep, + u3_noun way, + u3_noun cog) { return _fino_in(van, sut, dep, way, cog, u3_nul); } @@ -692,16 +631,15 @@ /* boilerplate */ u3_noun - u3wfu_fino( - u3_noun cor) + u3wfu_fino(u3_noun cor) { u3_noun sut, dep, way, cog, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &dep, - u3x_sam_6, &way, - u3x_sam_7, &cog, - u3x_con, &van, - 0)) || + u3x_sam_6, &way, + u3x_sam_7, &cog, + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -711,12 +649,11 @@ } u3_noun - u3qfu_fino( - u3_noun van, - u3_noun sut, - u3_noun dep, - u3_noun way, - u3_noun cog) + u3qfu_fino(u3_noun van, + u3_noun sut, + u3_noun dep, + u3_noun way, + u3_noun cog) { c3_m fun_m = c3__fino; u3_noun pro = u3z_find_4(fun_m, sut, dep, way, cog); @@ -735,16 +672,15 @@ /* boilerplate */ u3_noun - u3wfu_find( - u3_noun cor) + u3wfu_find(u3_noun cor) { u3_noun sut, dep, way, cog, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &dep, - u3x_sam_6, &way, - u3x_sam_7, &cog, - u3x_con, &van, - 0)) || + u3x_sam_6, &way, + u3x_sam_7, &cog, + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -754,12 +690,11 @@ } u3_noun - u3qfu_find( - u3_noun van, - u3_noun sut, - u3_noun dep, - u3_noun way, - u3_noun cog) + u3qfu_find(u3_noun van, + u3_noun sut, + u3_noun dep, + u3_noun way, + u3_noun cog) { c3_m fun_m = c3__find; u3_noun pro = u3z_find_4(fun_m, sut, dep, way, cog); diff --git a/jets/f/ut_fink.c b/jets/f/ut_fink.c index a69008c51f..00d56a1346 100644 --- a/jets/f/ut_fink.c +++ b/jets/f/ut_fink.c @@ -7,22 +7,19 @@ /* logic */ u3_noun - _cqfu_fink( - u3_noun van, - u3_noun sut, - u3_noun dep, - u3_noun way, - u3_noun cog) + _cqfu_fink(u3_noun van, + u3_noun sut, + u3_noun dep, + u3_noun way, + u3_noun cog) { // u3_noun dun = u3qfu_dunq(van, "type", sut); u3_noun nuc = (u3_blip == cog) - ? u3qfu_shew - (van, - u3nc - (u3nc('c', u3i_string("find-limb")), - '$')) - : u3qfu_shep - (van, "find-limb", 'a', u3k(cog)); + ? u3qfu_shew(van, + u3nc(u3nc('c', + u3i_string("find-limb")), + '$')) + : u3qfu_shep(van, "find-limb", 'a', u3k(cog)); u3_noun pro; // u3t_push(u3nc(c3__mean, dun)); @@ -54,10 +51,10 @@ u3_noun sut, dep, way, cog, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &dep, - u3x_sam_6, &way, - u3x_sam_7, &cog, - u3x_con, &van, - 0)) || + u3x_sam_6, &way, + u3x_sam_7, &cog, + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -67,12 +64,11 @@ } u3_noun - u3qfu_fink( - u3_noun van, - u3_noun sut, - u3_noun dep, - u3_noun way, - u3_noun cog) + u3qfu_fink(u3_noun van, + u3_noun sut, + u3_noun dep, + u3_noun way, + u3_noun cog) { return _cqfu_fink(van, sut, dep, way, cog); } diff --git a/jets/f/ut_fire.c b/jets/f/ut_fire.c index a018bc74b8..a3c4ab04c3 100644 --- a/jets/f/ut_fire.c +++ b/jets/f/ut_fire.c @@ -14,8 +14,8 @@ { u3_noun rib = u3r_at(u3qfu_van_rib, van); u3_noun key = u3nt(u3k(sut), - u3k(dox), - u3k(gen)); + u3k(dox), + u3k(gen)); u3_noun ret; if ( c3y == u3qdi_has(rib, key) ) { @@ -24,8 +24,9 @@ else { u3_noun rob = u3qdi_put(rib, key); u3_noun von = u3i_molt(u3k(van), - u3qfu_van_rib, u3k(rob), - 0); + u3qfu_van_rib, + u3k(rob), + 0); ret = u3qfu_mull(von, sut, c3__noun, dox, gen); u3z(von); @@ -58,8 +59,7 @@ if ( c3__ash == u3h(gat) ) { if ( (c3y == vet) && - (c3n == u3qfu_nest - (van, qq_typ, c3y, p_typ)) ) + (c3n == u3qfu_nest(van, qq_typ, c3y, p_typ)) ) { #if 0 u3_noun dun = u3qfu_dunq(van, "need", qq_typ); @@ -99,8 +99,7 @@ } static u3_noun - _fire_in( - u3_noun van, + _fire_in(u3_noun van, u3_noun vet, u3_noun hag) { @@ -116,15 +115,14 @@ } else { return u3nc (_fire_each(van, vet, u3h(i_hag), u3t(i_hag)), - _fire_in(van, vet, t_hag)); + _fire_in(van, vet, t_hag)); } } } u3_noun - _cqfu_fire( - u3_noun van, - u3_noun sut, - u3_noun hag) + _cqfu_fire(u3_noun van, + u3_noun sut, + u3_noun hag) { u3_noun vet = u3r_at(u3qfu_van_vet, van); @@ -152,8 +150,7 @@ /* boilerplate */ u3_noun - u3wfu_fire( - u3_noun cor) + u3wfu_fire(u3_noun cor) { u3_noun sut, hag, van; diff --git a/jets/f/ut_firm.c b/jets/f/ut_firm.c index 0da8f873bf..ea3856dabd 100644 --- a/jets/f/ut_firm.c +++ b/jets/f/ut_firm.c @@ -7,10 +7,9 @@ /* logic */ u3_noun - _cqfu_firm( - u3_noun van, - u3_noun sut, - u3_noun dib) + _cqfu_firm(u3_noun van, + u3_noun sut, + u3_noun dib) { u3_noun p_sut, q_sut; @@ -41,16 +40,15 @@ return c3n; } else { return c3a(_cqfu_firm(van, q_sut, dib), - _cqfu_firm(van, u3t(u3t(u3t(p_sut))), - nun)); + _cqfu_firm(van, u3t(u3t(u3t(p_sut))), + nun)); } } case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut); { - return c3a - (u3du(dib), - c3a(_cqfu_firm(van, p_sut, u3h(dib)), - _cqfu_firm(van, q_sut, u3t(dib)))); + return c3a(u3du(dib), + c3a(_cqfu_firm(van, p_sut, u3h(dib)), + _cqfu_firm(van, q_sut, u3t(dib)))); } case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut); { @@ -59,12 +57,11 @@ u3x_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); u3x_cell(rq_sut, &prq_sut, &qrq_sut); - return c3a - (u3du(dib), - c3a - (_cqfu_firm(van, p_sut, u3h(dib)), - ((u3_nul == prq_sut) ? u3m_error("firm-core") - : u3r_sing(prq_sut, u3t(dib))))); + return c3a(u3du(dib), + c3a(_cqfu_firm(van, p_sut, u3h(dib)), + ((u3_nul == prq_sut) ? u3m_error("firm-core") + : u3r_sing(prq_sut, + u3t(dib))))); } case c3__cube: u3x_cell(u3t(sut), &p_sut, &q_sut); { @@ -93,8 +90,7 @@ /* boilerplate */ u3_noun - u3wfu_firm( - u3_noun cor) + u3wfu_firm(u3_noun cor) { u3_noun sut, dib, van; @@ -109,8 +105,8 @@ u3_noun u3qfu_firm(u3_noun van, - u3_noun sut, - u3_noun dib) + u3_noun sut, + u3_noun dib) { return _cqfu_firm(van, sut, dib); } diff --git a/jets/f/ut_fish.c b/jets/f/ut_fish.c index ea66c559f3..69ed028e40 100644 --- a/jets/f/ut_fish.c +++ b/jets/f/ut_fish.c @@ -7,8 +7,7 @@ /* functions */ static u3_noun - _fish_in( - u3_noun van, + _fish_in(u3_noun van, u3_noun sut, u3_atom axe, u3_noun vit) @@ -67,10 +66,9 @@ if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) { return u3m_bail(c3__fail); } else { - return u3nt - (5, - u3nc(1, u3k(p_sut)), - u3nc(0, u3k(axe))); + return u3nt(5, + u3nc(1, u3k(p_sut)), + u3nc(0, u3k(axe))); } } case c3__face: { @@ -122,10 +120,9 @@ } } u3_noun - _cqfu_fish( - u3_noun van, - u3_noun sut, - u3_atom axe) + _cqfu_fish(u3_noun van, + u3_noun sut, + u3_atom axe) { return _fish_in(van, sut, axe, u3_nul); } @@ -134,8 +131,7 @@ /* boilerplate */ u3_noun - u3wfu_fish( - u3_noun cor) + u3wfu_fish(u3_noun cor) { u3_noun sut, axe, van; @@ -151,8 +147,8 @@ u3_noun u3qfu_fish(u3_noun van, - u3_noun sut, - u3_noun axe) + u3_noun sut, + u3_noun axe) { c3_m fun_m = c3__fish; u3_noun pro = u3z_find_2(fun_m, sut, axe); diff --git a/jets/f/ut_fuse.c b/jets/f/ut_fuse.c index 08676e7ec1..fb71caa1fa 100644 --- a/jets/f/ut_fuse.c +++ b/jets/f/ut_fuse.c @@ -10,8 +10,7 @@ _fuse_in(u3_noun, u3_noun, u3_noun, u3_noun); static u3_noun - _fuse_repo( - u3_noun van, + _fuse_repo(u3_noun van, u3_noun sut, u3_noun ref, u3_noun bix) @@ -34,8 +33,7 @@ } static u3_noun - _fuse_in( - u3_noun van, + _fuse_in(u3_noun van, u3_noun sut, u3_noun ref, u3_noun bix) @@ -157,10 +155,9 @@ } u3_noun - _cqfu_fuse( - u3_noun van, - u3_noun sut, - u3_noun ref) + _cqfu_fuse(u3_noun van, + u3_noun sut, + u3_noun ref) { return _fuse_in(van, sut, ref, u3_nul); } @@ -168,8 +165,7 @@ /* boilerplate */ u3_noun - u3wfu_fuse( - u3_noun cor) + u3wfu_fuse(u3_noun cor) { u3_noun sut, ref, van; @@ -184,8 +180,8 @@ u3_noun u3qfu_fuse(u3_noun van, - u3_noun sut, - u3_noun ref) + u3_noun sut, + u3_noun ref) { c3_m fun_m = c3__fuse; u3_noun pro = u3z_find_2(fun_m, sut, ref); diff --git a/jets/f/ut_gain.c b/jets/f/ut_gain.c index e79172fe26..d27ee9a18f 100644 --- a/jets/f/ut_gain.c +++ b/jets/f/ut_gain.c @@ -5,7 +5,9 @@ u3_noun - u3qfu_gain(u3_noun van, u3_noun sut, u3_noun gen) + 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_hook(von, "gain"); diff --git a/jets/f/ut_heal.c b/jets/f/ut_heal.c index 3a79b476cd..8c7107d26e 100644 --- a/jets/f/ut_heal.c +++ b/jets/f/ut_heal.c @@ -11,8 +11,7 @@ _heal_as(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun); static u3_noun - _heal_by( - u3_noun van, + _heal_by(u3_noun van, u3_noun sut, u3_noun qog, u3_noun ref) @@ -38,8 +37,10 @@ u3_noun sub = _heal_by(van, q_sut, qog, ref); u3_noun ret; - ret = u3qfu_busk - (van, sub, u3h(p_sut), u3h(u3t(p_sut))); + ret = u3qfu_busk(van, + sub, + u3h(p_sut), + u3h(u3t(p_sut))); u3z(sub); return ret; @@ -73,8 +74,7 @@ } static u3_noun - _heal_to( - u3_noun van, + _heal_to(u3_noun van, u3_noun sut, u3_noun gil, u3_noun qog, @@ -176,8 +176,7 @@ } static u3_noun - _heal_as( - u3_noun van, + _heal_as(u3_noun van, u3_noun sut, u3_noun qog, u3_atom axe, @@ -201,12 +200,11 @@ /* functions */ u3_noun - _cqfu_heal( - u3_noun van, - u3_noun sut, - u3_noun qog, - u3_noun axe, - u3_noun ref) + _cqfu_heal(u3_noun van, + u3_noun sut, + u3_noun qog, + u3_noun axe, + u3_noun ref) { return _heal_as(van, sut, qog, axe, ref); } @@ -214,16 +212,15 @@ /* boilerplate */ u3_noun - u3wfu_heal( - u3_noun cor) + u3wfu_heal(u3_noun cor) { u3_noun van, sut, qog, axe, ref; if ( (c3n == u3r_mean(cor, u3x_sam_2, &qog, - u3x_sam_6, &axe, - u3x_sam_7, &ref, - u3x_con, &van, - 0)) || + u3x_sam_6, &axe, + u3x_sam_7, &ref, + u3x_con, &van, + 0)) || (c3n == u3ud(axe)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { @@ -235,10 +232,10 @@ u3_noun u3qfu_heal(u3_noun van, - u3_noun sut, - u3_noun qog, - u3_noun axe, - u3_noun ref) + u3_noun sut, + u3_noun qog, + u3_noun axe, + u3_noun ref) { return _cqfu_heal(van, sut, qog, axe, ref); } diff --git a/jets/f/ut_lose.c b/jets/f/ut_lose.c index 0c6f9fac5b..2e3e29b8f8 100644 --- a/jets/f/ut_lose.c +++ b/jets/f/ut_lose.c @@ -6,8 +6,8 @@ u3_noun u3qfu_lose(u3_noun van, - u3_noun sut, - u3_noun gen) + u3_noun sut, + u3_noun gen) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); u3_noun gat = u3j_hook(von, "lose"); diff --git a/jets/f/ut_mint.c b/jets/f/ut_mint.c index 2d347256b0..7e3c39a8c9 100644 --- a/jets/f/ut_mint.c +++ b/jets/f/ut_mint.c @@ -15,13 +15,12 @@ int FOO; _mint_bean(void) { return u3nt(c3__fork, - u3nq(c3__cube, 0, c3__atom, 'f'), - u3nq(c3__cube, 1, c3__atom, 'f')); + u3nq(c3__cube, 0, c3__atom, 'f'), + u3nq(c3__cube, 1, c3__atom, 'f')); } static u3_noun - _mint_vet( - u3_noun van) + _mint_vet(u3_noun van) { // u3_noun vet = u3j_hook(u3k(van), "vet"); u3_noun vet = u3r_at(u3qfu_van_vet, van); @@ -34,8 +33,7 @@ int FOO; } static u3_noun - _mint_core( - u3_noun pac, + _mint_core(u3_noun pac, u3_noun con) { if ( (c3__void == pac) ) { @@ -46,8 +44,7 @@ int FOO; } static u3_noun - _mint_foil( - u3_noun pok) + _mint_foil(u3_noun pok) { u3_noun p_pok = u3h(pok); u3_noun q_pok = u3t(pok); @@ -56,30 +53,26 @@ int FOO; if ( c3y == u3h(q_pok) ) { u3_noun pq_pok = u3t(q_pok); - ret = u3nc( - u3k(p_pok), - u3nc(u3_nul, - u3nc( - u3nc( - u3k(pq_pok), - u3nt(c3__elm, u3_nul, 1)), - u3_nul))); + ret = u3nc(u3k(p_pok), + u3nc(u3_nul, + u3nc(u3nc(u3k(pq_pok), + u3nt(c3__elm, u3_nul, 1)), + u3_nul))); } else { u3_noun pq_pok = u3h(u3t(q_pok)); u3_noun qq_pok = u3t(u3t(q_pok)); ret = u3nc(u3k(p_pok), - u3nc(u3k(pq_pok), - u3k(qq_pok))); + u3nc(u3k(pq_pok), + u3k(qq_pok))); } u3z(pok); return ret; } static u3_noun - _mint_cond( - u3_noun pex, + _mint_cond(u3_noun pex, u3_noun yom, u3_noun woq) { @@ -101,8 +94,7 @@ int FOO; } static u3_noun - _mint_corn( - u3_noun van, + _mint_corn(u3_noun van, u3_noun sut, u3_noun gen) { @@ -114,8 +106,7 @@ int FOO; } static u3_noun - _mint_nice( - u3_noun van, + _mint_nice(u3_noun van, u3_noun gol, u3_noun typ) { @@ -134,8 +125,7 @@ int FOO; } static u3_noun - _mint_coke( - u3_noun nug) + _mint_coke(u3_noun nug) { u3_atom axe; @@ -154,8 +144,7 @@ int FOO; } static u3_noun - _mint_edit( - u3_noun van, + _mint_edit(u3_noun van, u3_noun sut, u3_noun mew, u3_noun p_lar, @@ -179,15 +168,14 @@ int FOO; 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_tock - (van, sut, pi_mew, p_zil, rag); + u3_noun wip = u3qfu_tock(van, sut, pi_mew, p_zil, rag); u3z(rag); rag = u3k(u3t(wip)); hej = u3nc(u3nc(u3k(u3h(wip)), - u3k(q_zil)), - hej); + u3k(q_zil)), + hej); u3z(zil); u3z(wip); @@ -198,8 +186,7 @@ int FOO; } static u3_noun - _mint_brew( - u3_noun van, + _mint_brew(u3_noun van, u3_noun sut, u3_noun tov, u3_noun gen) @@ -224,8 +211,7 @@ int FOO; } static u3_noun - _mint_bake( - u3_noun van, + _mint_bake(u3_noun van, u3_noun sut, u3_noun dab) { @@ -259,26 +245,22 @@ int FOO; return vad; } else if ( (u3_nul == l_dab) ) { - return u3nc - (vad, _mint_bake(van, sut, r_dab)); + return u3nc(vad, _mint_bake(van, sut, r_dab)); } else if ( (u3_nul == r_dab) ) { - return u3nc - (vad, _mint_bake(van, sut, l_dab)); + return u3nc(vad, _mint_bake(van, sut, l_dab)); } else { - return u3nt - (vad, - _mint_bake(van, sut, l_dab), - _mint_bake(van, sut, r_dab)); + return u3nt(vad, + _mint_bake(van, sut, l_dab), + _mint_bake(van, sut, r_dab)); } } } } static u3_noun - _mint_grow( - u3_noun van, + _mint_grow(u3_noun van, u3_noun sut, u3_noun gol, u3_atom mel, @@ -288,23 +270,20 @@ int FOO; u3_noun dan = _mint_in(van, sut, c3__noun, ruf); u3_noun p_dan = u3h(dan); u3_noun q_dan = u3t(dan); - u3_noun toc = _mint_core - (u3k(p_dan), - u3nt(c3__gold, - u3k(p_dan), - u3nc(u3_nul, u3k(dab)))); + u3_noun toc = _mint_core(u3k(p_dan), + u3nt(c3__gold, + u3k(p_dan), + u3nc(u3_nul, + u3k(dab)))); u3_noun dez = _mint_bake(van, toc, dab); u3_noun zod = u3nc(1, dez); - u3_noun cot = _mint_core - (u3k(p_dan), - u3nt(mel, - u3k(p_dan), - u3nc(u3k(dez), - u3k(dab)))); - u3_noun ret = u3nc - ( - _mint_nice(van, gol, cot), - u3qf_cons(zod, q_dan)); + u3_noun cot = _mint_core(u3k(p_dan), + u3nt(mel, + u3k(p_dan), + u3nc(u3k(dez), + u3k(dab)))); + u3_noun ret = u3nc(_mint_nice(van, gol, cot), + u3qf_cons(zod, q_dan)); u3z(zod); u3z(toc); @@ -314,8 +293,7 @@ int FOO; } static u3_noun - _mint_loc( - u3_noun van, + _mint_loc(u3_noun van, u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); @@ -369,10 +347,9 @@ int FOO; u3_noun tal = _mint_in(van, sut, c3__noun, u3t(gen)); u3_noun typ = u3qf_cell(u3h(hed), u3h(tal)); - ret = u3nc - ( - _mint_nice(van, gol, typ), - u3qf_cons(u3t(hed), u3t(tal))); + ret = u3nc(_mint_nice(van, gol, typ), + u3qf_cons(u3t(hed), + u3t(tal))); u3z(hed); u3z(tal); @@ -424,10 +401,8 @@ int FOO; u3_noun axe = _mint_coke(vol); u3_noun wam = u3qfu_play(van, sut, nob); - ret = u3nc - ( - _mint_nice(van, gol, _mint_bean()), - u3qfu_fish(van, wam, axe)); + ret = u3nc(_mint_nice(van, gol, _mint_bean()), + u3qfu_fish(van, wam, axe)); u3z(axe); u3z(wam); @@ -454,11 +429,11 @@ int FOO; u3_noun hiq = _mint_in(van, fex, gol, q_gen); u3_noun ran = _mint_in(van, wux, gol, r_gen); - ret = u3nc - (u3qf_fork(u3h(hiq), u3h(ran)), - _mint_cond(duy, - u3k(u3t(hiq)), - u3k(u3t(ran)))); + ret = u3nc(u3qf_fork(u3h(hiq), + u3h(ran)), + _mint_cond(duy, + u3k(u3t(hiq)), + u3k(u3t(ran)))); u3z(ran); u3z(hiq); @@ -476,10 +451,9 @@ int FOO; u3_noun tal = _mint_in(van, sut, c3__noun, q_gen); u3_noun typ = u3qf_cell(u3h(hed), u3h(tal)); - ret = u3nc - ( - _mint_nice(van, gol, typ), - u3qf_cons(u3t(hed), u3t(tal))); + ret = u3nc(_mint_nice(van, gol, typ), + u3qf_cons(u3t(hed), + u3t(tal))); u3z(hed); u3z(tal); @@ -500,10 +474,8 @@ int FOO; { u3_noun typ = _mint_nice(van, gol, _mint_bean()); - return u3nc - ( - typ, - u3nc(3, _mint_corn(van, sut, p_gen))); + return u3nc(typ, + u3nc(3, _mint_corn(van, sut, p_gen))); } case c3__dtkt: p_gen = u3t(gen); _mint_used(); @@ -511,10 +483,8 @@ int FOO; u3_noun tom = c3__noun; u3_noun sam = _mint_in(van, sut, tom, p_gen); - ret = u3nc - ( - _mint_nice(van, gol, tom), - u3nc(11, u3k(u3t(sam)))); + ret = u3nc(_mint_nice(van, gol, tom), + u3nc(11, u3k(u3t(sam)))); u3z(sam); return ret; @@ -525,10 +495,8 @@ int FOO; u3_noun tom = u3nc(c3__atom, u3_blip); u3_noun sam = _mint_in(van, sut, tom, p_gen); - ret = u3nc - ( - _mint_nice(van, gol, tom), - u3nc(4, u3k(u3t(sam)))); + ret = u3nc(_mint_nice(van, gol, tom), + u3nc(4, u3k(u3t(sam)))); u3z(sam); return ret; @@ -540,10 +508,8 @@ int FOO; ? c3__noun : u3nc(c3__atom, u3k(p_gen)); u3_noun typ = u3qf_cube(q_gen, boc); - u3_noun ret = - u3nc( - _mint_nice(van, gol, typ), - u3nc(1, u3k(q_gen))); + u3_noun ret = u3nc(_mint_nice(van, gol, typ), + u3nc(1, u3k(q_gen))); u3z(boc); return ret; @@ -554,19 +520,15 @@ int FOO; u3_noun one = _mint_corn(van, sut, p_gen); u3_noun two = _mint_corn(van, sut, q_gen); - return u3nc - ( - _mint_nice(van, gol, c3__noun), - u3nt(2, one, two)); + return u3nc(_mint_nice(van, gol, c3__noun), + u3nt(2, one, two)); } case c3__dtzy: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { u3_noun typ = u3qfu_play(van, sut, gen); - u3_noun ret = - u3nc( - _mint_nice(van, gol, typ), - u3nc(1, u3k(q_gen))); + u3_noun ret = u3nc(_mint_nice(van, gol, typ), + u3nc(1, u3k(q_gen))); return ret; } @@ -605,10 +567,8 @@ int FOO; { u3_noun vat = _mint_in(van, sut, gol, q_gen); - ret = u3nc - ( - u3qfu_conk(van, u3h(vat), p_gen), - u3k(u3t(vat))); + ret = u3nc(u3qfu_conk(van, u3h(vat), p_gen), + u3k(u3t(vat))); u3z(vat); return ret; @@ -618,10 +578,8 @@ int FOO; { u3_noun vat = _mint_in(van, sut, gol, q_gen); - ret = u3nc - ( - u3qfu_conk(van, u3h(vat), p_gen), - u3k(u3t(vat))); + ret = u3nc(u3qfu_conk(van, u3h(vat), p_gen), + u3k(u3t(vat))); u3z(vat); return ret; @@ -694,9 +652,8 @@ int FOO; u3_noun p_dov = u3h(dov); u3_noun q_dov = u3t(dov); - ret = u3nc - (u3k(p_dov), - u3qf_comb(q_fid, q_dov)); + ret = u3nc(u3k(p_dov), + u3qf_comb(q_fid, q_dov)); u3z(fid); u3z(dov); @@ -725,14 +682,12 @@ int FOO; u3_noun pq_lar = u3h(q_lar); u3_noun qq_lar = u3t(q_lar); u3_noun mew = u3qfu_snub(van, sut, q_gen); - u3_noun yom = _mint_edit - (van, sut, mew, p_lar, u3k(qq_lar), u3_nul); + u3_noun yom = _mint_edit(van, sut, mew, p_lar, u3k(qq_lar), u3_nul); u3_noun p_yom = u3h(yom); u3_noun q_yom = u3t(yom); - u3_noun ret = u3nc - (_mint_nice(van, gol, u3k(p_yom)), - (0 == pq_lar) ? u3k(q_yom) - : u3nt(9, u3k(pq_lar), u3k(q_yom))); + u3_noun ret = u3nc(_mint_nice(van, gol, u3k(p_yom)), + (0 == pq_lar) ? u3k(q_yom) + : u3nt(9, u3k(pq_lar), u3k(q_yom))); u3z(yom); u3z(mew); @@ -743,10 +698,9 @@ int FOO; case c3__pmcl: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun ruf = u3nt - (c3__clhp, - u3nc(u3_nul, 1), - u3k(p_gen)); + u3_noun ruf = u3nt(c3__clhp, i + u3nc(u3_nul, 1), + u3k(p_gen)); u3_noun ret = _mint_grow(van, sut, gol, c3__zinc, ruf, q_gen); u3z(ruf); @@ -775,10 +729,9 @@ int FOO; case c3__pmls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - u3_noun ruf = u3nt - (c3__clhp, - u3nc(u3_nul, 1), - u3k(p_gen)); + u3_noun ruf = u3nt(c3__clhp, + u3nc(u3_nul, 1), + u3k(p_gen)); u3_noun ret = _mint_grow(van, sut, gol, c3__iron, ruf, q_gen); u3z(ruf); @@ -815,11 +768,10 @@ int FOO; } #endif bez = u3nc(u3k(u3h(p_gen)), - _mint_corn(van, sut, u3t(p_gen))); + _mint_corn(van, sut, u3t(p_gen))); } - ret = u3nc( - u3k(u3h(hum)), - u3nt(10, bez, u3k(u3t(hum)))); + ret = u3nc(u3k(u3h(hum)), + u3nt(10, bez, u3k(u3t(hum)))); u3z(hum); return ret; @@ -836,12 +788,10 @@ int FOO; case c3__zpcm: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { - return u3nc - ( - _mint_nice(van, - gol, - u3qfu_play(van, sut, p_gen)), - u3nc(1, u3k(q_gen))); + return u3nc(_mint_nice(van, + gol, + u3qfu_play(van, sut, p_gen)), + u3nc(1, u3k(q_gen))); } case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen); { @@ -865,7 +815,7 @@ int FOO; u3_noun ret; ret = u3nc(_mint_nice(van, gol, u3k(p_pet)), - u3nc(1, u3k(q_pet))); + u3nc(1, u3k(q_pet))); u3z(pet); return ret; @@ -882,9 +832,8 @@ int FOO; u3_noun cig = u3qf_cell(sif, p_vos); u3_noun ret; - ret = u3nc( - _mint_nice(van, gol, cig), - u3qf_cons(waz, q_vos)); + ret = u3nc(_mint_nice(van, gol, cig), + u3qf_cons(waz, q_vos)); u3z(waz); u3z(zur); @@ -916,11 +865,10 @@ int FOO; } u3_noun - _cqfu_mint( - u3_noun van, - u3_noun sut, - u3_noun gol, - u3_noun gen) + _cqfu_mint(u3_noun van, + u3_noun sut, + u3_noun gol, + u3_noun gen) { return _mint_in(van, sut, gol, gen); } @@ -933,9 +881,9 @@ int FOO; u3_noun sut, gol, gen, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &gol, - u3x_sam_3, &gen, - u3x_con, &van, - 0)) || + u3x_sam_3, &gen, + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -946,9 +894,9 @@ int FOO; u3_noun u3qfu_mint(u3_noun van, - u3_noun sut, - u3_noun gol, - u3_noun gen) + u3_noun sut, + u3_noun gol, + u3_noun gen) { c3_m fun_m = c3__mint; u3_noun vrf = u3r_at(u3qfu_van_vrf, van); diff --git a/jets/f/ut_mull.c b/jets/f/ut_mull.c index c87ad3059f..d1df014428 100644 --- a/jets/f/ut_mull.c +++ b/jets/f/ut_mull.c @@ -10,8 +10,7 @@ _mull_in(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); static u3_noun - _mull_vet( - u3_noun van) + _mull_vet(u3_noun van) { // u3_noun vet = u3j_hook(u3k(van), "vet"); u3_noun vet = u3r_at(u3qfu_van_vet, van); @@ -24,8 +23,7 @@ } static u3_noun - _mull_core( - u3_noun pac, + _mull_core(u3_noun pac, u3_noun con) { if ( (c3__void == pac) ) { @@ -39,13 +37,12 @@ _mull_bean() { return u3nt(c3__fork, - u3nq(c3__cube, 0, c3__atom, 'f'), - u3nq(c3__cube, 1, c3__atom, 'f')); + u3nq(c3__cube, 0, c3__atom, 'f'), + u3nq(c3__cube, 1, c3__atom, 'f')); } static u3_noun - _mull_loc( - u3_noun van, + _mull_loc(u3_noun van, u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); @@ -59,8 +56,7 @@ } static u3_noun - _mull_foil( - u3_noun pok) + _mull_foil(u3_noun pok) { u3_noun p_pok = u3h(pok); u3_noun q_pok = u3t(pok); @@ -69,30 +65,26 @@ if ( c3y == u3h(q_pok) ) { u3_noun pq_pok = u3t(q_pok); - ret = u3nc( - u3k(p_pok), - u3nc(u3_nul, - u3nc( - u3nc( - u3k(pq_pok), - u3nt(c3__elm, u3_nul, 1)), - u3_nul))); + ret = u3nc(u3k(p_pok), + u3nc(u3_nul, + u3nc(u3nc(u3k(pq_pok), + u3nt(c3__elm, u3_nul, 1)), + u3_nul))); } else { u3_noun pq_pok = u3h(u3t(q_pok)); u3_noun qq_pok = u3t(u3t(q_pok)); ret = u3nc(u3k(p_pok), - u3nc(u3k(pq_pok), - u3k(qq_pok))); + u3nc(u3k(pq_pok), + u3k(qq_pok))); } u3z(pok); return ret; } static u3_noun - _mull_coke( - u3_noun nug) + _mull_coke(u3_noun nug) { u3_atom axe; @@ -111,8 +103,7 @@ } static u3_noun - _mull_doke( - u3_noun van, + _mull_doke(u3_noun van, u3_noun sut, u3_noun gen) { @@ -124,8 +115,7 @@ } static u3_noun - _mull_nice( - u3_noun van, + _mull_nice(u3_noun van, u3_noun gol, u3_noun typ) { @@ -142,8 +132,7 @@ } static void - _mull_bake( - u3_noun van, + _mull_bake(u3_noun van, u3_noun sut, u3_noun dox, u3_noun dab) @@ -190,8 +179,7 @@ } static u3_noun - _mull_grow( - u3_noun van, + _mull_grow(u3_noun van, u3_noun sut, u3_noun gol, u3_noun dox, @@ -202,28 +190,24 @@ u3_noun dan = _mull_in(van, sut, c3__noun, dox, ruf); u3_noun p_dan = u3h(dan); u3_noun q_dan = u3t(dan); - u3_noun p_toc = _mull_core - (u3k(p_dan), - u3nt(c3__gold, - u3k(p_dan), - u3nc(u3_nul, u3k(dab)))); - u3_noun q_toc = _mull_core - (u3k(q_dan), - u3nt(c3__gold, - u3k(q_dan), - u3nc(u3_nul, u3k(dab)))); - u3_noun p_ret = _mull_core - (u3k(p_dan), - u3nt(u3k(mel), - u3k(p_dan), - u3nc(u3nc(u3_nul, u3_nul), - u3k(dab)))); - u3_noun q_ret = _mull_core - (u3k(q_dan), - u3nt(u3k(mel), - u3k(q_dan), - u3nc(u3nc(u3_nul, u3_nul), - u3k(dab)))); + u3_noun p_toc = _mull_core(u3k(p_dan), + u3nt(c3__gold, + u3k(p_dan), + u3nc(u3_nul, u3k(dab)))); + u3_noun q_toc = _mull_core(u3k(q_dan), + u3nt(c3__gold, + u3k(q_dan), + u3nc(u3_nul, u3k(dab)))); + u3_noun p_ret = _mull_core(u3k(p_dan), + u3nt(u3k(mel), + u3k(p_dan), + u3nc(u3nc(u3_nul, u3_nul), + u3k(dab)))); + u3_noun q_ret = _mull_core(u3k(q_dan), + u3nt(u3k(mel), + u3k(q_dan), + u3nc(u3nc(u3_nul, u3_nul), + u3k(dab)))); u3_noun ret = u3nc(_mull_nice(van, gol, p_ret), q_ret); _mull_bake(van, p_toc, q_toc, dab); @@ -236,18 +220,16 @@ } static u3_noun - _mull_both( - u3_noun van, + _mull_both(u3_noun van, u3_noun gol, u3_noun typ) { return u3nc(_mull_nice(van, gol, u3k(typ)), - typ); + typ); } static u3_noun - _mull_edit( - u3_noun van, + _mull_edit(u3_noun van, u3_noun sut, u3_noun dox, u3_noun mew, @@ -265,10 +247,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_tock - (van, sut, pi_mew, p_zil, p_yom); - u3_noun dof = u3qfu_tock - (van, sut, pi_mew, q_zil, q_yom); + u3_noun cuf = u3qfu_tock(van, sut, pi_mew, p_zil, p_yom); + u3_noun dof = u3qfu_tock(van, sut, pi_mew, q_zil, q_yom); if ( u3r_sing(u3h(cuf), u3h(dof)) ) { u3m_error("mull-bonk-a"); @@ -292,8 +272,7 @@ # define _mull_used() static u3_noun - _mull_in( - u3_noun van, + _mull_in(u3_noun van, u3_noun sut, u3_noun gol, u3_noun dox, @@ -333,8 +312,7 @@ if ( c3y == u3r_sing(rex, gen) ) { #if 1 - u3_noun zix = u3qfu_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"); @@ -411,9 +389,8 @@ u3_noun ret; if ( c3__void == p_fex ) { - hiq = u3nc( - c3__void, - (c3__void == q_fex) + hiq = u3nc(c3__void, + (c3__void == q_fex) ? c3__void : u3qfu_play(van, q_fex, q_gen)); } else if ( c3__void == q_fex ) { @@ -422,9 +399,8 @@ else hiq = _mull_in(van, p_fex, gol, q_fex, q_gen); if ( c3__void == p_wux ) { - ran = u3nc( - c3__void, - (c3__void == q_wux) + ran = u3nc(c3__void, + (c3__void == q_wux) ? c3__void : u3qfu_play(van, q_wux, r_gen)); } else if ( c3__void == q_wux ) { @@ -502,12 +478,11 @@ case c3__dtzz: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun tof = u3nt - (c3__cube, - u3k(q_gen), - (c3y == u3du(q_gen)) - ? c3__noun - : u3nc(c3__atom, u3k(p_gen))); + u3_noun tof = u3nt(c3__cube, + u3k(q_gen), + (c3y == u3du(q_gen)) + ? c3__noun + : u3nc(c3__atom, u3k(p_gen))); return _mull_both(van, gol, tof); } @@ -532,9 +507,12 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); - u3_noun pro = u3nc - (u3qfu_wrap(van, u3h(vat), c3__iron), - u3qfu_wrap(van, u3t(vat), c3__iron)); + u3_noun pro = u3nc(u3qfu_wrap(van, + u3h(vat), + c3__iron), + u3qfu_wrap(van, + u3t(vat), + c3__iron)); u3z(vat); return pro; @@ -543,9 +521,12 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); - u3_noun pro = u3nc - (u3qfu_wrap(van, u3h(vat), c3__zinc), - u3qfu_wrap(van, u3t(vat), c3__zinc)); + u3_noun pro = u3nc(u3qfu_wrap(van, + u3h(vat), + c3__zinc), + u3qfu_wrap(van, + u3t(vat), + c3__zinc)); u3z(vat); return pro; @@ -554,9 +535,12 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, p_gen); - u3_noun pro = u3nc - (u3qfu_wrap(van, u3h(vat), c3__lead), - u3qfu_wrap(van, u3t(vat), c3__lead)); + u3_noun pro = u3nc(u3qfu_wrap(van, + u3h(vat), + c3__lead), + u3qfu_wrap(van, + u3t(vat), + c3__lead)); u3z(vat); return pro; @@ -565,10 +549,8 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); - u3_noun ret = - u3nc( - u3qfu_conk(van, u3h(vat), p_gen), - u3qfu_conk(van, u3t(vat), p_gen)); + u3_noun ret = u3nc(u3qfu_conk(van, u3h(vat), p_gen), + u3qfu_conk(van, u3t(vat), p_gen)); u3z(vat); return ret; @@ -577,10 +559,8 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); - u3_noun ret = - u3nc( - u3qfu_conk(van, u3h(vat), p_gen), - u3qfu_conk(van, u3t(vat), p_gen)); + u3_noun ret =u3nc(u3qfu_conk(van, u3h(vat), p_gen), + u3qfu_conk(van, u3t(vat), p_gen)); u3z(vat); return ret; @@ -593,8 +573,7 @@ case c3__ktls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun p_hif = _mull_nice - (van, gol, u3qfu_play(van, sut, 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); @@ -606,8 +585,7 @@ case c3__kthx: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun p_hif = _mull_nice - (van, gol, u3qfu_play(van, sut, 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); @@ -685,12 +663,10 @@ case c3__pmcl: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun ruf = u3nt - (c3__clhp, - u3nc(u3_nul, 1), - u3k(p_gen)); - u3_noun ret = _mull_grow - (van, sut, gol, dox, c3__zinc, ruf, q_gen); + u3_noun ruf = u3nt(c3__clhp, + u3nc(u3_nul, 1), + u3k(p_gen)); + u3_noun ret = _mull_grow(van, sut, gol, dox, c3__zinc, ruf, q_gen); u3z(ruf); return ret; @@ -718,12 +694,10 @@ case c3__pmls: u3x_cell(u3t(gen), &p_gen, &q_gen); _mull_used(); { - u3_noun ruf = u3nt - (c3__clhp, - u3nc(u3_nul, 1), - u3k(p_gen)); - u3_noun ret = _mull_grow - (van, sut, gol, dox, c3__iron, ruf, q_gen); + u3_noun ruf = u3nt(c3__clhp, + u3nc(u3_nul, 1), + u3k(p_gen)); + u3_noun ret = _mull_grow(van, sut, gol, dox, c3__iron, ruf, q_gen); u3z(ruf); return ret; @@ -755,9 +729,8 @@ 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); + return u3nc(_mull_nice(van, gol, p_ret), + q_ret); } case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen); { @@ -810,12 +783,11 @@ } u3_noun - _cqfu_mull( - u3_noun van, - u3_noun sut, - u3_noun gol, - u3_noun dox, - u3_noun gen) + _cqfu_mull(u3_noun van, + u3_noun sut, + u3_noun gol, + u3_noun dox, + u3_noun gen) { if ( c3n == _mull_vet(van) ) { return c3y; @@ -835,10 +807,10 @@ u3_noun sut, gol, dox, gen, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &gol, - u3x_sam_6, &dox, - u3x_sam_7, &gen, - u3x_con, &van, - 0)) || + u3x_sam_6, &dox, + u3x_sam_7, &gen, + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -849,10 +821,10 @@ u3_noun u3qfu_mull(u3_noun van, - u3_noun sut, - u3_noun gol, - u3_noun dox, - u3_noun gen) + u3_noun sut, + u3_noun gol, + u3_noun dox, + u3_noun gen) { c3_m fun_m = c3__mull; u3_noun pro = u3z_find_4(fun_m, sut, gol, dox, gen); diff --git a/jets/f/ut_nest.c b/jets/f/ut_nest.c index a1a3e1a0e8..438b16ce1d 100644 --- a/jets/f/ut_nest.c +++ b/jets/f/ut_nest.c @@ -14,8 +14,7 @@ _nest_dext(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun); static u3_noun - _nest_cram( - u3_noun van, + _nest_cram(u3_noun van, u3_noun sut, u3_noun tel, u3_noun ref, @@ -35,10 +34,8 @@ u3x_trel(dab, &n_dab, &l_dab, &r_dab); u3x_trel(hem, &n_hem, &l_hem, &r_hem); - if ( (c3n == _nest_cram - (van, sut, tel, ref, l_dab, l_hem, gil)) || - (c3n == _nest_cram - (van, sut, tel, ref, r_dab, r_hem, gil)) ) { + if ( (c3n == _nest_cram(van, sut, tel, ref, l_dab, l_hem, gil)) || + (c3n == _nest_cram(van, sut, tel, ref, r_dab, r_hem, gil)) ) { return c3n; } u3x_cell(n_dab, &pn_dab, &qn_dab); @@ -121,11 +118,11 @@ else { u3_noun zoc = u3qdi_put(gil, hud); u3_noun tus = u3nt(c3__core, - u3k(qq_sut), - u3k(q_sut)); + u3k(qq_sut), + u3k(q_sut)); u3_noun fer = u3nt(c3__core, - u3k(qq_ref), - u3k(q_ref)); + u3k(qq_ref), + u3k(q_ref)); ret = _nest_cram(van, tus, tel, fer, qrq_sut, qrq_ref, zoc); u3z(fer); @@ -143,13 +140,11 @@ case c3__gold: { return c3a(_nest_dext(van, qq_sut, tel, qq_ref, gil), - _nest_dext(van, qq_ref, tel, qq_sut, gil)); + _nest_dext(van, qq_ref, tel, qq_sut, gil)); } case c3__iron: { - 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 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, gil); u3z(r_sam); @@ -160,10 +155,8 @@ return c3y; } case c3__zinc: { - 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 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, gil); u3z(r_pal); @@ -179,8 +172,7 @@ } static u3_noun - _nest_dext_in( - u3_noun van, + _nest_dext_in(u3_noun van, u3_noun sut, u3_noun tel, u3_noun ref, @@ -225,7 +217,7 @@ } else { if ( c3y == u3r_pq(ref, c3__cell, &p_ref, &q_ref) ) { return c3a(_nest_dext(van, p_sut, tel, p_ref, gil), - _nest_dext(van, q_sut, tel, q_ref, gil)); + _nest_dext(van, q_sut, tel, q_ref, gil)); } else return _nest_sint(van, sut, tel, ref, gil); } @@ -279,7 +271,7 @@ } return c3o(_nest_dext(van, p_sut, c3n, ref, gil), - _nest_dext(van, q_sut, c3n, ref, gil)); + _nest_dext(van, q_sut, c3n, ref, gil)); } } case c3__hold: p_sut = u3t(sut); @@ -306,8 +298,7 @@ } static u3_noun - _nest_dext_to( - u3_noun van, + _nest_dext_to(u3_noun van, u3_noun sut, u3_noun tel, u3_noun ref, @@ -329,8 +320,7 @@ } static u3_noun - _nest_dext( - u3_noun van, + _nest_dext(u3_noun van, u3_noun sut, u3_noun tel, u3_noun ref, @@ -357,8 +347,7 @@ } static u3_noun - _nest_sint( - u3_noun van, + _nest_sint(u3_noun van, u3_noun sut, u3_noun tel, u3_noun ref, @@ -412,7 +401,7 @@ case c3__fork: { if ( (c3y == u3r_mean(ref, 6, &p_ref, 7, &q_ref, 0)) ) { return c3a(_nest_dext(van, sut, c3n, p_ref, gil), - _nest_dext(van, sut, c3n, q_ref, gil)); + _nest_dext(van, sut, c3n, q_ref, gil)); } else return u3m_bail(c3__fail); } @@ -420,7 +409,7 @@ p_ref = u3t(ref); { u3_noun hud = u3nc(u3k(sut), - u3k(ref)); + u3k(ref)); if ( (c3y == u3qdi_has(gil, hud)) ) { u3z(hud); @@ -447,11 +436,10 @@ } u3_noun - _cqfu_nest( - u3_noun van, - u3_noun sut, - u3_noun tel, - u3_noun ref) + _cqfu_nest(u3_noun van, + u3_noun sut, + u3_noun tel, + u3_noun ref) { return _nest_dext(van, sut, tel, ref, u3_nul); } @@ -464,9 +452,9 @@ u3_noun sut, tel, ref, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &tel, - u3x_sam_3, &ref, - u3x_con, &van, - 0)) || + u3x_sam_3, &ref, + u3x_con, &van, + 0)) || (c3n == u3ud(tel)) || (tel > 1) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { @@ -478,9 +466,9 @@ u3_noun u3qfu_nest(u3_noun van, - u3_noun sut, - u3_noun tel, - u3_noun ref) + u3_noun sut, + u3_noun tel, + u3_noun ref) { return _cqfu_nest(van, sut, tel, ref); } diff --git a/jets/f/ut_park.c b/jets/f/ut_park.c index 4c9463a9b1..0bbf878377 100644 --- a/jets/f/ut_park.c +++ b/jets/f/ut_park.c @@ -7,11 +7,10 @@ /* logic */ u3_noun - _cqfu_park( - u3_noun van, - u3_noun sut, - u3_noun way, - u3_atom axe) + _cqfu_park(u3_noun van, + u3_noun sut, + u3_noun way, + u3_atom axe) { if ( c3n == u3du(sut) || c3__core != u3h(sut) ) { return u3m_bail(c3__fail); @@ -40,7 +39,7 @@ case c3__iron: return c3n; case c3__zinc: return c3a(!(u3r_sing(1, axe)), - u3r_sing(2, u3qc_cap(axe))); + u3r_sing(2, u3qc_cap(axe))); } } else if ( c3__rite == way ) { @@ -51,7 +50,7 @@ case c3__lead: return c3n; case c3__iron: return c3a(!(u3r_sing(1, axe)), - u3r_sing(2, u3qc_cap(axe))); + u3r_sing(2, u3qc_cap(axe))); case c3__zinc: return c3n; } } @@ -63,15 +62,14 @@ /* boilerplate */ u3_noun - u3wfu_park( - u3_noun cor) + u3wfu_park(u3_noun cor) { u3_noun sut, way, axe, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &way, - u3x_sam_3, &axe, - u3x_con, &van, - 0)) || + u3x_sam_3, &axe, + u3x_con, &van, + 0)) || (c3n == u3ud(axe)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { @@ -83,9 +81,9 @@ u3_noun u3qfu_park(u3_noun van, - u3_noun sut, - u3_noun way, - u3_noun axe) + u3_noun sut, + u3_noun way, + u3_noun axe) { return _cqfu_park(van, sut, way, axe); } diff --git a/jets/f/ut_peek.c b/jets/f/ut_peek.c index a05a587e14..13c9dabdc8 100644 --- a/jets/f/ut_peek.c +++ b/jets/f/ut_peek.c @@ -10,8 +10,7 @@ _cqfu_peek(u3_noun, u3_noun, u3_noun, u3_atom); static u3_noun - _peek_in( - u3_noun van, + _peek_in(u3_noun van, u3_noun sut, u3_noun way, u3_atom axe, @@ -147,11 +146,10 @@ } u3_noun - _cqfu_peek( - u3_noun van, - u3_noun sut, - u3_noun way, - u3_atom axe) + _cqfu_peek(u3_noun van, + u3_noun sut, + u3_noun way, + u3_atom axe) { if ( 1 == axe ) { return u3k(sut); @@ -162,15 +160,14 @@ /* boilerplate */ u3_noun - u3wfu_peek( - u3_noun cor) + u3wfu_peek(u3_noun cor) { u3_noun sut, way, axe, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &way, - u3x_sam_3, &axe, - u3x_con, &van, - 0)) || + u3x_sam_3, &axe, + u3x_con, &van, + 0)) || (c3n == u3ud(axe)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { @@ -182,9 +179,9 @@ u3_noun u3qfu_peek(u3_noun van, - u3_noun sut, - u3_noun way, - u3_noun axe) + u3_noun sut, + u3_noun way, + u3_noun axe) { c3_m fun_m = c3__peek; u3_noun pro = u3z_find_3(fun_m, sut, way, axe); diff --git a/jets/f/ut_play.c b/jets/f/ut_play.c index 5b29767273..2ae8c27078 100644 --- a/jets/f/ut_play.c +++ b/jets/f/ut_play.c @@ -15,13 +15,12 @@ _play_bean(void) { return u3nt(c3__fork, - u3nq(c3__cube, 0, c3__atom, 'f'), - u3nq(c3__cube, 1, c3__atom, 'f')); + u3nq(c3__cube, 0, c3__atom, 'f'), + u3nq(c3__cube, 1, c3__atom, 'f')); } static u3_noun - _play_core( - u3_noun pac, + _play_core(u3_noun pac, u3_noun con) { if ( (c3__void == pac) ) { @@ -34,8 +33,7 @@ } static u3_noun - _play_loc( - u3_noun van, + _play_loc(u3_noun van, u3_noun loc) { u3_noun mol = u3nc('o', u3k(loc)); @@ -49,8 +47,7 @@ } static u3_noun - _play_foil( - u3_noun pok) + _play_foil(u3_noun pok) { u3_noun p_pok = u3h(pok); u3_noun q_pok = u3t(pok); @@ -59,30 +56,26 @@ if ( c3y == u3h(q_pok) ) { u3_noun pq_pok = u3t(q_pok); - ret = u3nc( - u3k(p_pok), - u3nc(u3_nul, - u3nc( - u3nc( - u3k(pq_pok), - u3nt(c3__elm, u3_nul, 1)), - u3_nul))); + ret = u3nc(u3k(p_pok), + u3nc(u3_nul, + u3nc(u3nc(u3k(pq_pok), + u3nt(c3__elm, u3_nul, 1)), + u3_nul))); } else { u3_noun pq_pok = u3h(u3t(q_pok)); u3_noun qq_pok = u3t(u3t(q_pok)); ret = u3nc(u3k(p_pok), - u3nc(u3k(pq_pok), - u3k(qq_pok))); + u3nc(u3k(pq_pok), + u3k(qq_pok))); } u3z(pok); return ret; } static u3_noun - _play_edit( - u3_noun van, + _play_edit(u3_noun van, u3_noun sut, u3_noun mew, u3_noun rag) @@ -109,8 +102,7 @@ } static u3_noun - _play_grow( - u3_noun van, + _play_grow(u3_noun van, u3_noun sut, u3_atom mel, u3_noun ruf, @@ -118,23 +110,20 @@ { u3_noun dan = _play_in(van, sut, ruf); - return _play_core - (dan, - u3nt(u3k(mel), - u3k(dan), - u3nc(u3nc(u3_nul, u3_nul), - u3k(dab)))); + return _play_core(dan, + u3nt(u3k(mel), + u3k(dan), + u3nc(u3nc(u3_nul, u3_nul), + u3k(dab)))); } static u3_noun - _play_in( - u3_noun van, + _play_in(u3_noun van, u3_noun sut, u3_noun gen); static u3_noun - _play_x( - u3_noun van, + _play_x(u3_noun van, u3_noun sut, u3_noun gen) { @@ -155,8 +144,7 @@ } static u3_noun - _play_in( - u3_noun van, + _play_in(u3_noun van, u3_noun sut, u3_noun gen) { @@ -169,8 +157,7 @@ u3_noun ret; if ( c3y == u3r_sing(rex, gen) ) { - u3_noun zix = u3qfu_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"); @@ -390,10 +377,9 @@ case c3__pmcl: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { - u3_noun ruf = u3nt - (c3__clhp, - u3nc(u3_nul, 1), - u3k(p_gen)); + u3_noun ruf = u3nt(c3__clhp, + u3nc(u3_nul, 1), + u3k(p_gen)); u3_noun ret = _play_grow(van, sut, c3__zinc, ruf, q_gen); u3z(ruf); @@ -420,10 +406,9 @@ case c3__pmls: u3x_cell(u3t(gen), &p_gen, &q_gen); _play_used(); { - u3_noun ruf = u3nt - (c3__clhp, - u3nc(u3_nul, 1), - u3k(p_gen)); + u3_noun ruf = u3nt(c3__clhp, + u3nc(u3_nul, 1), + u3k(p_gen)); u3_noun ret = _play_grow(van, sut, c3__iron, ruf, q_gen); u3z(ruf); @@ -502,10 +487,9 @@ } u3_noun - _cqfu_play( - u3_noun van, - u3_noun sut, - u3_noun gen) + _cqfu_play(u3_noun van, + u3_noun sut, + u3_noun gen) { u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); u3_noun ret = _play_x(von, sut, gen); @@ -517,8 +501,7 @@ /* boilerplate */ u3_noun - u3wfu_play( - u3_noun cor) + u3wfu_play(u3_noun cor) { u3_noun sut, gen, van; @@ -533,8 +516,8 @@ u3_noun u3qfu_play(u3_noun van, - u3_noun sut, - u3_noun gen) + u3_noun sut, + u3_noun gen) { return _cqfu_play(van, sut, gen); } diff --git a/jets/f/ut_repo.c b/jets/f/ut_repo.c index c082ad3512..9659b2f4fa 100644 --- a/jets/f/ut_repo.c +++ b/jets/f/ut_repo.c @@ -7,9 +7,8 @@ /* logic */ u3_noun - u3qfu_repo( - u3_noun van, - u3_noun sut) + u3qfu_repo(u3_noun van, + u3_noun sut) { u3_noun p_sut, q_sut; @@ -18,8 +17,8 @@ case c3__noun: return u3nt(c3__fork, - u3nc(c3__atom, u3_blip), - u3nt(c3__cell, c3__noun, c3__noun)); + u3nc(c3__atom, u3_blip), + u3nt(c3__cell, c3__noun, c3__noun)); } else switch ( u3h(sut) ) { default: { @@ -62,8 +61,7 @@ } u3_noun - u3wfu_repo( - u3_noun cor) + u3wfu_repo(u3_noun cor) { u3_noun sut; diff --git a/jets/f/ut_rest.c b/jets/f/ut_rest.c index 669027addb..edfb399ed3 100644 --- a/jets/f/ut_rest.c +++ b/jets/f/ut_rest.c @@ -7,8 +7,7 @@ /* logic */ static u3_noun - _rest_in_list( - u3_noun van, + _rest_in_list(u3_noun van, u3_noun leg) { if ( u3_nul == leg ) { @@ -17,15 +16,13 @@ u3_noun i_leg = u3h(leg); u3_noun t_leg = u3t(leg); - return u3nc - (u3qfu_play(van, u3h(i_leg), u3t(i_leg)), - _rest_in_list(van, t_leg)); + return u3nc(u3qfu_play(van, u3h(i_leg), u3t(i_leg)), + _rest_in_list(van, t_leg)); } } static u3_noun - _rest_in_stil( - u3_noun van, + _rest_in_stil(u3_noun van, u3_noun gar) { u3_noun gun = u3qdi_gas(u3_nul, gar); @@ -36,17 +33,15 @@ } static u3_noun - _rest_in_fork( - u3_noun nog, + _rest_in_fork(u3_noun nog, u3_noun fub) { if ( c3n == u3du(nog) ) { return fub; } else { - u3_noun buf = _rest_in_fork - ( - u3t(nog), - u3qf_fork(u3h(nog), fub)); + u3_noun buf = _rest_in_fork(u3t(nog), + u3qf_fork(u3h(nog), + fub)); u3z(fub); return buf; @@ -68,8 +63,7 @@ } static u3_noun - _rest_hit_fan( - u3_noun fan, + _rest_hit_fan(u3_noun fan, u3_noun leg) { if ( u3_nul == leg ) { @@ -81,7 +75,9 @@ } u3_noun - _cqfu_rest(u3_noun van, u3_noun sut, u3_noun leg) + _cqfu_rest(u3_noun van, + u3_noun sut, + u3_noun leg) { u3_noun fan = u3r_at(u3qfu_van_fan, van); @@ -102,8 +98,7 @@ /* boilerplate */ u3_noun - u3wfu_rest( - u3_noun cor) + u3wfu_rest(u3_noun cor) { u3_noun sut, leg, van; @@ -118,8 +113,8 @@ u3_noun u3qfu_rest(u3_noun van, - u3_noun sut, - u3_noun leg) + u3_noun sut, + u3_noun leg) { c3_m fun_m = c3__rest; u3_noun pro = u3z_find_2(fun_m, sut, leg); diff --git a/jets/f/ut_seek.c b/jets/f/ut_seek.c index d219768a83..dad395b51e 100644 --- a/jets/f/ut_seek.c +++ b/jets/f/ut_seek.c @@ -7,8 +7,7 @@ /* logic */ static u3_noun - _seek_flat( - u3_noun wob) + _seek_flat(u3_noun wob) { if ( u3_nul == wob ) { return u3_nul; @@ -16,10 +15,9 @@ u3_noun i_wob = u3h(wob); u3_noun t_wob = u3t(wob); - return u3nc - (u3nc(u3k(u3h(i_wob)), - u3nt(c3__ash, u3_nul, 1)), - _seek_flat(t_wob)); + return u3nc(u3nc(u3k(u3h(i_wob)), + u3nt(c3__ash, u3_nul, 1)), + _seek_flat(t_wob)); } } @@ -122,11 +120,10 @@ #endif u3_noun - _cqfu_seek( - u3_noun van, - u3_noun sut, - u3_noun way, - u3_noun hyp) + _cqfu_seek(u3_noun van, + u3_noun sut, + u3_noun way, + u3_noun hyp) { if ( u3_nul == hyp ) { return u3nt @@ -192,7 +189,7 @@ u3r_cell(hud, &p_hud, &q_hud); ret = u3nc(u3qc_peg(p_zar, p_hud), - u3k(q_hud)); + u3k(q_hud)); u3z(hud); } } @@ -203,10 +200,9 @@ return u3m_bail(c3__fail); } else { - ret = u3nt - (u3qc_peg(p_zar, p_yip), - c3y, - u3qfu_peek(van, syp, way, p_yip)); + ret = u3nt(u3qc_peg(p_zar, p_yip), + c3y, + u3qfu_peek(van, syp, way, p_yip)); } } u3z(yip); @@ -224,9 +220,9 @@ u3_noun sut, way, hyp, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &way, - u3x_sam_3, &hyp, - u3x_con, &van, - 0)) || + u3x_sam_3, &hyp, + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -237,9 +233,9 @@ u3_noun u3qfu_seek(u3_noun van, - u3_noun sut, - u3_noun way, - u3_noun hyp) + u3_noun sut, + u3_noun way, + u3_noun hyp) { c3_m fun_m = c3__seek; u3_noun pro = u3z_find_3(fun_m, sut, way, hyp); @@ -256,9 +252,9 @@ u3_noun u3qfu_seep(u3_noun van, - u3_noun sut, - u3_noun way, - u3_noun hyp) + u3_noun sut, + u3_noun way, + u3_noun hyp) { u3_noun zar = u3qfu_seek(van, sut, way, hyp); u3_noun p_zar = u3h(zar); @@ -281,9 +277,9 @@ u3_noun sut, way, hyp, van; if ( (c3n == u3r_mean(cor, u3x_sam_2, &way, - u3x_sam_3, &hyp, - u3x_con, &van, - 0)) || + u3x_sam_3, &hyp, + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); diff --git a/jets/f/ut_sift.c b/jets/f/ut_sift.c index c59dca7fdf..9b09709689 100644 --- a/jets/f/ut_sift.c +++ b/jets/f/ut_sift.c @@ -7,14 +7,13 @@ /* boilerplate */ u3_noun - u3wfu_sift( - u3_noun cor) + u3wfu_sift(u3_noun cor) { u3_noun sut, ref, van; if ( (c3n == u3r_mean(cor, u3x_sam, &ref, - u3x_con, &van, - 0)) || + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -25,8 +24,8 @@ u3_noun u3qfu_sift(u3_noun van, - u3_noun sut, - u3_noun ref) + u3_noun sut, + u3_noun ref) { return u3k(ref); } diff --git a/jets/f/ut_swab.c b/jets/f/ut_swab.c index 93db0a3e6b..d0e10d8f1d 100644 --- a/jets/f/ut_swab.c +++ b/jets/f/ut_swab.c @@ -11,8 +11,8 @@ */ u3_noun _cqfu_snub(u3_noun van, - u3_noun sut, - u3_noun har) + u3_noun sut, + u3_noun har) { if ( c3n == u3du(har) ) { return u3_nul; @@ -23,8 +23,7 @@ u3_noun qi_har = u3t(i_har); u3_noun peh = u3qb_flop(pi_har); u3_noun ret = u3nc(u3nc(peh, u3k(qi_har)), - _cqfu_snub - (van, sut, t_har)); + _cqfu_snub(van, sut, t_har)); return ret; } @@ -33,14 +32,13 @@ /* boilerplate */ u3_noun - u3wfu_snub( - u3_noun cor) + u3wfu_snub(u3_noun cor) { u3_noun van, sut, har; if ( (c3n == u3r_mean(cor, u3x_sam, &har, - u3x_con, &van, - 0)) || + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -51,8 +49,8 @@ u3_noun u3qfu_snub(u3_noun van, - u3_noun sut, - u3_noun har) + u3_noun sut, + u3_noun har) { return _cqfu_snub(van, sut, har); } diff --git a/jets/f/ut_tack.c b/jets/f/ut_tack.c index 53e6a70f60..cb7fab1333 100644 --- a/jets/f/ut_tack.c +++ b/jets/f/ut_tack.c @@ -6,13 +6,17 @@ u3_noun u3qfu_tack(u3_noun van, - u3_noun sut, - u3_noun peh, - u3_noun mur) + u3_noun sut, + u3_noun peh, + u3_noun mur) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); u3_noun gat = u3j_hook(von, "tack"); - return u3n_kick_on - (u3i_molt(gat, u3x_sam_2, u3k(peh), u3x_sam_3, u3k(mur), 0)); + return u3n_kick_on(u3i_molt(gat, + u3x_sam_2, + u3k(peh), + u3x_sam_3, + u3k(mur), + 0)); } diff --git a/jets/f/ut_tock.c b/jets/f/ut_tock.c index e7fa01b575..22846e687b 100644 --- a/jets/f/ut_tock.c +++ b/jets/f/ut_tock.c @@ -7,8 +7,7 @@ /* internals */ static u3_noun - _tock_in( - u3_noun van, + _tock_in(u3_noun van, u3_noun sut, u3_noun peh, u3_noun mur, @@ -75,10 +74,10 @@ u3_noun van, sut, peh, mur, men; if ( (c3n == u3r_mean(cor, u3x_sam_2, &peh, - u3x_sam_6, &mur, - u3x_sam_7, &men, - u3x_con, &van, - 0)) || + u3x_sam_6, &mur, + u3x_sam_7, &men, + u3x_con, &van, + 0)) || (u3_none == (sut = u3r_at(u3x_sam, van))) ) { return u3m_bail(c3__fail); @@ -89,10 +88,10 @@ u3_noun u3qfu_tock(u3_noun van, - u3_noun sut, - u3_noun peh, - u3_noun mur, - u3_noun men) + u3_noun sut, + u3_noun peh, + u3_noun mur, + u3_noun men) { return _cqfu_tock(van, sut, peh, mur, men); } diff --git a/jets/f/ut_wrap.c b/jets/f/ut_wrap.c index 55f1ca9abc..8bdeee284a 100644 --- a/jets/f/ut_wrap.c +++ b/jets/f/ut_wrap.c @@ -5,10 +5,9 @@ static u3_noun - _cqfu_wrap( - u3_noun van, - u3_noun sut, - u3_noun yoz) + _cqfu_wrap(u3_noun van, + u3_noun sut, + u3_noun yoz) { u3_noun p_sut, q_sut; @@ -30,17 +29,16 @@ } else { return u3nt(c3__core, - u3k(p_sut), - u3nt(u3k(yoz), - u3k(qq_sut), - u3k(rq_sut))); + u3k(p_sut), + u3nt(u3k(yoz), + u3k(qq_sut), + u3k(rq_sut))); } } case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut); { - return u3qf_fork - (_cqfu_wrap(van, p_sut, yoz), - _cqfu_wrap(van, q_sut, yoz)); + return u3qf_fork(_cqfu_wrap(van, p_sut, yoz), + _cqfu_wrap(van, q_sut, yoz)); } case c3__hold: { @@ -56,8 +54,7 @@ /* boilerplate */ u3_noun - u3wfu_wrap( - u3_noun cor) + u3wfu_wrap(u3_noun cor) { u3_noun sut, yoz, van; @@ -72,8 +69,8 @@ u3_noun u3qfu_wrap(u3_noun van, - u3_noun sut, - u3_noun yoz) + u3_noun sut, + u3_noun yoz) { return _cqfu_wrap(van, sut, yoz); }