From b99b8969d96326fb479f31563be816c4b06897de Mon Sep 17 00:00:00 2001 From: Steve Dee Date: Mon, 21 Apr 2014 18:22:11 -0700 Subject: [PATCH 1/3] Whitespace: the invisible killer Includes our first ever pass over the jets. Yikes. --- gen164/1/add.c | 6 +- gen164/1/dec.c | 12 +-- gen164/1/div.c | 8 +- gen164/1/gte.c | 6 +- gen164/1/gth.c | 6 +- gen164/1/lte.c | 6 +- gen164/1/lth.c | 6 +- gen164/1/mod.c | 6 +- gen164/1/mul.c | 6 +- gen164/1/sub.c | 6 +- gen164/2/bind.c | 6 +- gen164/2/clap.c | 12 +-- gen164/2/drop.c | 8 +- gen164/2/flop.c | 8 +- gen164/2/lent.c | 6 +- gen164/2/levy.c | 8 +- gen164/2/lien.c | 8 +- gen164/2/need.c | 8 +- gen164/2/reel.c | 8 +- gen164/2/roll.c | 6 +- gen164/2/skim.c | 10 +-- gen164/2/skip.c | 10 +-- gen164/2/slag.c | 10 +-- gen164/2/snag.c | 10 +-- gen164/2/sort.c | 6 +- gen164/2/turn.c | 10 +-- gen164/2/weld.c | 14 ++-- gen164/3/bex.c | 10 +-- gen164/3/can.c | 12 +-- gen164/3/cap.c | 6 +- gen164/3/cat.c | 14 ++-- gen164/3/con.c | 6 +- gen164/3/cut.c | 12 +-- gen164/3/dis.c | 6 +- gen164/3/dor.c | 6 +- gen164/3/end.c | 12 +-- gen164/3/gor.c | 6 +- gen164/3/hor.c | 6 +- gen164/3/lsh.c | 12 +-- gen164/3/mas.c | 12 +-- gen164/3/met.c | 6 +- gen164/3/mix.c | 6 +- gen164/3/mug.c | 6 +- gen164/3/peg.c | 6 +- gen164/3/po.c | 26 +++--- gen164/3/rap.c | 12 +-- gen164/3/rip.c | 8 +- gen164/3/rsh.c | 12 +-- gen164/3/vor.c | 6 +- gen164/4/by.c | 4 +- gen164/4/by_gas.c | 6 +- gen164/4/by_get.c | 10 +-- gen164/4/by_has.c | 12 +-- gen164/4/by_put.c | 18 ++-- gen164/4/in.c | 6 +- gen164/4/in_gas.c | 6 +- gen164/4/in_has.c | 12 +-- gen164/4/in_put.c | 16 ++-- gen164/4/in_tap.c | 14 ++-- gen164/5/cue.c | 8 +- gen164/5/jam.c | 8 +- gen164/5/lore.c | 8 +- gen164/5/loss.c | 42 +++++----- gen164/5/mat.c | 6 +- gen164/5/mink.c | 10 +-- gen164/5/parse.c | 184 ++++++++++++++++++++--------------------- gen164/5/repg.c | 18 ++-- gen164/5/rexp.c | 28 +++---- gen164/5/rub.c | 8 +- gen164/5/tape.c | 10 +-- gen164/5/trip.c | 6 +- gen164/6/al.c | 8 +- gen164/6/ap.c | 152 +++++++++++++++++----------------- gen164/6/bull.c | 8 +- gen164/6/cell.c | 6 +- gen164/6/comb.c | 26 +++--- gen164/6/cons.c | 12 +-- gen164/6/core.c | 6 +- gen164/6/cube.c | 6 +- gen164/6/face.c | 6 +- gen164/6/fine.c | 12 +-- gen164/6/fitz.c | 12 +-- gen164/6/flan.c | 12 +-- gen164/6/flay.c | 10 +-- gen164/6/flip.c | 10 +-- gen164/6/flor.c | 12 +-- gen164/6/fork.c | 6 +- gen164/6/hike.c | 24 +++--- gen164/6/look.c | 24 +++--- gen164/6/type.c | 2 +- gen164/6/ut.c | 26 +++--- gen164/6/ut_burn.c | 12 +-- gen164/6/ut_busk.c | 22 ++--- gen164/6/ut_bust.c | 16 ++-- gen164/6/ut_conk.c | 26 +++--- gen164/6/ut_crop.c | 26 +++--- gen164/6/ut_cull.c | 52 ++++++------ gen164/6/ut_find.c | 200 ++++++++++++++++++++++----------------------- gen164/6/ut_fink.c | 48 +++++------ gen164/6/ut_fire.c | 32 ++++---- gen164/6/ut_firm.c | 20 ++--- gen164/6/ut_fish.c | 22 ++--- gen164/6/ut_fuse.c | 22 ++--- gen164/6/ut_gain.c | 16 ++-- gen164/6/ut_heal.c | 34 ++++---- gen164/6/ut_lose.c | 16 ++-- gen164/6/ut_mint.c | 154 +++++++++++++++++----------------- gen164/6/ut_moot.c | 8 +- gen164/6/ut_mull.c | 136 +++++++++++++++--------------- gen164/6/ut_nest.c | 62 +++++++------- gen164/6/ut_park.c | 26 +++--- gen164/6/ut_peek.c | 40 ++++----- gen164/6/ut_play.c | 50 ++++++------ gen164/6/ut_repo.c | 8 +- gen164/6/ut_rest.c | 26 +++--- gen164/6/ut_seek.c | 56 ++++++------- gen164/6/ut_sift.c | 24 +++--- gen164/6/ut_swab.c | 12 +-- gen164/6/ut_tack.c | 34 ++++---- gen164/6/ut_tock.c | 32 ++++---- gen164/6/ut_wrap.c | 14 ++-- gen164/pit.h | 180 ++++++++++++++++++++-------------------- gen164/watt.c | 2 +- 123 files changed, 1336 insertions(+), 1336 deletions(-) diff --git a/gen164/1/add.c b/gen164/1/add.c index a7ba306ea..efaf84d30 100644 --- a/gen164/1/add.c +++ b/gen164/1/add.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, add)(u2_wire wir_r, + j2_mbc(Pt1, add)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -23,7 +23,7 @@ return u2_rl_mp(wir_r, a_mp); } u2_weak // transfer - j2_mb(Pt1, add)(u2_wire wir_r, + j2_mb(Pt1, add)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -40,7 +40,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, add)[] = { { ".2", c3__lite, j2_mb(Pt1, add), u2_jet_live, u2_none, u2_none }, { } diff --git a/gen164/1/dec.c b/gen164/1/dec.c index af631544e..a26f3dd0d 100644 --- a/gen164/1/dec.c +++ b/gen164/1/dec.c @@ -15,13 +15,13 @@ } u2_weak // transfer - j2_mbc(Pt1, dec)(u2_wire wir_r, + j2_mbc(Pt1, dec)(u2_wire wir_r, u2_atom a) // retain { if ( _0 == a ) { return u2_bl_error(wir_r, "decrement-underflow"); return u2_bl_bail(wir_r, c3__exit); - } + } else { mpz_t a_mp; @@ -32,13 +32,13 @@ } } u2_weak // transfer - j2_mb(Pt1, dec)(u2_wire wir_r, + j2_mb(Pt1, dec)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) || - (u2_no == u2_stud(a)) ) + (u2_no == u2_stud(a)) ) { return u2_bl_bail(wir_r, c3__exit); } else { @@ -48,8 +48,8 @@ /* structures */ - u2_ho_jet - j2_mbj(Pt1, dec)[] = { + u2_ho_jet + j2_mbj(Pt1, dec)[] = { { ".2", c3__lite, j2_mb(Pt1, dec), u2_jet_live, u2_none, u2_none }, { } }; diff --git a/gen164/1/div.c b/gen164/1/div.c index a289dca42..3d7272cc5 100644 --- a/gen164/1/div.c +++ b/gen164/1/div.c @@ -8,13 +8,13 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, div)(u2_wire wir_r, + j2_mbc(Pt1, div)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { if ( _0 == b ) { return u2_bl_bail(wir_r, c3__exit); - } + } else { mpz_t a_mp, b_mp; @@ -28,7 +28,7 @@ } } u2_weak // transfer - j2_mb(Pt1, div)(u2_wire wir_r, + j2_mb(Pt1, div)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -45,7 +45,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, div)[] = { { ".2", c3__lite, j2_mb(Pt1, div), u2_jet_live, u2_none, u2_none }, { } diff --git a/gen164/1/gte.c b/gen164/1/gte.c index 55ecebdbd..dda5cbb7a 100644 --- a/gen164/1/gte.c +++ b/gen164/1/gte.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, gte)(u2_wire wir_r, + j2_mbc(Pt1, gte)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -26,7 +26,7 @@ return cmp; } u2_weak // transfer - j2_mb(Pt1, gte)(u2_wire wir_r, + j2_mb(Pt1, gte)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -43,7 +43,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, gte)[] = { { ".2", c3__lite, j2_mb(Pt1, gte), Tier1, u2_none, u2_none }, { } diff --git a/gen164/1/gth.c b/gen164/1/gth.c index 4bf9626e3..9a8df9fa5 100644 --- a/gen164/1/gth.c +++ b/gen164/1/gth.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, gth)(u2_wire wir_r, + j2_mbc(Pt1, gth)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -26,7 +26,7 @@ return cmp; } u2_weak // transfer - j2_mb(Pt1, gth)(u2_wire wir_r, + j2_mb(Pt1, gth)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -43,7 +43,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, gth)[] = { { ".2", c3__lite, j2_mb(Pt1, gth), Tier1, u2_none, u2_none }, { } diff --git a/gen164/1/lte.c b/gen164/1/lte.c index f9dc2b887..a5fec2391 100644 --- a/gen164/1/lte.c +++ b/gen164/1/lte.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, lte)(u2_wire wir_r, + j2_mbc(Pt1, lte)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -26,7 +26,7 @@ return cmp; } u2_weak // transfer - j2_mb(Pt1, lte)(u2_wire wir_r, + j2_mb(Pt1, lte)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -43,7 +43,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, lte)[] = { { ".2", c3__lite, j2_mb(Pt1, lte), Tier1, u2_none, u2_none }, { } diff --git a/gen164/1/lth.c b/gen164/1/lth.c index 85960675f..f77e561f6 100644 --- a/gen164/1/lth.c +++ b/gen164/1/lth.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, lth)(u2_wire wir_r, + j2_mbc(Pt1, lth)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -26,7 +26,7 @@ return cmp; } u2_weak // transfer - j2_mb(Pt1, lth)(u2_wire wir_r, + j2_mb(Pt1, lth)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -43,7 +43,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, lth)[] = { { ".2", c3__lite, j2_mb(Pt1, lth), Tier1, u2_none, u2_none }, { } diff --git a/gen164/1/mod.c b/gen164/1/mod.c index 9d8f65b8a..cc2d3937d 100644 --- a/gen164/1/mod.c +++ b/gen164/1/mod.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, mod)(u2_wire wir_r, + j2_mbc(Pt1, mod)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -27,7 +27,7 @@ } } u2_weak // transfer - j2_mb(Pt1, mod)(u2_wire wir_r, + j2_mb(Pt1, mod)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -44,7 +44,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, mod)[] = { { ".2", c3__lite, j2_mb(Pt1, mod), Tier1, u2_none, u2_none }, { } diff --git a/gen164/1/mul.c b/gen164/1/mul.c index e566f91a6..3a2e9d267 100644 --- a/gen164/1/mul.c +++ b/gen164/1/mul.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, mul)(u2_wire wir_r, + j2_mbc(Pt1, mul)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -23,7 +23,7 @@ return u2_rl_mp(wir_r, a_mp); } u2_weak // transfer - j2_mb(Pt1, mul)(u2_wire wir_r, + j2_mb(Pt1, mul)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -40,7 +40,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, mul)[] = { { ".2", c3__lite, j2_mb(Pt1, mul), u2_jet_live, u2_none, u2_none }, { } diff --git a/gen164/1/sub.c b/gen164/1/sub.c index 8de134f48..a3ed6a7ed 100644 --- a/gen164/1/sub.c +++ b/gen164/1/sub.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt1, sub)(u2_wire wir_r, + j2_mbc(Pt1, sub)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -29,7 +29,7 @@ return u2_rl_mp(wir_r, a_mp); } u2_weak // transfer - j2_mb(Pt1, sub)(u2_wire wir_r, + j2_mb(Pt1, sub)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -46,7 +46,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt1, sub)[] = { { ".2", c3__lite, j2_mb(Pt1, sub), u2_jet_live, u2_none, u2_none }, { } diff --git a/gen164/2/bind.c b/gen164/2/bind.c index bc43b9e3b..461209f23 100644 --- a/gen164/2/bind.c +++ b/gen164/2/bind.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, bind)(u2_wire wir_r, + j2_mbc(Pt2, bind)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -19,7 +19,7 @@ } } u2_noun // transfer - j2_mb(Pt2, bind)(u2_wire wir_r, + j2_mb(Pt2, bind)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -33,7 +33,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, bind)[] = { { ".2", c3__lite, j2_mb(Pt2, bind), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/clap.c b/gen164/2/clap.c index 30032ff17..cb6ca8c0d 100644 --- a/gen164/2/clap.c +++ b/gen164/2/clap.c @@ -8,14 +8,14 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, clap)(u2_wire wir_r, + j2_mbc(Pt2, clap)(u2_wire wir_r, u2_noun a, // retain u2_noun b, // retain u2_noun c) // retain { if ( _0 == a ) { return u2_rx(wir_r, b); - } + } else if ( _0 == b ) { return u2_rx(wir_r, a); } @@ -27,13 +27,13 @@ } } u2_noun // transfer - j2_mb(Pt2, clap)(u2_wire wir_r, + j2_mb(Pt2, clap)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b, c; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, - u2_cv_sam_6, &b, + if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, + u2_cv_sam_6, &b, u2_cv_sam_7, &c, 0) ) { return u2_bl_bail(wir_r, c3__exit); } else { @@ -43,7 +43,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, clap)[] = { { ".2", c3__lite, j2_mb(Pt2, clap), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/drop.c b/gen164/2/drop.c index 549f44e8f..9aa68c1b6 100644 --- a/gen164/2/drop.c +++ b/gen164/2/drop.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, drop)(u2_wire wir_r, + j2_mbc(Pt2, drop)(u2_wire wir_r, u2_noun a) // retain { if ( _0 == a ) { @@ -17,9 +17,9 @@ else { return u2_ro(wir_r, u2_rx(wir_r, u2_st(a))); } - } + } u2_noun // transfer - j2_mb(Pt2, drop)(u2_wire wir_r, + j2_mb(Pt2, drop)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -33,7 +33,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, drop)[] = { { ".2", c3__lite, j2_mb(Pt2, drop), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/flop.c b/gen164/2/flop.c index 7cb6dbd80..9fa14d612 100644 --- a/gen164/2/flop.c +++ b/gen164/2/flop.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, flop)(u2_wire wir_r, + j2_mbc(Pt2, flop)(u2_wire wir_r, u2_noun a) // retain { u2_weak b = _0; @@ -16,7 +16,7 @@ while ( 1 ) { if ( u2_nul == a ) { return b; - } + } else if ( u2_no == u2_dust(a) ) { u2_rl_lose(wir_r, b); @@ -29,7 +29,7 @@ } } u2_weak // transfer - j2_mb(Pt2, flop)(u2_wire wir_r, + j2_mb(Pt2, flop)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -43,7 +43,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, flop)[] = { { ".2", c3__lite, j2_mb(Pt2, flop), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/lent.c b/gen164/2/lent.c index b07fdd2d2..6be67a21f 100644 --- a/gen164/2/lent.c +++ b/gen164/2/lent.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, lent)(u2_wire wir_r, + j2_mbc(Pt2, lent)(u2_wire wir_r, u2_noun a) // retain { u2_weak len = _0; @@ -28,7 +28,7 @@ } } u2_noun - j2_mb(Pt2, lent)(u2_wire wir_r, + j2_mb(Pt2, lent)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -42,7 +42,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, lent)[] = { { ".2", c3__lite, j2_mb(Pt2, lent), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/levy.c b/gen164/2/levy.c index 1feb5ab12..9c7c9815b 100644 --- a/gen164/2/levy.c +++ b/gen164/2/levy.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, levy)(u2_wire wir_r, + j2_mbc(Pt2, levy)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -23,13 +23,13 @@ else switch ( (loz = u2_nk_mong(wir_r, b, u2_rx(wir_r, u2_h(a)))) ) { case u2_yes: return j2_mbc(Pt2, levy)(wir_r, u2_t(a), b); case u2_no: return u2_no; - default: u2_rl_lose(wir_r, loz); + default: u2_rl_lose(wir_r, loz); return u2_bl_bail(wir_r, c3__exit); } } } u2_noun // transfer - j2_mb(Pt2, levy)(u2_wire wir_r, + j2_mb(Pt2, levy)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -43,7 +43,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, levy)[] = { { ".2", c3__lite, j2_mb(Pt2, levy), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/lien.c b/gen164/2/lien.c index 83b17972b..918c8c1f9 100644 --- a/gen164/2/lien.c +++ b/gen164/2/lien.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, lien)(u2_wire wir_r, + j2_mbc(Pt2, lien)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -23,13 +23,13 @@ else switch ( (loz = u2_nk_mong(wir_r, b, u2_rx(wir_r, u2_h(a)))) ) { case u2_yes: return u2_yes; case u2_no: return j2_mbc(Pt2, lien)(wir_r, u2_t(a), b); - default: u2_rl_lose(wir_r, loz); + default: u2_rl_lose(wir_r, loz); return u2_bl_bail(wir_r, c3__exit); } } } u2_noun // transfer - j2_mb(Pt2, lien)(u2_wire wir_r, + j2_mb(Pt2, lien)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -43,7 +43,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, lien)[] = { { ".2", c3__lite, j2_mb(Pt2, lien), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/need.c b/gen164/2/need.c index a6f0768c3..14278a4db 100644 --- a/gen164/2/need.c +++ b/gen164/2/need.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, need)(u2_wire wir_r, + j2_mbc(Pt2, need)(u2_wire wir_r, u2_noun a) // retain { if ( _0 == a ) { @@ -17,9 +17,9 @@ else { return u2_rx(wir_r, u2_st(a)); } - } + } u2_noun // transfer - j2_mb(Pt2, need)(u2_wire wir_r, + j2_mb(Pt2, need)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -33,7 +33,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, need)[] = { { ".2", c3__lite, j2_mb(Pt2, need), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/reel.c b/gen164/2/reel.c index c864e3c02..1ba2b4e9e 100644 --- a/gen164/2/reel.c +++ b/gen164/2/reel.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, reel)(u2_wire wir_r, + j2_mbc(Pt2, reel)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -21,12 +21,12 @@ else { u2_weak gim = u2_rx(wir_r, u2_h(a)); u2_weak hur = j2_mbc(Pt2, reel)(wir_r, u2_t(a), b); - + return u2_nk_mong(wir_r, b, u2_rc(wir_r, gim, hur)); } } u2_noun // transfer - j2_mb(Pt2, reel)(u2_wire wir_r, + j2_mb(Pt2, reel)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -40,7 +40,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, reel)[] = { { ".2", c3__lite, j2_mb(Pt2, reel), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/roll.c b/gen164/2/roll.c index dd2696ed7..d7ba6f071 100644 --- a/gen164/2/roll.c +++ b/gen164/2/roll.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, roll)(u2_wire wir_r, + j2_mbc(Pt2, roll)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -35,7 +35,7 @@ } } u2_noun // transfer - j2_mb(Pt2, roll)(u2_wire wir_r, + j2_mb(Pt2, roll)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -49,7 +49,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, roll)[] = { { ".2", c3__lite, j2_mb(Pt2, roll), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/skim.c b/gen164/2/skim.c index 787f62494..2f6f28248 100644 --- a/gen164/2/skim.c +++ b/gen164/2/skim.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, skim)(u2_wire wir_r, + j2_mbc(Pt2, skim)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -21,17 +21,17 @@ u2_weak hoz = u2_nk_mong(wir_r, b, u2_rx(wir_r, u2_h(a))); u2_weak vyr = j2_mbc(Pt2, skim)(wir_r, u2_t(a), b); - switch ( hoz ) { + switch ( hoz ) { case u2_yes: return u2_rc(wir_r, u2_rx(wir_r, u2_h(a)), vyr); case u2_no: return vyr; - default: u2_rl_lose(wir_r, hoz); + default: u2_rl_lose(wir_r, hoz); u2_rl_lose(wir_r, vyr); return u2_bl_bail(wir_r, c3__exit); } } } u2_noun // transfer - j2_mb(Pt2, skim)(u2_wire wir_r, + j2_mb(Pt2, skim)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -45,7 +45,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, skim)[] = { { ".2", c3__lite, j2_mb(Pt2, skim), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/skip.c b/gen164/2/skip.c index 33edee449..704fc6e5d 100644 --- a/gen164/2/skip.c +++ b/gen164/2/skip.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, skip)(u2_wire wir_r, + j2_mbc(Pt2, skip)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -21,17 +21,17 @@ u2_weak hoz = u2_nk_mong(wir_r, b, u2_rx(wir_r, u2_h(a))); u2_weak vyr = j2_mbc(Pt2, skip)(wir_r, u2_t(a), b); - switch ( hoz ) { + switch ( hoz ) { case u2_yes: return vyr; case u2_no: return u2_rc(wir_r, u2_rx(wir_r, u2_h(a)), vyr); - default: u2_rl_lose(wir_r, hoz); + default: u2_rl_lose(wir_r, hoz); u2_rl_lose(wir_r, vyr); return u2_none; } } } u2_noun // transfer - j2_mb(Pt2, skip)(u2_wire wir_r, + j2_mb(Pt2, skip)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -45,7 +45,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, skip)[] = { { ".2", c3__lite, j2_mb(Pt2, skip), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/slag.c b/gen164/2/slag.c index a2bcdf869..930e6e276 100644 --- a/gen164/2/slag.c +++ b/gen164/2/slag.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, slag)(u2_wire wir_r, + j2_mbc(Pt2, slag)(u2_wire wir_r, u2_atom a, // retain u2_noun b) // retain { @@ -29,13 +29,13 @@ } } u2_noun // transfer - j2_mb(Pt2, slag)(u2_wire wir_r, + j2_mb(Pt2, slag)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || - (u2_no == u2_stud(a)) ) + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || + (u2_no == u2_stud(a)) ) { return u2_bl_bail(wir_r, c3__exit); } else { @@ -45,7 +45,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, slag)[] = { { ".2", c3__lite, j2_mb(Pt2, slag), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/snag.c b/gen164/2/snag.c index 83ffce1f0..b7642be1d 100644 --- a/gen164/2/snag.c +++ b/gen164/2/snag.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, snag)(u2_wire wir_r, + j2_mbc(Pt2, snag)(u2_wire wir_r, u2_atom a, // retain u2_noun b) // retain { @@ -32,13 +32,13 @@ } } u2_noun // transfer - j2_mb(Pt2, snag)(u2_wire wir_r, + j2_mb(Pt2, snag)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || - (u2_no == u2_stud(a)) ) + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || + (u2_no == u2_stud(a)) ) { return u2_bl_bail(wir_r, c3__exit); } else { @@ -48,7 +48,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, snag)[] = { { ".2", c3__lite, j2_mb(Pt2, snag), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/sort.c b/gen164/2/sort.c index 98a5c8b5c..0c480391e 100644 --- a/gen164/2/sort.c +++ b/gen164/2/sort.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, sort)(u2_wire wir_r, + j2_mbc(Pt2, sort)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -17,7 +17,7 @@ return u2_bl_bail(wir_r, c3__fail); } u2_noun // transfer - j2_mb(Pt2, sort)(u2_wire wir_r, + j2_mb(Pt2, sort)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -31,7 +31,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, sort)[] = { { ".2", c3__lite, u2_jet_dead, Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/turn.c b/gen164/2/turn.c index 07ec88a5b..48b7ec3b6 100644 --- a/gen164/2/turn.c +++ b/gen164/2/turn.c @@ -8,17 +8,17 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, turn)(u2_wire wir_r, + j2_mbc(Pt2, turn)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { if ( _0 == a ) { return a; - } + } else if ( u2_no == u2_dust(a) ) { return u2_bl_bail(wir_r, c3__exit); } - else { + else { u2_noun one = u2_nk_mong(wir_r, b, u2_rx(wir_r, u2_h(a))); u2_noun two = j2_mbc(Pt2, turn)(wir_r, u2_t(a), b); @@ -26,7 +26,7 @@ } } u2_noun // transfer - j2_mb(Pt2, turn)(u2_wire wir_r, + j2_mb(Pt2, turn)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -40,7 +40,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, turn)[] = { { ".2", c3__lite, j2_mb(Pt2, turn), Tier2, u2_none, u2_none }, { } diff --git a/gen164/2/weld.c b/gen164/2/weld.c index 053845314..dcdb8935f 100644 --- a/gen164/2/weld.c +++ b/gen164/2/weld.c @@ -8,25 +8,25 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt2, weld)(u2_wire wir_r, + j2_mbc(Pt2, weld)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { if ( _0 == a ) { return u2_rx(wir_r, b); - } + } else if ( u2_no == u2_dust(a) ) { return u2_bl_bail(wir_r, c3__exit); } - else { + else { return u2_rc - (wir_r, - u2_rx(wir_r, u2_h(a)), + (wir_r, + u2_rx(wir_r, u2_h(a)), j2_mbc(Pt2, weld)(wir_r, u2_t(a), b)); } } u2_noun // transfer - j2_mb(Pt2, weld)(u2_wire wir_r, + j2_mb(Pt2, weld)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -40,7 +40,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt2, weld)[] = { { ".2", c3__lite, j2_mb(Pt2, weld), Tier2, u2_none, u2_none }, { } diff --git a/gen164/3/bex.c b/gen164/3/bex.c index a73b025f1..b5d211006 100644 --- a/gen164/3/bex.c +++ b/gen164/3/bex.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, bex)(u2_wire wir_r, + j2_mbc(Pt3, bex)(u2_wire wir_r, u2_atom a) // retain { mpz_t a_mp; @@ -24,13 +24,13 @@ } } u2_weak // transfer - j2_mb(Pt3, bex)(u2_wire wir_r, + j2_mb(Pt3, bex)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) || - (u2_no == u2_stud(a)) ) + (u2_no == u2_stud(a)) ) { return u2_bl_bail(wir_r, c3__exit); } else { @@ -40,8 +40,8 @@ /* structures */ - u2_ho_jet - j2_mbj(Pt3, bex)[] = { + u2_ho_jet + j2_mbj(Pt3, bex)[] = { { ".2", c3__lite, j2_mb(Pt3, bex), Tier3, u2_none, u2_none }, { } }; diff --git a/gen164/3/can.c b/gen164/3/can.c index 50d5d2cf8..80c604453 100644 --- a/gen164/3/can.c +++ b/gen164/3/can.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mbc(Pt3, can)(u2_wire wir_r, + j2_mbc(Pt3, can)(u2_wire wir_r, u2_atom a, // retain u2_noun b) // retain { @@ -19,7 +19,7 @@ c3_g a_g = a; c3_w tot_w = 0; u2_ray sal_r; - + /* Measure and validate the slab required. */ { @@ -42,7 +42,7 @@ return u2_bl_bail(wir_r, c3__fail); } tot_w += pi_cab; - cab = u2_t(cab); + cab = u2_t(cab); } if ( 0 == tot_w ) { return _0; @@ -72,13 +72,13 @@ } } u2_weak // transfer - j2_mb(Pt3, can)(u2_wire wir_r, + j2_mb(Pt3, can)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || - (u2_no == u2_stud(a)) ) + (u2_no == u2_stud(a)) ) { return u2_bl_bail(wir_r, c3__fail); } else { @@ -88,7 +88,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, can)[] = { { ".2", c3__hevy, j2_mb(Pt3, can), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/cap.c b/gen164/3/cap.c index 87d97ff67..f6b983a6b 100644 --- a/gen164/3/cap.c +++ b/gen164/3/cap.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, cap)(u2_wire wir_r, + j2_mbc(Pt3, cap)(u2_wire wir_r, u2_atom a) // retain { c3_w met_w = u2_met(0, a); @@ -23,7 +23,7 @@ } } u2_weak // transfer - j2_mb(Pt3, cap)(u2_wire wir_r, + j2_mb(Pt3, cap)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -39,7 +39,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, cap)[] = { { ".2", c3__lite, j2_mb(Pt3, cap), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/cat.c b/gen164/3/cat.c index c73a97ac8..87c198b3d 100644 --- a/gen164/3/cat.c +++ b/gen164/3/cat.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, cat)(u2_wire wir_r, + j2_mbc(Pt3, cat)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c) // retain @@ -19,7 +19,7 @@ else { c3_g a_g = a; c3_w lew_w = u2_met(a_g, b); - c3_w ler_w = u2_met(a_g, c); + c3_w ler_w = u2_met(a_g, c); c3_w all_w = (lew_w + ler_w); if ( 0 == all_w ) { @@ -29,7 +29,7 @@ if ( 0 == sal_r ) { return u2_bl_bail(wir_r, c3__fail); - } + } else { u2_chop(a_g, 0, lew_w, 0, sal_r, b); u2_chop(a_g, 0, ler_w, lew_w, sal_r, c); @@ -41,13 +41,13 @@ } u2_weak // transfer - j2_mb(Pt3, cat)(u2_wire wir_r, + j2_mb(Pt3, cat)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b, c; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, - u2_cv_sam_6, &b, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, + u2_cv_sam_6, &b, u2_cv_sam_7, &c, 0)) || (u2_no == u2_stud(a)) || (u2_no == u2_stud(b)) || @@ -61,7 +61,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, cat)[] = { { ".2", c3__lite, j2_mb(Pt3, cat), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/con.c b/gen164/3/con.c index a919574ae..4663118b8 100644 --- a/gen164/3/con.c +++ b/gen164/3/con.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, con)(u2_wire wir_r, + j2_mbc(Pt3, con)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -38,7 +38,7 @@ } } u2_weak // transfer - j2_mb(Pt3, con)(u2_wire wir_r, + j2_mb(Pt3, con)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -55,7 +55,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, con)[] = { { ".2", c3__lite, j2_mb(Pt3, con), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/cut.c b/gen164/3/cut.c index 5990c346c..4a1623fc1 100644 --- a/gen164/3/cut.c +++ b/gen164/3/cut.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, cut)(u2_wire wir_r, + j2_mbc(Pt3, cut)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c, // retain @@ -52,14 +52,14 @@ } } u2_weak // transfer - j2_mb(Pt3, cut)(u2_wire wir_r, + j2_mb(Pt3, cut)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b, c, d; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, - u2_cv_sam_12, &b, - u2_cv_sam_13, &c, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, + u2_cv_sam_12, &b, + u2_cv_sam_13, &c, u2_cv_sam_7, &d, 0)) || (u2_no == u2_stud(a)) || (u2_no == u2_stud(b)) || @@ -74,7 +74,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, cut)[] = { { ".2", c3__lite, j2_mb(Pt3, cut), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/dis.c b/gen164/3/dis.c index b7af6a3a8..f97861e47 100644 --- a/gen164/3/dis.c +++ b/gen164/3/dis.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, dis)(u2_wire wir_r, + j2_mbc(Pt3, dis)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -37,7 +37,7 @@ } } u2_weak // transfer - j2_mb(Pt3, dis)(u2_wire wir_r, + j2_mb(Pt3, dis)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -54,7 +54,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, dis)[] = { { ".2", c3__lite, j2_mb(Pt3, dis), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/dor.c b/gen164/3/dor.c index 6538d3704..e8d9bd670 100644 --- a/gen164/3/dor.c +++ b/gen164/3/dor.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, dor)(u2_wire wir_r, + j2_mbc(Pt3, dor)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -38,7 +38,7 @@ } } u2_weak // transfer - j2_mb(Pt3, dor)(u2_wire wir_r, + j2_mb(Pt3, dor)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -52,7 +52,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, dor)[] = { { ".2", c3__lite, j2_mb(Pt3, dor), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/end.c b/gen164/3/end.c index 435e7392e..f28fbaa6a 100644 --- a/gen164/3/end.c +++ b/gen164/3/end.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, end)(u2_wire wir_r, + j2_mbc(Pt3, end)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c) // retain @@ -26,7 +26,7 @@ if ( _0 == b_w ) { return _0; - } + } else if ( b_w >= len_w ) { return u2_rx(wir_r, c); } @@ -43,13 +43,13 @@ } } u2_weak // transfer - j2_mb(Pt3, end)(u2_wire wir_r, + j2_mb(Pt3, end)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b, c; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, - u2_cv_sam_6, &b, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, + u2_cv_sam_6, &b, u2_cv_sam_7, &c, 0)) || (u2_no == u2_stud(a)) || (u2_no == u2_stud(b)) || @@ -63,7 +63,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, end)[] = { { ".2", c3__lite, j2_mb(Pt3, end), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/gor.c b/gen164/3/gor.c index 1f6f70e19..73f6c388c 100644 --- a/gen164/3/gor.c +++ b/gen164/3/gor.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, gor)(u2_wire wir_r, + j2_mbc(Pt3, gor)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -21,7 +21,7 @@ else return (c_w < d_w) ? u2_yes : u2_no; } u2_weak // transfer - j2_mb(Pt3, gor)(u2_wire wir_r, + j2_mb(Pt3, gor)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -35,7 +35,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, gor)[] = { { ".2", c3__lite, j2_mb(Pt3, gor), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/hor.c b/gen164/3/hor.c index 16dc8a478..c9296d9e7 100644 --- a/gen164/3/hor.c +++ b/gen164/3/hor.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, hor)(u2_wire wir_r, + j2_mbc(Pt3, hor)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -35,7 +35,7 @@ } } u2_weak // transfer - j2_mb(Pt3, hor)(u2_wire wir_r, + j2_mb(Pt3, hor)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -49,7 +49,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, hor)[] = { { ".2", c3__lite, j2_mb(Pt3, hor), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/lsh.c b/gen164/3/lsh.c index 0edb3c1ee..c8d6dce8b 100644 --- a/gen164/3/lsh.c +++ b/gen164/3/lsh.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, lsh)(u2_wire wir_r, + j2_mbc(Pt3, lsh)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c) // retain @@ -26,7 +26,7 @@ if ( _0 == len_w ) { return _0; - } + } else if ( (b_w + len_w) < len_w ) { return u2_bl_bail(wir_r, c3__exit); } @@ -44,13 +44,13 @@ } } u2_weak // transfer - j2_mb(Pt3, lsh)(u2_wire wir_r, + j2_mb(Pt3, lsh)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b, c; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, - u2_cv_sam_6, &b, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, + u2_cv_sam_6, &b, u2_cv_sam_7, &c, 0)) || (u2_no == u2_stud(a)) || (u2_no == u2_stud(b)) || @@ -64,7 +64,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, lsh)[] = { { ".2", c3__lite, j2_mb(Pt3, lsh), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/mas.c b/gen164/3/mas.c index 132a88218..53ca2d574 100644 --- a/gen164/3/mas.c +++ b/gen164/3/mas.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, mas)(u2_wire wir_r, + j2_mbc(Pt3, mas)(u2_wire wir_r, u2_atom a) // retain { c3_w b_w; @@ -17,13 +17,13 @@ b_w = u2_met(0, a); if ( b_w < 2 ) { return u2_bl_bail(wir_r, c3__exit); - } + } else { c = j2_mbc(Pt3, bex)(wir_r, (b_w - 1)); d = j2_mbc(Pt3, bex)(wir_r, (b_w - 2)); e = j2_mbc(Pt1, sub)(wir_r, a, c); - f = j2_mbc(Pt3, con)(wir_r, e, d); - + f = j2_mbc(Pt3, con)(wir_r, e, d); + u2_rl_lose(wir_r, c); u2_rl_lose(wir_r, d); u2_rl_lose(wir_r, e); @@ -32,7 +32,7 @@ } } u2_weak // transfer - j2_mb(Pt3, mas)(u2_wire wir_r, + j2_mb(Pt3, mas)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -48,7 +48,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, mas)[] = { { ".2", c3__lite, j2_mb(Pt3, mas), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/met.c b/gen164/3/met.c index 544918748..b5c2dc99d 100644 --- a/gen164/3/met.c +++ b/gen164/3/met.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, met)(u2_wire wir_r, + j2_mbc(Pt3, met)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -27,7 +27,7 @@ } } u2_weak // transfer - j2_mb(Pt3, met)(u2_wire wir_r, + j2_mb(Pt3, met)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -44,7 +44,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, met)[] = { { ".2", c3__lite, j2_mb(Pt3, met), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/mix.c b/gen164/3/mix.c index 94c6c527f..313cb2b08 100644 --- a/gen164/3/mix.c +++ b/gen164/3/mix.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, mix)(u2_wire wir_r, + j2_mbc(Pt3, mix)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -37,7 +37,7 @@ } } u2_weak // transfer - j2_mb(Pt3, mix)(u2_wire wir_r, + j2_mb(Pt3, mix)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -54,7 +54,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, mix)[] = { { ".2", c3__lite, j2_mb(Pt3, mix), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/mug.c b/gen164/3/mug.c index 414fdd5eb..36362f795 100644 --- a/gen164/3/mug.c +++ b/gen164/3/mug.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mb(Pt3, mug)(u2_wire wir_r, + j2_mb(Pt3, mug)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sam; @@ -22,8 +22,8 @@ /* structures */ - u2_ho_jet - j2_mbj(Pt3, mug)[] = { + u2_ho_jet + j2_mbj(Pt3, mug)[] = { { ".2", c3__lite, j2_mb(Pt3, mug), Tier3, u2_none, u2_none }, { } }; diff --git a/gen164/3/peg.c b/gen164/3/peg.c index 10802b62f..0251b5c19 100644 --- a/gen164/3/peg.c +++ b/gen164/3/peg.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, peg)(u2_wire wir_r, + j2_mbc(Pt3, peg)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -30,7 +30,7 @@ return h; } u2_weak // transfer - j2_mb(Pt3, peg)(u2_wire wir_r, + j2_mb(Pt3, peg)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -49,7 +49,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, peg)[] = { { ".2", c3__lite, j2_mb(Pt3, peg), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/po.c b/gen164/3/po.c index 27ca458aa..b53dcc456 100644 --- a/gen164/3/po.c +++ b/gen164/3/po.c @@ -33,7 +33,7 @@ } u2_weak // transfer - j2_mc(Pt3, po, ins)(u2_wire wir_r, + j2_mc(Pt3, po, ins)(u2_wire wir_r, u2_noun cor) // retain { u2_noun x, a, buf; @@ -49,7 +49,7 @@ } } u2_weak // transfer - j2_mc(Pt3, po, ind)(u2_wire wir_r, + j2_mc(Pt3, po, ind)(u2_wire wir_r, u2_noun cor) // retain { u2_noun x, a, buf; @@ -66,7 +66,7 @@ } u2_weak // transfer - j2_mc(Pt3, po, tos)(u2_wire wir_r, + j2_mc(Pt3, po, tos)(u2_wire wir_r, u2_noun cor) // retain { u2_noun x, a, buf; @@ -75,10 +75,10 @@ (u2_no == u2du(x)) || (u2_no == u2ud(buf = u2h(x))) || (u2_no == u2ud(a)) || - (a >= 256) ) + (a >= 256) ) { return u2_bl_bail(wir_r, c3__exit); - } + } else { c3_y byt_y[3]; @@ -87,7 +87,7 @@ } } u2_weak // transfer - j2_mc(Pt3, po, tod)(u2_wire wir_r, + j2_mc(Pt3, po, tod)(u2_wire wir_r, u2_noun cor) // retain { u2_noun x, a, buf; @@ -96,7 +96,7 @@ (u2_no == u2du(x)) || (u2_no == u2ud(buf = u2t(x))) || (u2_no == u2ud(a)) || - (a >= 256) ) + (a >= 256) ) { return u2_bl_bail(wir_r, c3__exit); } else { @@ -112,22 +112,22 @@ // # define crap u2_jet_dead # define crap u2_jet_test | u2_jet_live - u2_ho_jet + u2_ho_jet j2_mcj(Pt3, po, ind)[] = { { ".2", c3__lite, j2_mc(Pt3, po, ind), Tier3, u2_none, u2_none }, { } }; - u2_ho_jet + u2_ho_jet j2_mcj(Pt3, po, ins)[] = { { ".2", c3__lite, j2_mc(Pt3, po, ins), Tier3, u2_none, u2_none }, { } }; - u2_ho_jet + u2_ho_jet j2_mcj(Pt3, po, tod)[] = { { ".2", c3__lite, j2_mc(Pt3, po, tod), Tier3, u2_none, u2_none }, { } }; - u2_ho_jet + u2_ho_jet j2_mcj(Pt3, po, tos)[] = { { ".2", c3__lite, j2_mc(Pt3, po, tos), Tier3, u2_none, u2_none }, { } @@ -136,7 +136,7 @@ /* structures */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt3, po)[] = { { j2_sc(Pt3, po, ind), j2_mcj(Pt3, po, ind), 0, 0, u2_none }, { j2_sc(Pt3, po, ins), j2_mcj(Pt3, po, ins), 0, 0, u2_none }, @@ -146,5 +146,5 @@ }; u2_ho_driver - j2_db(Pt3, po) = + j2_db(Pt3, po) = { j2_sb(Pt3, po), 0, j2_mbd(Pt3, po), 0, u2_none }; diff --git a/gen164/3/rap.c b/gen164/3/rap.c index a157ccd54..79aeb191b 100644 --- a/gen164/3/rap.c +++ b/gen164/3/rap.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, rap)(u2_wire wir_r, + j2_mbc(Pt3, rap)(u2_wire wir_r, u2_atom a, // retain u2_noun b) // retain { @@ -19,7 +19,7 @@ c3_g a_g = a; c3_w tot_w = 0; u2_ray sal_r; - + /* Measure and validate the slab required. */ { @@ -42,7 +42,7 @@ return u2_bl_bail(wir_r, c3__fail); } tot_w += len_w; - cab = u2_t(cab); + cab = u2_t(cab); } if ( 0 == tot_w ) { return _0; @@ -72,13 +72,13 @@ } } u2_weak // transfer - j2_mb(Pt3, rap)(u2_wire wir_r, + j2_mb(Pt3, rap)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || - (u2_no == u2_stud(a)) ) + (u2_no == u2_stud(a)) ) { return u2_bl_bail(wir_r, c3__exit); } else { @@ -88,7 +88,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, rap)[] = { { ".2", c3__lite, j2_mb(Pt3, rap), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/rip.c b/gen164/3/rip.c index 35f8e92f1..5c84b1ab4 100644 --- a/gen164/3/rip.c +++ b/gen164/3/rip.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, rip)(u2_wire wir_r, + j2_mbc(Pt3, rip)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -39,7 +39,7 @@ else { c3_w met_w = u2_met(a_g, b); c3_w len_w = u2_met(5, b); - c3_g san_g = (a_g - 5); + c3_g san_g = (a_g - 5); c3_w san_w = 1 << san_g; c3_w dif_w = (met_w << san_g) - len_w; c3_w tub_w = ((dif_w == 0) ? san_w : (san_w - dif_w)); @@ -70,7 +70,7 @@ } } u2_weak // transfer - j2_mb(Pt3, rip)(u2_wire wir_r, + j2_mb(Pt3, rip)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -87,7 +87,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, rip)[] = { { ".2", c3__lite, j2_mb(Pt3, rip), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/rsh.c b/gen164/3/rsh.c index 39d93debc..903cbdb94 100644 --- a/gen164/3/rsh.c +++ b/gen164/3/rsh.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, rsh)(u2_wire wir_r, + j2_mbc(Pt3, rsh)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c) // retain @@ -26,7 +26,7 @@ if ( b_w >= len_w ) { return _0; - } + } else { u2_ray sal_r = u2_rl_slaq(wir_r, a_g, (len_w - b_w)); @@ -41,13 +41,13 @@ } } u2_weak // transfer - j2_mb(Pt3, rsh)(u2_wire wir_r, + j2_mb(Pt3, rsh)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b, c; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, - u2_cv_sam_6, &b, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, + u2_cv_sam_6, &b, u2_cv_sam_7, &c, 0)) || (u2_no == u2_stud(a)) || (u2_no == u2_stud(b)) || @@ -61,7 +61,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, rsh)[] = { { ".2", c3__lite, j2_mb(Pt3, rsh), Tier3, u2_none, u2_none }, { } diff --git a/gen164/3/vor.c b/gen164/3/vor.c index 833d89b30..599429017 100644 --- a/gen164/3/vor.c +++ b/gen164/3/vor.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mbc(Pt3, vor)(u2_wire wir_r, + j2_mbc(Pt3, vor)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -21,7 +21,7 @@ else return (c_w < d_w) ? u2_yes : u2_no; } u2_weak // transfer - j2_mb(Pt3, vor)(u2_wire wir_r, + j2_mb(Pt3, vor)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -35,7 +35,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt3, vor)[] = { { ".2", c3__lite, j2_mb(Pt3, vor), Tier3, u2_none, u2_none }, { } diff --git a/gen164/4/by.c b/gen164/4/by.c index d06a45a79..5ac8ab96a 100644 --- a/gen164/4/by.c +++ b/gen164/4/by.c @@ -15,7 +15,7 @@ /* structures */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt4, by)[] = { { j2_sc(Pt4, by, gas), j2_mcj(Pt4, by, gas), 0, 0, u2_none }, { j2_sc(Pt4, by, get), j2_mcj(Pt4, by, get), 0, 0, u2_none }, @@ -26,5 +26,5 @@ }; u2_ho_driver - j2_db(Pt4, by) = + j2_db(Pt4, by) = { j2_sb(Pt4, by), 0, j2_mbd(Pt4, by), 0, u2_none }; diff --git a/gen164/4/by_gas.c b/gen164/4/by_gas.c index e24b291f3..957fdccb4 100644 --- a/gen164/4/by_gas.c +++ b/gen164/4/by_gas.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mcc(Pt4, by, gas)(u2_wire wir_r, + j2_mcc(Pt4, by, gas)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -42,7 +42,7 @@ } } u2_weak // transfer - j2_mc(Pt4, by, gas)(u2_wire wir_r, + j2_mc(Pt4, by, gas)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -56,7 +56,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt4, by, gas)[] = { { ".2", c3__lite, j2_mc(Pt4, by, gas), Tier4, u2_none, u2_none }, { } diff --git a/gen164/4/by_get.c b/gen164/4/by_get.c index 0ccb55113..aa76a6e47 100644 --- a/gen164/4/by_get.c +++ b/gen164/4/by_get.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mcc(Pt4, by, get)(u2_wire wir_r, + j2_mcc(Pt4, by, get)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -27,18 +27,18 @@ else { if ( (u2_yes == u2_sing(b, pn_a)) ) { return u2_rc(wir_r, u2_nul, u2_rx(wir_r, qn_a)); - } + } else { if ( u2_yes == j2_mbc(Pt3, gor)(wir_r, b, pn_a) ) { return j2_mcc(Pt4, by, get)(wir_r, l_a, b); - } + } else return j2_mcc(Pt4, by, get)(wir_r, r_a, b); } } } } u2_weak // transfer - j2_mc(Pt4, by, get)(u2_wire wir_r, + j2_mc(Pt4, by, get)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -52,7 +52,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt4, by, get)[] = { { ".2", c3__lite, j2_mc(Pt4, by, get), Tier4, u2_none, u2_none }, { } diff --git a/gen164/4/by_has.c b/gen164/4/by_has.c index b39abf1a8..5ba3c8cdb 100644 --- a/gen164/4/by_has.c +++ b/gen164/4/by_has.c @@ -7,8 +7,8 @@ /* functions */ - u2_bean - j2_mcc(Pt4, by, has)(u2_wire wir_r, + u2_bean + j2_mcc(Pt4, by, has)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -27,18 +27,18 @@ else { if ( (u2_yes == u2_sing(b, pn_a)) ) { return u2_yes; - } + } else { if ( u2_yes == j2_mbc(Pt3, gor)(wir_r, b, pn_a) ) { return j2_mcc(Pt4, by, has)(wir_r, l_a, b); - } + } else return j2_mcc(Pt4, by, has)(wir_r, r_a, b); } } } } u2_weak // transfer - j2_mc(Pt4, by, has)(u2_wire wir_r, + j2_mc(Pt4, by, has)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -52,7 +52,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt4, by, has)[] = { { ".2", c3__lite, j2_mc(Pt4, by, has), Tier4, u2_none, u2_none }, { } diff --git a/gen164/4/by_put.c b/gen164/4/by_put.c index 2d25b7b59..2e449c49c 100644 --- a/gen164/4/by_put.c +++ b/gen164/4/by_put.c @@ -8,14 +8,14 @@ /* functions */ u2_weak // transfer - j2_mcc(Pt4, by, put)(u2_wire wir_r, + j2_mcc(Pt4, by, put)(u2_wire wir_r, u2_noun a, // retain u2_noun b, // retain u2_noun c) // retain { if ( u2_nul == a ) { - return u2_rt(wir_r, - u2_rc(wir_r, u2_rx(wir_r, b), + return u2_rt(wir_r, + u2_rc(wir_r, u2_rx(wir_r, b), u2_rx(wir_r, c)), u2_nul, u2_nul); @@ -28,7 +28,7 @@ (u2_no == u2_as_cell(n_a, &pn_a, &qn_a)) ) { return u2_bl_bail(wir_r, c3__exit); - } + } else if ( u2_yes == u2_sing(pn_a, b) ) { if ( u2_yes == u2_sing(qn_a, c) ) { return u2_rx(wir_r, a); @@ -44,8 +44,8 @@ d = j2_mcc(Pt4, by, put)(wir_r, l_a, b, c); if ( u2_yes == j2_mbc(Pt3, vor)(wir_r, pn_a, u2_h(u2_h(d))) ) { - return u2_rt(wir_r, u2_rx(wir_r, n_a), - d, + return u2_rt(wir_r, u2_rx(wir_r, n_a), + d, u2_rx(wir_r, r_a)); } else { @@ -69,7 +69,7 @@ if ( u2_yes == j2_mbc(Pt3, vor)(wir_r, pn_a, u2_h(u2_h(d))) ) { return u2_rt(wir_r, u2_rx(wir_r, n_a), - u2_rx(wir_r, l_a), + u2_rx(wir_r, l_a), d); } else { @@ -92,7 +92,7 @@ } } u2_weak // transfer - j2_mc(Pt4, by, put)(u2_wire wir_r, + j2_mc(Pt4, by, put)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b, c; @@ -108,7 +108,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt4, by, put)[] = { { ".2", c3__lite, j2_mc(Pt4, by, put), Tier4, u2_none, u2_none }, { } diff --git a/gen164/4/in.c b/gen164/4/in.c index 219a77808..9ef2fea78 100644 --- a/gen164/4/in.c +++ b/gen164/4/in.c @@ -14,7 +14,7 @@ /* structures */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt4, in)[] = { { j2_sc(Pt4, in, gas), j2_mcj(Pt4, in, gas), 0, 0, u2_none }, { j2_sc(Pt4, in, has), j2_mcj(Pt4, in, has), 0, 0, u2_none }, @@ -23,11 +23,11 @@ {} }; - u2_ho_jet + u2_ho_jet j2_mbj(Pt4, in)[] = { { } }; u2_ho_driver - j2_db(Pt4, in) = + j2_db(Pt4, in) = { j2_sb(Pt4, in), j2_mbj(Pt4, in), j2_mbd(Pt4, in), 0, u2_none }; diff --git a/gen164/4/in_gas.c b/gen164/4/in_gas.c index bfee398d8..018bf7cb2 100644 --- a/gen164/4/in_gas.c +++ b/gen164/4/in_gas.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mcc(Pt4, in, gas)(u2_wire wir_r, + j2_mcc(Pt4, in, gas)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -35,7 +35,7 @@ } } u2_weak // transfer - j2_mc(Pt4, in, gas)(u2_wire wir_r, + j2_mc(Pt4, in, gas)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -49,7 +49,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt4, in, gas)[] = { { ".2", c3__lite, j2_mc(Pt4, in, gas), Tier4, u2_none, u2_none }, { } diff --git a/gen164/4/in_has.c b/gen164/4/in_has.c index 38022a328..87e4d3f66 100644 --- a/gen164/4/in_has.c +++ b/gen164/4/in_has.c @@ -7,8 +7,8 @@ /* functions */ - u2_bean - j2_mcc(Pt4, in, has)(u2_wire wir_r, + u2_bean + j2_mcc(Pt4, in, has)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -24,18 +24,18 @@ else { if ( (u2_yes == u2_sing(b, n_a)) ) { return u2_yes; - } + } else { if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, b, n_a) ) { return j2_mcc(Pt4, in, has)(wir_r, l_a, b); - } + } else return j2_mcc(Pt4, in, has)(wir_r, r_a, b); } } } } u2_weak // transfer - j2_mc(Pt4, in, has)(u2_wire wir_r, + j2_mc(Pt4, in, has)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -49,7 +49,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt4, in, has)[] = { { ".2", c3__lite, j2_mc(Pt4, in, has), Tier4, u2_none, u2_none }, { } diff --git a/gen164/4/in_put.c b/gen164/4/in_put.c index 0016758c1..f36004c1a 100644 --- a/gen164/4/in_put.c +++ b/gen164/4/in_put.c @@ -8,7 +8,7 @@ /* functions */ u2_weak // transfer - j2_mcc(Pt4, in, put)(u2_wire wir_r, + j2_mcc(Pt4, in, put)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { @@ -19,9 +19,9 @@ u2_noun l_a, n_a, r_a, lr_a; // XX copy tree boilerplate to other pt4 u2_noun c, l_c, n_c, r_c; - if ( (u2_no == u2_as_cell(a, &n_a, &lr_a)) ) { + if ( (u2_no == u2_as_cell(a, &n_a, &lr_a)) ) { return u2_bl_bail(wir_r, c3__exit); - } + } else if ( u2_yes == u2_sing(n_a, b) ) { return u2_rx(wir_r, a); } @@ -33,8 +33,8 @@ c = j2_mcc(Pt4, in, put)(wir_r, l_a, b); if ( u2_yes == j2_mbc(Pt3, vor)(wir_r, n_a, u2_h(c)) ) { - return u2_rt(wir_r, u2_rx(wir_r, n_a), - c, + return u2_rt(wir_r, u2_rx(wir_r, n_a), + c, u2_rx(wir_r, r_a)); } else { @@ -58,7 +58,7 @@ if ( u2_yes == j2_mbc(Pt3, vor)(wir_r, n_a, u2_h(c)) ) { return u2_rt(wir_r, u2_rx(wir_r, n_a), - u2_rx(wir_r, l_a), + u2_rx(wir_r, l_a), c); } else { @@ -81,7 +81,7 @@ } } u2_weak // transfer - j2_mc(Pt4, in, put)(u2_wire wir_r, + j2_mc(Pt4, in, put)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -95,7 +95,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt4, in, put)[] = { { ".2", c3__lite, j2_mc(Pt4, in, put), Tier4, u2_none, u2_none }, { } diff --git a/gen164/4/in_tap.c b/gen164/4/in_tap.c index 667e8dd0c..7578f1b44 100644 --- a/gen164/4/in_tap.c +++ b/gen164/4/in_tap.c @@ -22,22 +22,22 @@ return u2_bl_bail(wir_r, c3__exit); } else { return _tap_in - (wir_r, r_a, - u2_rc(wir_r, u2_rx(wir_r, n_a), + (wir_r, r_a, + u2_rc(wir_r, u2_rx(wir_r, n_a), _tap_in(wir_r, l_a, b))); } - } + } } - u2_weak // produce - j2_mcc(Pt4, in, tap)(u2_wire wir_r, + u2_weak // produce + j2_mcc(Pt4, in, tap)(u2_wire wir_r, u2_noun a, // retain u2_noun b) // retain { return _tap_in(wir_r, a, u2_rx(wir_r, b)); } u2_weak // produce - j2_mc(Pt4, in, tap)(u2_wire wir_r, + j2_mc(Pt4, in, tap)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -51,7 +51,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt4, in, tap)[] = { { ".2", c3__lite, j2_mc(Pt4, in, tap), Tier4, u2_none, u2_none }, { } diff --git a/gen164/5/cue.c b/gen164/5/cue.c index c9c77b1a0..a93f0fd3f 100644 --- a/gen164/5/cue.c +++ b/gen164/5/cue.c @@ -41,7 +41,7 @@ x = j2_mbc(Pt1, add)(wir_r, u2_h(u), c); v = _cue_in(wir_r, a, x, u2_t(u2_t(u))); - w = u2_bc(wir_r, u2_rx(wir_r, u2_h(u2_t(u))), + w = u2_bc(wir_r, u2_rx(wir_r, u2_h(u2_t(u))), u2_rx(wir_r, u2_h(u2_t(v)))); y = j2_mbc(Pt1, add)(wir_r, u2_h(u), u2_h(v)); @@ -81,7 +81,7 @@ } u2_noun // transfer - j2_mby(Pt5, cue)(u2_wire wir_r, + j2_mby(Pt5, cue)(u2_wire wir_r, u2_atom a) // retain { #if 0 @@ -98,7 +98,7 @@ } } u2_noun // transfer - j2_mb(Pt5, cue)(u2_wire wir_r, + j2_mb(Pt5, cue)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -112,7 +112,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, cue)[] = { { ".2", c3__hevy, j2_mb(Pt5, cue), Tier3, u2_none, u2_none }, { } diff --git a/gen164/5/jam.c b/gen164/5/jam.c index 9870e1e26..9fc15a29b 100644 --- a/gen164/5/jam.c +++ b/gen164/5/jam.c @@ -61,7 +61,7 @@ u2_noun x = j2_mbc(Pt1, add)(wir_r, _1, u2_h(d)); u2_noun y = u2_bt (wir_r, u2_rx(wir_r, x), - u2_bc(wir_r, u2_bc(wir_r, + u2_bc(wir_r, u2_bc(wir_r, x, j2_mbc(Pt3, lsh)(wir_r, _0, _1, u2_t(d))), u2_rx(wir_r, l)), @@ -128,7 +128,7 @@ } u2_noun // transfer - j2_mby(Pt5, jam)(u2_wire wir_r, + j2_mby(Pt5, jam)(u2_wire wir_r, u2_atom a) // retain { u2_noun x = _jam_in(wir_r, a, _0, u2_nul, u2_nul); @@ -141,7 +141,7 @@ return r; } u2_noun // transfer - j2_mb(Pt5, jam)(u2_wire wir_r, + j2_mb(Pt5, jam)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -155,7 +155,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, jam)[] = { { ".2", c3__hevy, j2_mb(Pt5, jam), Tier3, u2_none, u2_none }, { } diff --git a/gen164/5/lore.c b/gen164/5/lore.c index ab8fcac07..2c12ffc69 100644 --- a/gen164/5/lore.c +++ b/gen164/5/lore.c @@ -6,7 +6,7 @@ #include "../pit.h" u2_noun // produce - j2_mbc(Pt5, lore)(u2_wire wir_r, + j2_mbc(Pt5, lore)(u2_wire wir_r, u2_atom lub) // retain { c3_w len_w = u2_cr_met(3, lub); @@ -41,7 +41,7 @@ } u2_weak // produce - j2_mb(Pt5, lore)(u2_wire wir_r, + j2_mb(Pt5, lore)(u2_wire wir_r, u2_noun cor) // retain { u2_noun lub; @@ -58,8 +58,8 @@ /* structures */ - u2_ho_jet - j2_mbj(Pt5, lore)[] = { + u2_ho_jet + j2_mbj(Pt5, lore)[] = { { ".2", c3__lite, j2_mb(Pt5, lore), Tier5, u2_none, u2_none }, { } }; diff --git a/gen164/5/loss.c b/gen164/5/loss.c index cd3beaf31..56d8954fa 100644 --- a/gen164/5/loss.c +++ b/gen164/5/loss.c @@ -9,7 +9,7 @@ */ typedef struct _u2_loss { // loss problem u2_noun hel; // a as a list - c3_w lel_w; // length of a + c3_w lel_w; // length of a c3_w lev_w; // length of b u2_noun* hev; // b as an array u2_noun sev; // b as a set of lists @@ -19,7 +19,7 @@ // free loss object // - static void + static void _flem(u2_loss* loc_u) { u2z(loc_u->sev); @@ -42,12 +42,12 @@ if ( u2_nul == kad ) { return u2_nul; } else { - return u2nc(u2k(loc_u->hev[u2_cr_word(0, u2h(kad))]), + return u2nc(u2k(loc_u->hev[u2_cr_word(0, u2h(kad))]), _lext(loc_u, u2t(kad))); } } - // extract lcs + // extract lcs // static u2_noun _lexs(u2_loss* loc_u) @@ -60,8 +60,8 @@ // initialize loss object // static void - _lemp(u2_loss* loc_u, - u2_noun hel, // retain + _lemp(u2_loss* loc_u, + u2_noun hel, // retain u2_noun hev) // retain { loc_u->hel = hel; @@ -94,9 +94,9 @@ u2_noun how = loc_u->hev[i_w]; u2_weak hav; u2_noun teg; - + hav = u2_ckd_by_get(u2k(loc_u->sev), u2k(how)); - teg = u2nc(u2_ci_words(1, &i_w), + teg = u2nc(u2_ci_words(1, &i_w), (hav == u2_none) ? u2_nul : hav); loc_u->sev = u2_ckd_by_put(loc_u->sev, u2k(how), teg); } @@ -122,7 +122,7 @@ u2z(loc_u->kad[inx_w]); } loc_u->kad[inx_w] = kad; - } + } // extend fits top // @@ -194,12 +194,12 @@ ++*inx_w; return u2_no; } - } + } else { c3_w mid_w = *inx_w + ((max_w - *inx_w) / 2); if ( (u2_no == _lonk(loc_u, mid_w, goy_w)) || - (u2_yes == _hink(loc_u, mid_w, goy_w)) ) + (u2_yes == _hink(loc_u, mid_w, goy_w)) ) { return _bink(loc_u, inx_w, mid_w, goy_w); } else { @@ -219,12 +219,12 @@ return; } else { - u2_noun i_gay = u2h(gay); + u2_noun i_gay = u2h(gay); c3_w goy_w = u2_cr_word(0, i_gay); u2_noun bik; bik = _bink(loc_u, &inx_w, loc_u->kct_w, goy_w); - + if ( u2_yes == bik ) { _merg(loc_u, inx_w + 1, u2t(gay)); _lune(loc_u, inx_w, goy_w); @@ -246,7 +246,7 @@ if ( u2_none != guy ) { u2_noun gay = u2_ckb_flop(guy); - + _merg(loc_u, 0, gay); u2z(gay); } @@ -256,7 +256,7 @@ } u2_noun // produce - j2_mbc(Pt5, loss)(u2_wire wir_r, + j2_mbc(Pt5, loss)(u2_wire wir_r, u2_noun hel, // retain u2_noun hev) // retain { @@ -271,10 +271,10 @@ return lcs; } - static u2_bean + static u2_bean _listp(u2_noun lix) // retain { - while ( 1 ) { + while ( 1 ) { if ( u2_nul == lix ) return u2_yes; if ( u2_no == u2du(lix) ) return u2_no; lix = u2t(lix); @@ -282,7 +282,7 @@ } u2_weak // produce - j2_mb(Pt5, loss)(u2_wire wir_r, + j2_mb(Pt5, loss)(u2_wire wir_r, u2_noun cor) // retain { u2_noun hel, hev; @@ -290,7 +290,7 @@ if ( (u2_none == (hel = u2_frag(u2_cv_sam_2, cor))) || (u2_none == (hev = u2_frag(u2_cv_sam_3, cor))) || (u2_no == _listp(hel)) || - (u2_no == _listp(hev)) ) + (u2_no == _listp(hev)) ) { return u2_bl_bail(wir_r, c3__fail); } else { @@ -301,8 +301,8 @@ /* structures */ - u2_ho_jet - j2_mbj(Pt5, loss)[] = { + u2_ho_jet + j2_mbj(Pt5, loss)[] = { { ".2", c3__lite, j2_mb(Pt5, loss), Tier5, u2_none, u2_none }, { } }; diff --git a/gen164/5/mat.c b/gen164/5/mat.c index 050457a1d..60c9ae560 100644 --- a/gen164/5/mat.c +++ b/gen164/5/mat.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // produce - j2_mby(Pt5, mat)(u2_wire wir_r, + j2_mby(Pt5, mat)(u2_wire wir_r, u2_atom a) // retain { if ( _0 == a ) { @@ -40,7 +40,7 @@ } } u2_noun // transfer - j2_mb(Pt5, mat)(u2_wire wir_r, + j2_mb(Pt5, mat)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -54,7 +54,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, mat)[] = { { ".2", c3__hevy, j2_mb(Pt5, mat), Tier3, u2_none, u2_none }, { } diff --git a/gen164/5/mink.c b/gen164/5/mink.c index 16dece3c3..d436ec383 100644 --- a/gen164/5/mink.c +++ b/gen164/5/mink.c @@ -6,13 +6,13 @@ #include "../pit.h" u2_weak // produce - j2_mb(Pt5, mink)(u2_wire wir_r, + j2_mb(Pt5, mink)(u2_wire wir_r, u2_noun cor) // retain { u2_noun bus, fol, fly; - if ( u2_no == u2_mean(cor, u2_cv_sam_4, &bus, - u2_cv_sam_5, &fol, + if ( u2_no == u2_mean(cor, u2_cv_sam_4, &bus, + u2_cv_sam_5, &fol, u2_cv_sam_3, &fly, 0) ) { @@ -25,8 +25,8 @@ /* structures */ - u2_ho_jet - j2_mbj(Pt5, mink)[] = { + u2_ho_jet + j2_mbj(Pt5, mink)[] = { { ".2", c3__lite, j2_mb(Pt5, mink), Tier5, u2_none, u2_none }, { } }; diff --git a/gen164/5/parse.c b/gen164/5/parse.c index bce5fe6f7..b14188d2d 100644 --- a/gen164/5/parse.c +++ b/gen164/5/parse.c @@ -14,7 +14,7 @@ u2_bi_cell(wir_r, naz, &p_naz, &q_naz); if ( 10 == weq ) { - return u2_bc(wir_r, u2_bl_good(wir_r, + return u2_bc(wir_r, u2_bl_good(wir_r, u2_rl_vint(wir_r, u2_rx(wir_r, p_naz))), 1); } else { @@ -68,7 +68,7 @@ u2_bi_cell(wir_r, tub, &p_tub, &q_tub); if ( u2_no == u2_dust(q_tub) ) { return _fail(wir_r, tub); - } + } else { u2_noun iq_tub = u2_h(q_tub); u2_noun tq_tub = u2_t(q_tub); @@ -107,24 +107,24 @@ u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); - + u2_bi_cell(wir_r, yit, &p_yit, &q_yit); yur = _last(wir_r, p_vex, p_yit); if ( u2_no == u2_dust(q_yit) ) { ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_vex)); - } + } else { u2_noun uq_yit = u2_t(q_yit); u2_noun puq_yit, quq_yit; u2_noun vux; - + u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); vux = u2_bl_good - (wir_r, + (wir_r, u2_nk_mong - (wir_r, raq, + (wir_r, raq, u2_bc(wir_r, u2_rx(wir_r, puq_vex), u2_rx(wir_r, puq_yit)))); if ( u2_nul == vux ) { @@ -166,24 +166,24 @@ u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); - + u2_bi_cell(wir_r, yit, &p_yit, &q_yit); yur = _last(wir_r, p_vex, p_yit); if ( u2_no == u2_dust(q_yit) ) { ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_vex)); - } + } else { u2_noun uq_yit = u2_t(q_yit); u2_noun puq_yit, quq_yit; - + u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); ret = u2_bq(wir_r, yur, u2_nul, u2_bl_good - (wir_r, + (wir_r, u2_nk_mong - (wir_r, raq, + (wir_r, raq, u2_bc(wir_r, u2_rx(wir_r, puq_vex), u2_rx(wir_r, puq_yit)))), u2_rx(wir_r, quq_yit)); @@ -195,7 +195,7 @@ #endif u2_noun // produce - j2_mc(Pt5, bend, fun)(u2_wire wir_r, + j2_mc(Pt5, bend, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, raq, vex, sab; @@ -210,7 +210,7 @@ return j2_mcx(Pt5, bend, fun)(wir_r, raq, vex, sab); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, bend, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, bend, fun), Tier5_b, u2_none, u2_none }, { } @@ -249,7 +249,7 @@ } u2_noun // produce - j2_mc(Pt5, cold, fun)(u2_wire wir_r, + j2_mc(Pt5, cold, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, cus, sef, tub; @@ -262,7 +262,7 @@ return j2_mcx(Pt5, cold, fun)(wir_r, cus, sef, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, cold, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, cold, fun), Tier5_b, u2_none, u2_none }, { } @@ -303,7 +303,7 @@ } u2_noun // produce - j2_mc(Pt5, cook, fun)(u2_wire wir_r, + j2_mc(Pt5, cook, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, poq, sef, tub; @@ -316,7 +316,7 @@ return j2_mcx(Pt5, cook, fun)(wir_r, poq, sef, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, cook, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, cook, fun), Tier5_b, u2_none, u2_none }, { } @@ -344,24 +344,24 @@ u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); - + u2_bi_cell(wir_r, yit, &p_yit, &q_yit); yur = _last(wir_r, p_vex, p_yit); if ( u2_no == u2_dust(q_yit) ) { ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_yit)); - } + } else { u2_noun uq_yit = u2_t(q_yit); u2_noun puq_yit, quq_yit; - + u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); ret = u2_bq(wir_r, yur, u2_nul, u2_bl_good - (wir_r, + (wir_r, u2_nk_mong - (wir_r, raq, + (wir_r, raq, u2_bc(wir_r, u2_rx(wir_r, puq_vex), u2_rx(wir_r, puq_yit)))), u2_rx(wir_r, quq_yit)); @@ -372,7 +372,7 @@ } u2_noun // produce - j2_mc(Pt5, comp, fun)(u2_wire wir_r, + j2_mc(Pt5, comp, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, raq, vex, sab; @@ -387,7 +387,7 @@ return j2_mcx(Pt5, comp, fun)(wir_r, raq, vex, sab); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, comp, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, comp, fun), Tier5_b, u2_none, u2_none }, { } @@ -409,7 +409,7 @@ u2_rx(wir_r, tub)); } u2_noun // produce - j2_mc(Pt5, easy, fun)(u2_wire wir_r, + j2_mc(Pt5, easy, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, huf, tub; @@ -422,7 +422,7 @@ return j2_mcx(Pt5, easy, fun)(wir_r, huf, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, easy, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, easy, fun), Tier5_b, u2_none, u2_none }, { } @@ -441,7 +441,7 @@ u2_bi_cell(wir_r, vex, &p_vex, &q_vex); if ( u2_no == u2_dust(q_vex) ) { return u2_rx(wir_r, vex); - } + } else { u2_noun uq_vex = u2_t(q_vex); u2_noun puq_vex, quq_vex; @@ -451,18 +451,18 @@ u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, bus, u2_rx(wir_r, quq_vex))); - + u2_bi_cell(wir_r, yit, &p_yit, &q_yit); yur = _last(wir_r, p_vex, p_yit); if ( u2_no == u2_dust(q_yit) ) { ret = u2_bc(wir_r, yur, u2_nul); - } + } else { u2_noun uq_yit = u2_t(q_yit); u2_noun puq_yit, quq_yit; u2_noun wam, p_wam, q_wam, goy; - + u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); wam = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_yit))); @@ -491,7 +491,7 @@ } u2_noun // produce - j2_mc(Pt5, glue, fun)(u2_wire wir_r, + j2_mc(Pt5, glue, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, bus, vex, sab; @@ -506,7 +506,7 @@ return j2_mcx(Pt5, glue, fun)(wir_r, bus, vex, sab); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, glue, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, glue, fun), Tier5_b, u2_none, u2_none }, { } @@ -538,8 +538,8 @@ u2_bi_cell(wir_r, tub, &p_tub, &q_tub); u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); u2_bi_cell(wir_r, quq_vex, &pquq_vex, 0); - gud = u2_bc(wir_r, - u2_bc(wir_r, u2_rx(wir_r, p_tub), + gud = u2_bc(wir_r, + u2_bc(wir_r, u2_rx(wir_r, p_tub), u2_rx(wir_r, pquq_vex)), u2_rx(wir_r, puq_vex)); @@ -555,7 +555,7 @@ } u2_noun // produce - j2_mc(Pt5, here, fun)(u2_wire wir_r, + j2_mc(Pt5, here, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, hez, sef, tub; @@ -568,7 +568,7 @@ return j2_mcx(Pt5, here, fun)(wir_r, hez, sef, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, here, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, here, fun), Tier5_b, u2_none, u2_none }, { } @@ -598,7 +598,7 @@ } } u2_noun // produce - j2_mc(Pt5, just, fun)(u2_wire wir_r, + j2_mc(Pt5, just, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, daf, tub; @@ -611,7 +611,7 @@ return j2_mcx(Pt5, just, fun)(wir_r, daf, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, just, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, just, fun), Tier5_b, u2_none, u2_none }, { } @@ -644,7 +644,7 @@ } } u2_noun // produce - j2_mc(Pt5, mask, fun)(u2_wire wir_r, + j2_mc(Pt5, mask, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, bud, tub; @@ -657,7 +657,7 @@ return j2_mcx(Pt5, mask, fun)(wir_r, bud, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, mask, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, mask, fun), Tier5_b, u2_none, u2_none }, { } @@ -666,16 +666,16 @@ /* pfix */ u2_noun // produce - j2_mbx(Pt5, pfix)(u2_wire wir_r, + j2_mbx(Pt5, pfix)(u2_wire wir_r, u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - + u2_bi_cell(wir_r, vex, &p_vex, &q_vex); if ( u2_no == u2_dust(q_vex) ) { return u2_rx(wir_r, vex); - } + } else { u2_noun uq_vex = u2_t(q_vex); u2_noun puq_vex, quq_vex; @@ -696,7 +696,7 @@ } } u2_noun // produce - j2_mb(Pt5, pfix)(u2_wire wir_r, + j2_mb(Pt5, pfix)(u2_wire wir_r, u2_noun cor) // retain { u2_noun vex, sab; @@ -707,7 +707,7 @@ return j2_mbx(Pt5, pfix)(wir_r, vex, sab); } } - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, pfix)[] = { { ".2", c3__hevy, j2_mb(Pt5, pfix), Tier5_b, u2_none, u2_none }, { } @@ -725,7 +725,7 @@ u2_bi_cell(wir_r, vex, &p_vex, &q_vex); if ( u2_no == u2_dust(q_vex) ) { return u2_rx(wir_r, vex); - } + } else { u2_noun uq_vex = u2_t(q_vex); u2_noun puq_vex, quq_vex; @@ -735,17 +735,17 @@ u2_bi_cell(wir_r, uq_vex, &puq_vex, &quq_vex); yit = u2_bl_good(wir_r, u2_nk_mong(wir_r, sab, u2_rx(wir_r, quq_vex))); - + u2_bi_cell(wir_r, yit, &p_yit, &q_yit); yur = _last(wir_r, p_vex, p_yit); if ( u2_no == u2_dust(q_yit) ) { ret = u2_bc(wir_r, yur, u2_rx(wir_r, q_yit)); - } + } else { u2_noun uq_yit = u2_t(q_yit); u2_noun puq_yit, quq_yit; - + u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); ret = u2_bq(wir_r, yur, u2_nul, @@ -758,7 +758,7 @@ } } u2_noun // produce - j2_mb(Pt5, plug)(u2_wire wir_r, + j2_mb(Pt5, plug)(u2_wire wir_r, u2_noun cor) // retain { u2_noun vex, sab; @@ -769,7 +769,7 @@ return j2_mbx(Pt5, plug)(wir_r, vex, sab); } } - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, plug)[] = { { ".2", c3__hevy, j2_mb(Pt5, plug), Tier5_b, u2_none, u2_none }, { } @@ -778,12 +778,12 @@ /* pose */ u2_noun // produce - j2_mbx(Pt5, pose)(u2_wire wir_r, + j2_mbx(Pt5, pose)(u2_wire wir_r, u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - + u2_bi_cell(wir_r, vex, &p_vex, &q_vex); if ( u2_yes == u2_dust(q_vex) ) { return u2_rx(wir_r, vex); @@ -803,7 +803,7 @@ } } u2_noun // produce - j2_mb(Pt5, pose)(u2_wire wir_r, + j2_mb(Pt5, pose)(u2_wire wir_r, u2_noun cor) // retain { u2_noun vex, sab; @@ -814,7 +814,7 @@ return j2_mbx(Pt5, pose)(wir_r, vex, sab); } } - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, pose)[] = { { ".2", c3__hevy, j2_mb(Pt5, pose), Tier5_b, u2_none, u2_none }, { } @@ -823,16 +823,16 @@ /* sfix */ u2_noun // produce - j2_mbx(Pt5, sfix)(u2_wire wir_r, + j2_mbx(Pt5, sfix)(u2_wire wir_r, u2_noun vex, // retain u2_noun sab) // retain { u2_noun p_vex, q_vex; - + u2_bi_cell(wir_r, vex, &p_vex, &q_vex); if ( u2_no == u2_dust(q_vex) ) { return u2_rx(wir_r, vex); - } + } else { u2_noun uq_vex = u2_t(q_vex); u2_noun puq_vex, quq_vex; @@ -847,14 +847,14 @@ if ( u2_no == u2_dust(q_yit) ) { ret = u2_bc(wir_r, yur, u2_nul); - } + } else { u2_noun uq_yit = u2_t(q_yit); u2_noun puq_yit, quq_yit; - + u2_bi_cell(wir_r, uq_yit, &puq_yit, &quq_yit); - ret = u2_bq(wir_r, yur, + ret = u2_bq(wir_r, yur, u2_nul, u2_rx(wir_r, puq_vex), u2_rx(wir_r, quq_yit)); @@ -864,7 +864,7 @@ } } u2_noun // produce - j2_mb(Pt5, sfix)(u2_wire wir_r, + j2_mb(Pt5, sfix)(u2_wire wir_r, u2_noun cor) // retain { u2_noun vex, sab; @@ -875,7 +875,7 @@ return j2_mbx(Pt5, sfix)(wir_r, vex, sab); } } - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, sfix)[] = { { ".2", c3__hevy, j2_mb(Pt5, sfix), Tier5_b, u2_none, u2_none }, { } @@ -900,7 +900,7 @@ u2_noun iq_tub = u2_h(q_tub); u2_bi_cell(wir_r, zep, &p_zep, &q_zep); - if ( u2_fly_is_cat(p_zep) && + if ( u2_fly_is_cat(p_zep) && u2_fly_is_cat(q_zep) && u2_fly_is_cat(iq_tub) ) { @@ -915,7 +915,7 @@ } } u2_noun // produce - j2_mc(Pt5, shim, fun)(u2_wire wir_r, + j2_mc(Pt5, shim, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, zep, tub; @@ -928,7 +928,7 @@ return j2_mcx(Pt5, shim, fun)(wir_r, zep, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, shim, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, shim, fun), Tier5_b, u2_none, u2_none }, { } @@ -969,7 +969,7 @@ } u2_noun // produce - j2_mc(Pt5, stag, fun)(u2_wire wir_r, + j2_mc(Pt5, stag, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, gob, sef, tub; @@ -982,7 +982,7 @@ return j2_mcx(Pt5, stag, fun)(wir_r, gob, sef, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, stag, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, stag, fun), Tier5_b, u2_none, u2_none }, { } @@ -1035,7 +1035,7 @@ } else while ( 1 ) { if ( u2_no == u2_dust(hel) ) { return _fail(wir_r, tub); - } + } else { u2_noun n_hel, l_hel, r_hel; u2_noun pn_hel, qn_hel; @@ -1071,7 +1071,7 @@ } } u2_noun // produce - j2_mc(Pt5, stew, fun)(u2_wire wir_r, + j2_mc(Pt5, stew, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun con, hel, tub; @@ -1084,7 +1084,7 @@ return j2_mcx(Pt5, stew, fun)(wir_r, hel, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, stew, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, stew, fun), Tier5_b, u2_none, u2_none }, { } @@ -1128,9 +1128,9 @@ ret = u2_bq (wir_r, _last(wir_r, p_vex, p_wag), u2_nul, - u2_bl_good(wir_r, + u2_bl_good(wir_r, u2_nk_mong - (wir_r, raq, + (wir_r, raq, u2_bc(wir_r, u2_rx(wir_r, puq_vex), u2_rx(wir_r, puq_wag)))), u2_rx(wir_r, quq_wag)); @@ -1141,15 +1141,15 @@ } u2_noun // produce - j2_mc(Pt5, stir, fun)(u2_wire wir_r, + j2_mc(Pt5, stir, fun)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, rud, raq, fel, tub; if ( (u2_no == u2_mean(cor, u2_cv_sam, &tub, u2_cv_con, &van, 0)) || - (u2_no == u2_mean(van, u2_cv_sam_2, &rud, - u2_cv_sam_6, &raq, - u2_cv_sam_7, &fel, + (u2_no == u2_mean(van, u2_cv_sam_2, &rud, + u2_cv_sam_6, &raq, + u2_cv_sam_7, &fel, 0)) ) { return u2_bl_bail(wir_r, c3__fail); @@ -1157,7 +1157,7 @@ return j2_mcx(Pt5, stir, fun)(wir_r, rud, raq, fel, tub); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt5, stir, fun)[] = { { ".2", c3__hevy, j2_mc(Pt5, stir, fun), Tier5_b, u2_none, u2_none }, { } @@ -1167,7 +1167,7 @@ */ /* bend */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, bend)[] = { { j2_sc(Pt5, bend, fun), j2_mcj(Pt5, bend, fun), 0, 0, u2_none }, { } @@ -1178,7 +1178,7 @@ /* cold */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, cold)[] = { { j2_sc(Pt5, cold, fun), j2_mcj(Pt5, cold, fun), 0, 0, u2_none }, { } @@ -1189,7 +1189,7 @@ /* comp */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, comp)[] = { { j2_sc(Pt5, comp, fun), j2_mcj(Pt5, comp, fun), 0, 0, u2_none }, { } @@ -1200,7 +1200,7 @@ /* cook */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, cook)[] = { { j2_sc(Pt5, cook, fun), j2_mcj(Pt5, cook, fun), 0, 0, u2_none }, { } @@ -1211,7 +1211,7 @@ /* easy */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, easy)[] = { { j2_sc(Pt5, easy, fun), j2_mcj(Pt5, easy, fun), 0, 0, u2_none }, { } @@ -1222,7 +1222,7 @@ /* glue */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, glue)[] = { { j2_sc(Pt5, glue, fun), j2_mcj(Pt5, glue, fun), 0, 0, u2_none }, { } @@ -1233,7 +1233,7 @@ /* here */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, here)[] = { { j2_sc(Pt5, here, fun), j2_mcj(Pt5, here, fun), 0, 0, u2_none }, { } @@ -1244,7 +1244,7 @@ /* just */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, just)[] = { { j2_sc(Pt5, just, fun), j2_mcj(Pt5, just, fun), 0, 0, u2_none }, { } @@ -1255,7 +1255,7 @@ /* mask */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, mask)[] = { { j2_sc(Pt5, mask, fun), j2_mcj(Pt5, mask, fun), 0, 0, u2_none }, { } @@ -1266,7 +1266,7 @@ /* shim */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, shim)[] = { { j2_sc(Pt5, shim, fun), j2_mcj(Pt5, shim, fun), 0, 0, u2_none }, { } @@ -1277,7 +1277,7 @@ /* stag */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, stag)[] = { { j2_sc(Pt5, stag, fun), j2_mcj(Pt5, stag, fun), 0, 0, u2_none }, { } @@ -1288,7 +1288,7 @@ /* stew */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, stew)[] = { { j2_sc(Pt5, stew, fun), j2_mcj(Pt5, stew, fun), 0, 0, u2_none }, { } @@ -1299,7 +1299,7 @@ /* stir */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt5, stir)[] = { { j2_sc(Pt5, stir, fun), j2_mcj(Pt5, stir, fun), 0, 0, u2_none }, { } diff --git a/gen164/5/repg.c b/gen164/5/repg.c index b31333297..585117c79 100644 --- a/gen164/5/repg.c +++ b/gen164/5/repg.c @@ -8,7 +8,7 @@ #include u2_noun // produce - j2_mbc(Pt5, repg)(u2_wire wir_r, + j2_mbc(Pt5, repg)(u2_wire wir_r, u2_noun lub, u2_noun rad, u2_noun rep) // retain @@ -17,13 +17,13 @@ c3_y* rad_y = u2_cr_tape(rad); c3_y* rep_y = u2_cr_tape(rep); - + char* rec = (char*)lub_y; char* end; while(*rec != 0) { if(*rec == '\\') { - rec++; + rec++; switch (*rec) { case 'P': case 'p': @@ -49,13 +49,13 @@ rec++; } } - else + else rec++; } - + cre2_regexp_t * rex; cre2_options_t * opt; - + opt = cre2_opt_new(); if (opt) { cre2_opt_set_log_errors(opt, 0); @@ -126,7 +126,7 @@ } u2_weak // produce - j2_mb(Pt5, repg)(u2_wire wir_r, + j2_mb(Pt5, repg)(u2_wire wir_r, u2_noun cor) // retain { u2_noun lub; @@ -146,8 +146,8 @@ /* structures */ - u2_ho_jet - j2_mbj(Pt5, repg)[] = { + u2_ho_jet + j2_mbj(Pt5, repg)[] = { { ".2", c3__lite, j2_mb(Pt5, repg), Tier5, u2_none, u2_none }, { } }; diff --git a/gen164/5/rexp.c b/gen164/5/rexp.c index 1033ece18..84deab73e 100644 --- a/gen164/5/rexp.c +++ b/gen164/5/rexp.c @@ -8,7 +8,7 @@ #include u2_noun // produce - j2_mbc(Pt5, rexp)(u2_wire wir_r, + j2_mbc(Pt5, rexp)(u2_wire wir_r, u2_noun lub, u2_noun rad) // retain { @@ -32,7 +32,7 @@ return u2_nul; } else if(*rec == '\\') { - rec++; + rec++; switch (*rec) { case 'P': case 'p': @@ -57,13 +57,13 @@ rec++; } } - else + else rec++; } - + cre2_regexp_t * rex; cre2_options_t * opt; - + opt = cre2_opt_new(); if (opt) { cre2_opt_set_log_errors(opt, 0); @@ -79,16 +79,16 @@ cre2_string_t matches[captures+1]; int match = cre2_match(rex, (const char*)rad_y, text_len, 0, text_len, CRE2_UNANCHORED, matches, captures+1); - + if (!match) { // No matches cre2_opt_delete(opt); cre2_delete(rex); - free(lub_y); + free(lub_y); free(rad_y); return u2_cn_cell(u2_nul, u2_nul); } - + u2_noun map = u2_nul; int i; @@ -102,16 +102,16 @@ cre2_opt_delete(opt); cre2_delete(rex); - free(lub_y); + free(lub_y); free(rad_y); return u2_cn_cell(u2_nul, u2_cn_cell(u2_nul, map)); - + } else { // Compiling the regular expression failed cre2_opt_delete(opt); cre2_delete(rex); - free(lub_y); + free(lub_y); free(rad_y); return u2_nul; } @@ -126,7 +126,7 @@ } u2_weak // produce - j2_mb(Pt5, rexp)(u2_wire wir_r, + j2_mb(Pt5, rexp)(u2_wire wir_r, u2_noun cor) // retain { u2_noun lub; @@ -144,8 +144,8 @@ /* structures */ - u2_ho_jet - j2_mbj(Pt5, rexp)[] = { + u2_ho_jet + j2_mbj(Pt5, rexp)[] = { { ".2", c3__lite, j2_mb(Pt5, rexp), Tier5, u2_none, u2_none }, { } }; diff --git a/gen164/5/rub.c b/gen164/5/rub.c index 44a2b6f28..d23e5d277 100644 --- a/gen164/5/rub.c +++ b/gen164/5/rub.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // produce - j2_mby(Pt5, rub)(u2_wire wir_r, + j2_mby(Pt5, rub)(u2_wire wir_r, u2_atom a, // retain u2_atom b) // retain { @@ -35,7 +35,7 @@ u2_rz(wir_r, x); } - + // Compute e, p, q. { x = j2_mbc(Pt1, dec)(wir_r, c); @@ -58,7 +58,7 @@ } } u2_noun // transfer - j2_mb(Pt5, rub)(u2_wire wir_r, + j2_mb(Pt5, rub)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a, b; @@ -75,7 +75,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, rub)[] = { { ".2", c3__hevy, j2_mb(Pt5, rub), Tier3, u2_none, u2_none }, { } diff --git a/gen164/5/tape.c b/gen164/5/tape.c index ca3ff77d6..53100426f 100644 --- a/gen164/5/tape.c +++ b/gen164/5/tape.c @@ -18,7 +18,7 @@ _norm(wir_r, u2t(a))); } } - + static u2_bean _good(u2_wire wir_r, u2_noun a) // retain @@ -35,7 +35,7 @@ } u2_noun // transfer - j2_mby(PtM, tape)(u2_wire wir_r, + j2_mby(PtM, tape)(u2_wire wir_r, u2_noun a) // retain { if ( u2_yes == _good(wir_r, a) ) { @@ -43,10 +43,10 @@ return u2k(a); } else { return _norm(wir_r, a); - } + } } u2_noun // transfer - j2_mb(PtM, tape)(u2_wire wir_r, + j2_mb(PtM, tape)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -60,7 +60,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(PtM, tape)[] = { { ".2", c3__hevy, j2_mb(PtM, tape), Tier3, u2_none, u2_none }, { } diff --git a/gen164/5/trip.c b/gen164/5/trip.c index 042276b84..c3e9c4615 100644 --- a/gen164/5/trip.c +++ b/gen164/5/trip.c @@ -8,13 +8,13 @@ /* functions */ u2_noun // transfer - j2_mby(Pt5, trip)(u2_wire wir_r, + j2_mby(Pt5, trip)(u2_wire wir_r, u2_atom a) // retain { return j2_mbc(Pt3, rip)(wir_r, _3, a); } u2_noun // transfer - j2_mb(Pt5, trip)(u2_wire wir_r, + j2_mb(Pt5, trip)(u2_wire wir_r, u2_noun cor) // retain { u2_noun a; @@ -28,7 +28,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt5, trip)[] = { { ".2", c3__hevy, j2_mb(Pt5, trip), Tier3, u2_none, u2_none }, { } diff --git a/gen164/6/al.c b/gen164/6/al.c index 1ff2bfad9..4f6e5c755 100644 --- a/gen164/6/al.c +++ b/gen164/6/al.c @@ -9,7 +9,7 @@ */ static u2_noun _al_core(u2_wire wir_r, - u2_noun van, + u2_noun van, u2_noun gen) { u2_noun ter = u2_frag(u2_cv_con_3, van); @@ -17,7 +17,7 @@ _al_core(u2_wire wir_r, if ( u2_none == hoc ) { return u2_cm_bail(c3__fail); - } + } else { u2_noun gat = u2_nk_soft(wir_r, u2_rx(wir_r, ter), hoc); u2_noun cor = u2_rl_molt(wir_r, gat, @@ -48,7 +48,7 @@ j2_mcy(Pt6, al, bunt)(u2_wire wir_r, u2_rz(wir_r, hoc); return pro; - } + } } /* ~(whip al gen) @@ -70,5 +70,5 @@ j2_mcy(Pt6, al, whip)(u2_wire wir_r, u2_rz(wir_r, hoc); return pro; - } + } } diff --git a/gen164/6/ap.c b/gen164/6/ap.c index 74fd924e2..41b00dc02 100644 --- a/gen164/6/ap.c +++ b/gen164/6/ap.c @@ -15,10 +15,10 @@ u2_noun j2_mcy(Pt6, ap, mold)(u2_wire, u2_noun, u2_noun); - - u2_noun j2_mc(Pt6, ap, rake)(u2_wire, u2_noun); - u2_noun j2_mc(Pt6, ap, open)(u2_wire, u2_noun); - u2_noun j2_mc(Pt6, ap, hack)(u2_wire, u2_noun); + + u2_noun j2_mc(Pt6, ap, rake)(u2_wire, u2_noun); + u2_noun j2_mc(Pt6, ap, open)(u2_wire, u2_noun); + u2_noun j2_mc(Pt6, ap, hack)(u2_wire, u2_noun); static u2_noun _ap_open_l(u2_wire, u2_noun, u2_noun); @@ -29,7 +29,7 @@ # define _ap_jet_rake 1 # define _ap_jet_hack 2 - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, ap)[] = { { "open", c3__hevy, j2_mc(Pt6, ap, open), Tier6_c, u2_none, u2_none }, { "rake", c3__hevy, j2_mc(Pt6, ap, rake), Tier6_c, u2_none, u2_none }, @@ -37,8 +37,8 @@ { } }; - static u2_weak - _open_in(u2_wire wir_r, + static u2_weak + _open_in(u2_wire wir_r, u2_noun gen); /** open cases @@ -65,13 +65,13 @@ ***/ _open_do_pq(tsgl) // =< { - return u2_bt(wir_r, c3__tsgr, u2_rx(wir_r, q_gen), + return u2_bt(wir_r, c3__tsgr, u2_rx(wir_r, q_gen), u2_rx(wir_r, p_gen)); } _open_do_pq(tshp) // =- { - return u2_bt(wir_r, c3__tsls, u2_rx(wir_r, q_gen), + return u2_bt(wir_r, c3__tsls, u2_rx(wir_r, q_gen), u2_rx(wir_r, p_gen)); } @@ -99,7 +99,7 @@ (wir_r, c3__brcn, u2_bt(wir_r, u2_bt(wir_r, u2_blip, c3__ash, u2_rx(wir_r, p_gen)), - u2_nul, + u2_nul, u2_nul)); } /*** @@ -134,17 +134,17 @@ } _open_do_pqr(wtdt) // ?. { - return u2_bq(wir_r, c3__wtcl, - u2_rx(wir_r, p_gen), - u2_rx(wir_r, r_gen), + return u2_bq(wir_r, c3__wtcl, + u2_rx(wir_r, p_gen), + u2_rx(wir_r, r_gen), u2_rx(wir_r, q_gen)); } _open_do_pq(wtgr) // ?> { return u2_bq - (wir_r, c3__wtcl, - u2_rx(wir_r, p_gen), - u2_rx(wir_r, q_gen), + (wir_r, c3__wtcl, + u2_rx(wir_r, p_gen), + u2_rx(wir_r, q_gen), u2_bc(wir_r, c3__zpzp, u2_nul)); } #if 0 @@ -160,10 +160,10 @@ u2_noun qiq_gen = u2_t(iq_gen); return u2_bq - (wir_r, + (wir_r, c3__wtcl, - u2_bt(wir_r, c3__wtts, - u2_rx(wir_r, piq_gen), + u2_bt(wir_r, c3__wtts, + u2_rx(wir_r, piq_gen), u2_rx(wir_r, p_gen)), u2_rx(wir_r, qiq_gen), _open_in_wthp(wir_r, p_gen, tq_gen)); @@ -189,7 +189,7 @@ #if 0 _open_do_pqr(wtls) // ?+ { - u2_noun tul = u2_bc(wir_r, + u2_noun tul = u2_bc(wir_r, u2_bc(wir_r, u2_bc(wir_r, c3__bcts, c3__noun), u2_rx(wir_r, q_gen)), u2_nul); @@ -214,9 +214,9 @@ _open_do_pqrs(clkt) // :^ { return u2_bq - (wir_r, u2_rx(wir_r, p_gen), + (wir_r, u2_rx(wir_r, p_gen), u2_rx(wir_r, q_gen), - u2_rx(wir_r, r_gen), + u2_rx(wir_r, r_gen), u2_rx(wir_r, s_gen)); } _open_do_pqr(clls) // :+ @@ -234,7 +234,7 @@ u2_noun ip_gen = u2_h(p_gen); u2_noun tp_gen = u2_t(p_gen); - return u2_bc(wir_r, u2_rx(wir_r, ip_gen), + return u2_bc(wir_r, u2_rx(wir_r, ip_gen), _open_in_clsg(wir_r, tp_gen)); } } @@ -252,7 +252,7 @@ return u2_rx(wir_r, ip_gen); } else { return u2_bc - (wir_r, u2_rx(wir_r, ip_gen), + (wir_r, u2_rx(wir_r, ip_gen), _open_in_cltr(wir_r, tp_gen)); } } @@ -272,41 +272,41 @@ _open_do_pq(cndt) // %. { return u2_bt - (wir_r, c3__cnhp, - u2_rx(wir_r, q_gen), + (wir_r, c3__cnhp, + u2_rx(wir_r, q_gen), u2_bc(wir_r, u2_rx(wir_r, p_gen), u2_nul)); } _open_do_pqrs(cnkt) // %^ { return u2_bq - (wir_r, c3__cnhp, + (wir_r, c3__cnhp, u2_rx(wir_r, p_gen), u2_rx(wir_r, q_gen), - u2_bt(wir_r, u2_rx(wir_r, r_gen), - u2_rx(wir_r, s_gen), + u2_bt(wir_r, u2_rx(wir_r, r_gen), + u2_rx(wir_r, s_gen), u2_nul)); } _open_do_pq(cnhp) // %- { if ( (u2_nul == q_gen) ) { return u2_bt - (wir_r, c3__tsgr, + (wir_r, c3__tsgr, u2_rx(wir_r, p_gen), u2_bc(wir_r, c3__cnzy, u2_blip)); } else { - return u2_bq(wir_r, c3__cncl, - u2_rx(wir_r, p_gen), - c3__cltr, + return u2_bq(wir_r, c3__cncl, + u2_rx(wir_r, p_gen), + c3__cltr, u2_rx(wir_r, q_gen)); } } _open_do_pqr(cnls) // %+ { return u2_bc - (wir_r, c3__cnhp, - u2_bq(wir_r, u2_rx(wir_r, p_gen), - u2_rx(wir_r, q_gen), - u2_rx(wir_r, r_gen), + (wir_r, c3__cnhp, + u2_bq(wir_r, u2_rx(wir_r, p_gen), + u2_rx(wir_r, q_gen), + u2_rx(wir_r, r_gen), u2_nul)); } #if 0 @@ -370,7 +370,7 @@ _open_do_pq(sggl) // ~> { return u2_bt - (wir_r, c3__tsgl, + (wir_r, c3__tsgl, u2_bq(wir_r, c3__sggr, u2_rx(wir_r, p_gen), u2_nul, _1), u2_rx(wir_r, q_gen)); } @@ -384,8 +384,8 @@ _open_do_pq(sgdt) // ~. { return u2_bc - (wir_r, c3__sgcn, - u2_bq(wir_r, + (wir_r, c3__sgcn, + u2_bq(wir_r, u2_rx(wir_r, p_gen), u2_bc(wir_r, u2_nul, _4), u2_nul, @@ -393,14 +393,14 @@ } _open_do_pq(sgbc) // ~$ { - return u2_bt(wir_r, c3__sggr, + return u2_bt(wir_r, c3__sggr, u2_bq(wir_r, c3__live, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)), u2_rx(wir_r, q_gen)); } _open_do_pq(sghx) // ~# { - return u2_bt(wir_r, c3__sggr, + return u2_bt(wir_r, c3__sggr, u2_bq(wir_r, c3__ping, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)), u2_rx(wir_r, q_gen)); @@ -418,7 +418,7 @@ u2_noun pir_gen, qir_gen; u2_bi_cell(wir_r, ir_gen, &pir_gen, &qir_gen); - + return u2_bc (wir_r, u2_bc (wir_r, @@ -467,7 +467,7 @@ return u2_bc (wir_r, c3__cnhp, - u2_bq(wir_r, + u2_bq(wir_r, u2_bc(wir_r, u2_nul, _2), u2_bt(wir_r, c3__tsgr, u2_bc(wir_r, u2_nul, _3), @@ -480,7 +480,7 @@ { if ( u2_no == u2_dust(q_gen) ) { return u2_bc(wir_r, c3__zpzp, u2_nul); - } + } else if ( u2_nul == u2_t(q_gen) ) { return u2_rx(wir_r, u2_h(q_gen)); } @@ -503,8 +503,8 @@ */ /** open **/ - static u2_weak - _open_in(u2_wire wir_r, + static u2_weak + _open_in(u2_wire wir_r, u2_noun gen) { u2_noun p_gen, q_gen, r_gen, s_gen; @@ -515,7 +515,7 @@ return u2_cm_bail(c3__exit); return u2_bt - (wir_r, c3__cnts, + (wir_r, c3__cnts, u2_bc(wir_r, u2_rx(wir_r, gen), u2_nul), u2_nul); } @@ -524,11 +524,11 @@ case u2_nul: { return u2_bt - (wir_r, c3__cnts, + (wir_r, c3__cnts, u2_bc(wir_r, u2_rx(wir_r, gen), u2_nul), u2_nul); } - + # define _open_p(stem) \ case c3__##stem: \ return _open_in_##stem(wir_r, u2_t(gen)); \ @@ -646,7 +646,7 @@ } } u2_noun // transfer - j2_mc(Pt6, ap, rake)(u2_wire wir_r, + j2_mc(Pt6, ap, rake)(u2_wire wir_r, u2_noun cor) // retain { u2_noun gen; @@ -661,7 +661,7 @@ /** hack **/ u2_noun // transfer - j2_mcy(Pt6, ap, hack)(u2_wire wir_r, + j2_mcy(Pt6, ap, hack)(u2_wire wir_r, u2_noun ter, // retain u2_noun gen) // retain { @@ -669,7 +669,7 @@ u2_noun ret; if ( u2_yes == u2_dust(u2_h(gen)) ) { - return u2_bt(wir_r, u2_yes, + return u2_bt(wir_r, u2_yes, u2_rx(wir_r, u2_h(gen)), u2_rx(wir_r, u2_t(gen))); } @@ -685,18 +685,18 @@ if ( u2_yes == u2_h(pyr) ) { ret = u2_bt (wir_r, u2_yes, - u2_bt(wir_r, c3__tsgr, - u2_rx(wir_r, p_gen), + u2_bt(wir_r, c3__tsgr, + u2_rx(wir_r, p_gen), u2_rx(wir_r, u2_h(u2_t(pyr)))), - u2_bt(wir_r, c3__tsgr, - u2_rx(wir_r, p_gen), + u2_bt(wir_r, c3__tsgr, + u2_rx(wir_r, p_gen), u2_rx(wir_r, u2_t(u2_t(pyr))))); } else { ret = u2_bc (wir_r, u2_no, - u2_bt(wir_r, c3__tsgr, - u2_rx(wir_r, p_gen), + u2_bt(wir_r, c3__tsgr, + u2_rx(wir_r, p_gen), u2_rx(wir_r, u2_t(pyr)))); } u2_rz(wir_r, pyr); @@ -710,23 +710,23 @@ if ( u2_yes == u2_h(pyr) ) { ret = u2_bt (wir_r, u2_yes, - u2_bt(wir_r, c3__zpcb, - u2_rx(wir_r, p_gen), + u2_bt(wir_r, c3__zpcb, + u2_rx(wir_r, p_gen), u2_rx(wir_r, u2_h(u2_t(pyr)))), - u2_bt(wir_r, c3__zpcb, - u2_rx(wir_r, p_gen), + u2_bt(wir_r, c3__zpcb, + u2_rx(wir_r, p_gen), u2_rx(wir_r, u2_t(u2_t(pyr))))); } else { ret = u2_bc (wir_r, u2_no, - u2_bt(wir_r, c3__zpcb, - u2_rx(wir_r, p_gen), + u2_bt(wir_r, c3__zpcb, + u2_rx(wir_r, p_gen), u2_rx(wir_r, u2_t(pyr)))); } u2_rz(wir_r, pyr); return ret; - } + } default: break; } @@ -740,7 +740,7 @@ return u2_bc(wir_r, u2_no, voq); } else { - ret = j2_mcy(Pt6, ap, hack)(wir_r, ter, voq); + ret = j2_mcy(Pt6, ap, hack)(wir_r, ter, voq); u2_rl_lose(wir_r, voq); return ret; @@ -749,7 +749,7 @@ } u2_noun // transfer - j2_mc(Pt6, ap, hack)(u2_wire wir_r, + j2_mc(Pt6, ap, hack)(u2_wire wir_r, u2_noun cor) // retain { u2_noun gen; @@ -771,7 +771,7 @@ u2_noun gen) // retain { u2_weak hoc = u2_ds_look(wir_r, ter, "ap"); - + if ( u2_none == hoc ) { return u2_cm_bail(c3__fail); } else { @@ -788,12 +788,12 @@ /* open */ - static u2_noun + static u2_noun _ap_open_n(u2_wire wir_r, u2_noun ter, u2_noun gen) { - u2_noun cor = j2_mbi(Pt6, ap)(wir_r, ter, gen); + u2_noun cor = j2_mbi(Pt6, ap)(wir_r, ter, gen); u2_weak hoc = u2_ds_look(wir_r, cor, "open"); if ( u2_none == hoc ) { @@ -804,7 +804,7 @@ u2_rz(wir_r, hoc); return pro; } - } + } static u2_noun // transfer _ap_open_l(u2_wire wir_r, u2_noun ter, // retain @@ -816,7 +816,7 @@ return pro; } else { u2_ho_jet *jet_j = &j2_mbj(Pt6, ap)[_ap_jet_open]; - + // c3_assert(jet_j->sat_s & u2_jet_live); jet_j->sat_s &= ~u2_jet_live; { @@ -829,7 +829,7 @@ return pro; } } - + u2_noun // transfer j2_mcy(Pt6, ap, open)(u2_wire wir_r, u2_noun ter, // retain @@ -860,7 +860,7 @@ } u2_noun // transfer - j2_mc(Pt6, ap, open)(u2_wire wir_r, + j2_mc(Pt6, ap, open)(u2_wire wir_r, u2_noun cor) // retain { u2_noun gen; @@ -876,7 +876,7 @@ /* structures */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt6, ap)[] = { { } }; diff --git a/gen164/6/bull.c b/gen164/6/bull.c index 3e61e2873..f4bc7996f 100644 --- a/gen164/6/bull.c +++ b/gen164/6/bull.c @@ -8,12 +8,12 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, bull)(u2_wire wir_r, + j2_mby(Pt6, bull)(u2_wire wir_r, u2_noun bid, // retain u2_noun der) // retain { if ( (c3__void == der) || - (c3__void == u2t(u2t(u2t(bid)))) ) + (c3__void == u2t(u2t(u2t(bid)))) ) { return c3__void; } @@ -21,7 +21,7 @@ (wir_r, c3__bull, u2_rx(wir_r, bid), u2_rx(wir_r, der)); } u2_noun // transfer - j2_mb(Pt6, bull)(u2_wire wir_r, + j2_mb(Pt6, bull)(u2_wire wir_r, u2_noun cor) // retain { u2_noun bid, der; @@ -35,7 +35,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, bull)[] = { { ".2", c3__hevy, j2_mb(Pt6, bull), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/cell.c b/gen164/6/cell.c index 59a39f4f6..81ba36057 100644 --- a/gen164/6/cell.c +++ b/gen164/6/cell.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, cell)(u2_wire wir_r, + j2_mby(Pt6, cell)(u2_wire wir_r, u2_noun hed, // retain u2_noun tal) // retain { @@ -19,7 +19,7 @@ } } u2_noun // transfer - j2_mb(Pt6, cell)(u2_wire wir_r, + j2_mb(Pt6, cell)(u2_wire wir_r, u2_noun cor) // retain { u2_noun hed, tal; @@ -33,7 +33,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, cell)[] = { { ".2", c3__hevy, j2_mb(Pt6, cell), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/comb.c b/gen164/6/comb.c index e763e5e2d..5708d6ecb 100644 --- a/gen164/6/comb.c +++ b/gen164/6/comb.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mbc(Pt6, comb)(u2_wire wir_r, + j2_mbc(Pt6, comb)(u2_wire wir_r, u2_noun mal, // retain u2_noun buz) // retain { @@ -20,8 +20,8 @@ if ( (u2_yes == u2_as_p(mal, u2_nock_0, &p_mal)) && (_0 != p_mal) ) { if ( (u2_yes == u2_as_p(buz, u2_nock_0, &p_buz)) && (_0 != p_buz) ) { - return u2_rc(wir_r, - u2_nock_0, + return u2_rc(wir_r, + u2_nock_0, j2_mbc(Pt3, peg)(wir_r, p_mal, p_buz)); } else if ( u2_yes == u2_as_pq(buz, u2_nock_2, &p_buz, &q_buz) && @@ -29,23 +29,23 @@ u2_yes == u2_as_p(q_buz, u2_nock_0, &pq_buz) ) { return u2_rt - (wir_r, u2_nock_2, - u2_rc(wir_r, u2_nock_0, + (wir_r, u2_nock_2, + u2_rc(wir_r, u2_nock_0, j2_mbc(Pt3, peg)(wir_r, p_mal, pp_buz)), - u2_rc(wir_r, u2_nock_0, + u2_rc(wir_r, u2_nock_0, j2_mbc(Pt3, peg)(wir_r, p_mal, pq_buz))); } - else return u2_rt(wir_r, u2_nock_7, u2_rx(wir_r, mal), + else return u2_rt(wir_r, u2_nock_7, u2_rx(wir_r, mal), u2_rx(wir_r, buz)); } #if 1 else if ( (u2_yes == u2_as_bush(mal, &p_mal, &q_mal)) && - (u2_yes == u2_dust(p_mal)) && - (u2_yes == u2_dust(q_mal)) && + (u2_yes == u2_dust(p_mal)) && + (u2_yes == u2_dust(q_mal)) && (_0 == u2_h(q_mal)) && (_1 == u2_t(q_mal)) ) { - return u2_rt(wir_r, u2_nock_8, u2_rx(wir_r, p_mal), + return u2_rt(wir_r, u2_nock_8, u2_rx(wir_r, p_mal), u2_rx(wir_r, buz)); } #endif @@ -54,12 +54,12 @@ { return u2_rx(wir_r, mal); } - else return u2_rt(wir_r, u2_nock_7, u2_rx(wir_r, mal), + else return u2_rt(wir_r, u2_nock_7, u2_rx(wir_r, mal), u2_rx(wir_r, buz)); } } u2_noun // transfer - j2_mb(Pt6, comb)(u2_wire wir_r, + j2_mb(Pt6, comb)(u2_wire wir_r, u2_noun cor) // retain { u2_noun mal, buz; @@ -73,7 +73,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, comb)[] = { { ".2", c3__lite, j2_mb(Pt6, comb), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/cons.c b/gen164/6/cons.c index d6b56691d..677efce40 100644 --- a/gen164/6/cons.c +++ b/gen164/6/cons.c @@ -8,19 +8,19 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, cons)(u2_wire wir_r, + j2_mby(Pt6, cons)(u2_wire wir_r, u2_noun vur, // retain u2_noun sed) // retain { u2_noun p_vur, p_sed; - if ( u2_yes == u2_as_p(vur, u2_nock_1, &p_vur) && + if ( u2_yes == u2_as_p(vur, u2_nock_1, &p_vur) && u2_yes == u2_as_p(sed, u2_nock_1, &p_sed) ) { - return u2_bt(wir_r, u2_nock_1, + return u2_bt(wir_r, u2_nock_1, u2_bx(wir_r, p_vur), u2_bx(wir_r, p_sed)); } - else if ( u2_yes == u2_as_p(vur, u2_nock_0, &p_vur) && + else if ( u2_yes == u2_as_p(vur, u2_nock_0, &p_vur) && u2_yes == u2_as_p(sed, u2_nock_0, &p_sed) && !(u2_yes == u2_sing(_1, p_vur)) && !(u2_yes == u2_sing(p_vur, p_sed)) && @@ -42,7 +42,7 @@ return u2_bc(wir_r, u2_bx(wir_r, vur), u2_bx(wir_r, sed)); } u2_noun // transfer - j2_mb(Pt6, cons)(u2_wire wir_r, + j2_mb(Pt6, cons)(u2_wire wir_r, u2_noun cor) // retain { u2_noun vur, sed; @@ -56,7 +56,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, cons)[] = { { ".2", c3__hevy, j2_mb(Pt6, cons), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/core.c b/gen164/6/core.c index a6a4825e2..8214099f7 100644 --- a/gen164/6/core.c +++ b/gen164/6/core.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, core)(u2_wire wir_r, + j2_mby(Pt6, core)(u2_wire wir_r, u2_noun pac, // retain u2_noun con) // retain { @@ -19,7 +19,7 @@ } } u2_noun // transfer - j2_mb(Pt6, core)(u2_wire wir_r, + j2_mb(Pt6, core)(u2_wire wir_r, u2_noun cor) // retain { u2_noun pac, con; @@ -33,7 +33,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, core)[] = { { ".2", c3__hevy, j2_mb(Pt6, core), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/cube.c b/gen164/6/cube.c index 9e80e4d18..0ab221fa0 100644 --- a/gen164/6/cube.c +++ b/gen164/6/cube.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, cube)(u2_wire wir_r, + j2_mby(Pt6, cube)(u2_wire wir_r, u2_noun dil, // retain u2_noun goq) // retain { @@ -19,7 +19,7 @@ (wir_r, c3__cube, u2_rx(wir_r, dil), u2_rx(wir_r, goq)); } u2_noun // transfer - j2_mb(Pt6, cube)(u2_wire wir_r, + j2_mb(Pt6, cube)(u2_wire wir_r, u2_noun cor) // retain { u2_noun dil, goq; @@ -33,7 +33,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, cube)[] = { { ".2", c3__hevy, j2_mb(Pt6, cube), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/face.c b/gen164/6/face.c index 618cea51e..e49abf6f9 100644 --- a/gen164/6/face.c +++ b/gen164/6/face.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, face)(u2_wire wir_r, + j2_mby(Pt6, face)(u2_wire wir_r, u2_noun cog, // retain u2_noun tip) // retain { @@ -19,7 +19,7 @@ (wir_r, c3__face, u2_rx(wir_r, cog), u2_rx(wir_r, tip)); } u2_noun // transfer - j2_mb(Pt6, face)(u2_wire wir_r, + j2_mb(Pt6, face)(u2_wire wir_r, u2_noun cor) // retain { u2_noun cog, tip; @@ -33,7 +33,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, face)[] = { { ".2", c3__hevy, j2_mb(Pt6, face), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/fine.c b/gen164/6/fine.c index 80214ceec..7bd6c0920 100644 --- a/gen164/6/fine.c +++ b/gen164/6/fine.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, fine)(u2_wire wir_r, + j2_mby(Pt6, fine)(u2_wire wir_r, u2_noun fuv, u2_noun lup, // retain u2_noun mar) // retain @@ -17,18 +17,18 @@ return c3__void; } else { return u2_bq(wir_r, c3__fine, u2_rx(wir_r, fuv), - u2_rx(wir_r, lup), + u2_rx(wir_r, lup), u2_rx(wir_r, mar)); } } u2_noun // transfer - j2_mb(Pt6, fine)(u2_wire wir_r, + j2_mb(Pt6, fine)(u2_wire wir_r, u2_noun cor) // retain { u2_noun fuv, lup, mar; - if ( u2_no == u2_mean(cor, u2_cv_sam_2, &fuv, - u2_cv_sam_6, &lup, + if ( u2_no == u2_mean(cor, u2_cv_sam_2, &fuv, + u2_cv_sam_6, &lup, u2_cv_sam_7, &mar, 0) ) { return u2_bl_bail(wir_r, c3__fail); } else { @@ -38,7 +38,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, fine)[] = { { ".2", c3__hevy, j2_mb(Pt6, fine), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/fitz.c b/gen164/6/fitz.c index 55aa15e0d..4524e3889 100644 --- a/gen164/6/fitz.c +++ b/gen164/6/fitz.c @@ -7,15 +7,15 @@ /* functions */ - static u2_bean - _fitz_fiz(u2_wire wir_r, - u2_noun yaz, + static u2_bean + _fitz_fiz(u2_wire wir_r, + u2_noun yaz, u2_noun wix) { c3_w yaz_w = u2_met(3, yaz); c3_w wix_w = u2_met(3, wix); c3_y yaz_y, wix_y; - + yaz_y = (0 == yaz_w) ? 0 : u2_byte((yaz_w - 1), yaz); if ( (yaz_y < 'A') || (yaz_y > 'Z') ) yaz_y = 0; @@ -55,7 +55,7 @@ } u2_noun // transfer - j2_mb(Pt6, fitz)(u2_wire wir_r, + j2_mb(Pt6, fitz)(u2_wire wir_r, u2_noun cor) // retain { u2_noun yaz, wix; @@ -72,7 +72,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, fitz)[] = { { ".2", c3__hevy, j2_mb(Pt6, fitz), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/flan.c b/gen164/6/flan.c index 32fa0bb7e..4a69bb6be 100644 --- a/gen164/6/flan.c +++ b/gen164/6/flan.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, flan)(u2_wire wir_r, + j2_mby(Pt6, flan)(u2_wire wir_r, u2_noun bos, // retain u2_noun nif) // retain { @@ -27,15 +27,15 @@ } else { return u2_bq - (wir_r, u2_nock_6, - u2_rx(wir_r, bos), - u2_rx(wir_r, nif), + (wir_r, u2_nock_6, + u2_rx(wir_r, bos), + u2_rx(wir_r, nif), u2_bc(wir_r, u2_nock_1, u2_no)); } } } u2_noun // transfer - j2_mb(Pt6, flan)(u2_wire wir_r, + j2_mb(Pt6, flan)(u2_wire wir_r, u2_noun cor) // retain { u2_noun bos, nif; @@ -49,7 +49,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, flan)[] = { { ".2", c3__hevy, j2_mb(Pt6, flan), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/flay.c b/gen164/6/flay.c index 4e4bc616e..f013448cf 100644 --- a/gen164/6/flay.c +++ b/gen164/6/flay.c @@ -22,8 +22,8 @@ } } - u2_noun // produce - j2_mby(Pt6, flay)(u2_wire wir_r, + u2_noun // produce + j2_mby(Pt6, flay)(u2_wire wir_r, u2_noun pok) // retain { u2_noun p_pok = u2_h(pok); @@ -42,13 +42,13 @@ } u2_noun // transfer - j2_mb(Pt6, flay)(u2_wire wir_r, + j2_mb(Pt6, flay)(u2_wire wir_r, u2_noun cor) // retain { u2_noun pok; if ( (u2_no == u2_mean(cor, u2_cv_sam, &pok, 0)) || - (u2_no == u2_dust(pok)) ) { + (u2_no == u2_dust(pok)) ) { return u2_bl_bail(wir_r, c3__fail); } else { return j2_mby(Pt6, flay)(wir_r, pok); @@ -57,7 +57,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, flay)[] = { { ".2", c3__hevy, j2_mb(Pt6, flay), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/flip.c b/gen164/6/flip.c index 756ba5d6a..936019113 100644 --- a/gen164/6/flip.c +++ b/gen164/6/flip.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, flip)(u2_wire wir_r, + j2_mby(Pt6, flip)(u2_wire wir_r, u2_noun hel) // retain { if ( u2_yes == u2_sing(u2_nock_1, u2_h(hel)) ) { @@ -23,14 +23,14 @@ } else { return u2_bq - (wir_r, u2_nock_6, + (wir_r, u2_nock_6, u2_rx(wir_r, hel), - u2_bc(wir_r, u2_nock_1, u2_no), + u2_bc(wir_r, u2_nock_1, u2_no), u2_bc(wir_r, u2_nock_1, u2_yes)); } } u2_noun // transfer - j2_mb(Pt6, flip)(u2_wire wir_r, + j2_mb(Pt6, flip)(u2_wire wir_r, u2_noun cor) // retain { u2_noun hel; @@ -44,7 +44,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, flip)[] = { { ".2", c3__hevy, j2_mb(Pt6, flip), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/flor.c b/gen164/6/flor.c index 906dbff58..2e76cacd3 100644 --- a/gen164/6/flor.c +++ b/gen164/6/flor.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, flor)(u2_wire wir_r, + j2_mby(Pt6, flor)(u2_wire wir_r, u2_noun bos, // retain u2_noun nif) // retain { @@ -27,15 +27,15 @@ } else { return u2_bq - (wir_r, u2_nock_6, - u2_rx(wir_r, bos), - u2_bc(wir_r, u2_nock_1, u2_yes), + (wir_r, u2_nock_6, + u2_rx(wir_r, bos), + u2_bc(wir_r, u2_nock_1, u2_yes), u2_rx(wir_r, nif)); } } } u2_noun // transfer - j2_mb(Pt6, flor)(u2_wire wir_r, + j2_mb(Pt6, flor)(u2_wire wir_r, u2_noun cor) // retain { u2_noun bos, nif; @@ -49,7 +49,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, flor)[] = { { ".2", c3__hevy, j2_mb(Pt6, flor), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/fork.c b/gen164/6/fork.c index dffe81361..29b2c3dc3 100644 --- a/gen164/6/fork.c +++ b/gen164/6/fork.c @@ -8,7 +8,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, fork)(u2_wire wir_r, + j2_mby(Pt6, fork)(u2_wire wir_r, u2_noun hoz, // retain u2_noun bur) // retain { @@ -25,7 +25,7 @@ (wir_r, c3__fork, u2_rx(wir_r, hoz), u2_rx(wir_r, bur)); } u2_noun // transfer - j2_mb(Pt6, fork)(u2_wire wir_r, + j2_mb(Pt6, fork)(u2_wire wir_r, u2_noun cor) // retain { u2_noun hoz, bur; @@ -39,7 +39,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, fork)[] = { { ".2", c3__hevy, j2_mb(Pt6, fork), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/hike.c b/gen164/6/hike.c index c77b6fd32..58a6cae49 100644 --- a/gen164/6/hike.c +++ b/gen164/6/hike.c @@ -22,7 +22,7 @@ u2_list list_tool = _lily_hike_belt_root(wir_r, u2_t(pac)); if ( u2_yes == u2_sing(_1, axis) ) { - return u2_bc(wir_r, u2_rx(wir_r, tool), + return u2_bc(wir_r, u2_rx(wir_r, tool), list_tool); } else return list_tool; @@ -44,15 +44,15 @@ u2_list belt_l = _lily_hike_belt_l(wir_r, u2_t(pac)); { - if ( (_1 != axis) && + if ( (_1 != axis) && (u2_yes == u2_sing(_2, j2_mbc(Pt3, cap)(wir_r, axis))) ) { u2_axis axis_tap = j2_mbc(Pt3, mas)(wir_r, axis); - return u2_bc(wir_r, - u2_bc(wir_r, - u2_rx(wir_r, axis_tap), - u2_rx(wir_r, tool)), + return u2_bc(wir_r, + u2_bc(wir_r, + u2_rx(wir_r, axis_tap), + u2_rx(wir_r, tool)), belt_l); } else return belt_l; @@ -75,13 +75,13 @@ u2_list belt_r = _lily_hike_belt_r(wir_r, u2_t(pac)); { - if ( (_1 != axis) && + if ( (_1 != axis) && (u2_yes == u2_sing(_3, j2_mbc(Pt3, cap)(wir_r, axis))) ) { u2_axis axis_tap = j2_mbc(Pt3, mas)(wir_r, axis); - return u2_bc(wir_r, - u2_bc(wir_r, u2_rx(wir_r, axis_tap), + return u2_bc(wir_r, + u2_bc(wir_r, u2_rx(wir_r, axis_tap), u2_rx(wir_r, tool)), belt_r); } @@ -93,7 +93,7 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, hike)(u2_wire wir_r, + j2_mby(Pt6, hike)(u2_wire wir_r, u2_noun axe, // retain u2_noun pac) // retain { @@ -130,7 +130,7 @@ } } u2_noun // transfer - j2_mb(Pt6, hike)(u2_wire wir_r, + j2_mb(Pt6, hike)(u2_wire wir_r, u2_noun cor) // retain { u2_noun axe, pac; @@ -146,7 +146,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, hike)[] = { { ".2", c3__hevy, j2_mb(Pt6, hike), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/look.c b/gen164/6/look.c index 65661e708..be5ae089c 100644 --- a/gen164/6/look.c +++ b/gen164/6/look.c @@ -17,21 +17,21 @@ return u2_nul; } else { - u2_noun n_dab, l_dab, r_dab; - + u2_noun n_dab, l_dab, r_dab; + u2_as_trel(dab, &n_dab, &l_dab, &r_dab); if ( u2_no == u2_dust(n_dab) ) { return u2_bl_bail(wir_r, c3__fail); - } + } else { u2_noun pn_dab = u2_h(n_dab); u2_noun qn_dab = u2_t(n_dab); - + if ( (u2_nul == l_dab) && (u2_nul == r_dab) ) { if ( (u2_yes == u2_dust(qn_dab)) && (u2_yes == u2_sing(cog, pn_dab)) ) { - return u2_bt(wir_r, u2_nul, - u2_rx(wir_r, axe), + return u2_bt(wir_r, u2_nul, + u2_rx(wir_r, axe), u2_rx(wir_r, qn_dab)); } else { @@ -41,7 +41,7 @@ else if ( (u2_nul == l_dab) ) { if ( (u2_yes == u2_dust(qn_dab)) && (u2_yes == u2_sing(cog, pn_dab)) ) { - return u2_bt(wir_r, u2_nul, + return u2_bt(wir_r, u2_nul, j2_mbc(Pt3, peg)(wir_r, axe, _2), u2_rx(wir_r, qn_dab)); } @@ -62,7 +62,7 @@ else if ( (u2_nul == r_dab) ) { if ( (u2_yes == u2_dust(qn_dab)) && (u2_yes == u2_sing(cog, pn_dab)) ) { - return u2_bt(wir_r, u2_nul, + return u2_bt(wir_r, u2_nul, j2_mbc(Pt3, peg)(wir_r, axe, _2), u2_rx(wir_r, qn_dab)); } @@ -83,7 +83,7 @@ else { if ( (u2_yes == u2_dust(qn_dab)) && (u2_yes == u2_sing(cog, pn_dab)) ) { - return u2_bt(wir_r, u2_nul, + return u2_bt(wir_r, u2_nul, j2_mbc(Pt3, peg)(wir_r, axe, _2), u2_rx(wir_r, qn_dab)); } @@ -114,14 +114,14 @@ /* functions */ u2_noun // transfer - j2_mby(Pt6, look)(u2_wire wir_r, + j2_mby(Pt6, look)(u2_wire wir_r, u2_noun cog, // retain u2_noun dab) // retain { return _look_in(wir_r, cog, dab, _1); } u2_noun // transfer - j2_mb(Pt6, look)(u2_wire wir_r, + j2_mb(Pt6, look)(u2_wire wir_r, u2_noun cor) // retain { u2_noun cog, dab; @@ -135,7 +135,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, look)[] = { { ".2", c3__hevy, j2_mb(Pt6, look), Tier6_a, u2_none, u2_none }, { } diff --git a/gen164/6/type.c b/gen164/6/type.c index 247be8bb5..6a24e1d52 100644 --- a/gen164/6/type.c +++ b/gen164/6/type.c @@ -11,7 +11,7 @@ if ( u2_no == u2_dust(sut) ) switch ( sut ) { default: return u2_bl_bail(wir_r, c3__fail); - case c3__noun: + case c3__noun: { } case c3__void: diff --git a/gen164/6/ut.c b/gen164/6/ut.c index 84d689576..a0eeac6ed 100644 --- a/gen164/6/ut.c +++ b/gen164/6/ut.c @@ -89,7 +89,7 @@ { u2_noun sho = u2_bn_hook(wir_r, van, "show"); u2_noun ret = u2_bn_molt(wir_r, sho, u2_cv_sam, mol, 0); - + u2_rz(wir_r, sho); u2_rz(wir_r, mol); return ret; @@ -114,13 +114,13 @@ /* declarations */ u2_noun // transfer - j2_mc(Pt6, ut, repo)(u2_wire wir_r, + j2_mc(Pt6, ut, repo)(u2_wire wir_r, u2_noun cor); // retain u2_noun // transfer - j2_mc(Pt6, ut, burn)(u2_wire wir_r, + j2_mc(Pt6, ut, burn)(u2_wire wir_r, u2_noun cor); // retain u2_noun // transfer - j2_mc(Pt6, ut, moot)(u2_wire wir_r, + j2_mc(Pt6, ut, moot)(u2_wire wir_r, u2_noun cor); // retain u2_weak @@ -155,7 +155,7 @@ /* structures */ - u2_ho_driver + u2_ho_driver j2_mbd(Pt6, ut)[] = { { j2_sc(Pt6, ut, busk), j2_mcj(Pt6, ut, busk), 0, 0, u2_none }, { j2_sc(Pt6, ut, bust), j2_mcj(Pt6, ut, bust), 0, 0, u2_none }, @@ -184,16 +184,16 @@ { } }; - u2_ho_jet + u2_ho_jet j2_mbj(Pt6, ut)[] = { - { "burn", - c3__hevy, - j2_mc(Pt6, ut, burn), + { "burn", + c3__hevy, + j2_mc(Pt6, ut, burn), Tier6_b, u2_none, u2_none }, - { "moot", - c3__hevy, - j2_mc(Pt6, ut, moot), + { "moot", + c3__hevy, + j2_mc(Pt6, ut, moot), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, moot), c3__moot }, @@ -202,5 +202,5 @@ }; u2_ho_driver - j2_db(Pt6, ut) = + j2_db(Pt6, ut) = { j2_sb(Pt6, ut), j2_mbj(Pt6, ut), j2_mbd(Pt6, ut), 0, u2_none }; diff --git a/gen164/6/ut_burn.c b/gen164/6/ut_burn.c index c3c20e992..154e301ea 100644 --- a/gen164/6/ut_burn.c +++ b/gen164/6/ut_burn.c @@ -8,7 +8,7 @@ /* logic */ static u2_noun - _burn_in(u2_wire wir_r, + _burn_in(u2_wire wir_r, u2_noun van, u2_noun sut, u2_noun gil) @@ -64,7 +64,7 @@ u2_bl_push(wir_r, u2_bc(wir_r, c3__mean, sux)); return u2_bl_error(wir_r, "burn-loop"); - } + } else { u2_noun zoc = j2_mcc(Pt4, in, put)(wir_r, gil, sut); u2_type fop = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); @@ -80,18 +80,18 @@ } u2_noun // transfer - j2_mcx(Pt6, ut, burn)(u2_wire wir_r, + j2_mcx(Pt6, ut, burn)(u2_wire wir_r, u2_noun van, // retain u2_noun sut) // retain { return _burn_in(wir_r, van, sut, u2_nul); } - extern u2_ho_jet + extern u2_ho_jet j2_mbj(Pt6, ut)[]; u2_noun // transfer - j2_mcy(Pt6, ut, burn)(u2_wire wir_r, + j2_mcy(Pt6, ut, burn)(u2_wire wir_r, u2_noun van, // retain u2_noun sut) // retain { @@ -116,7 +116,7 @@ } u2_noun // transfer - j2_mc(Pt6, ut, burn)(u2_wire wir_r, + j2_mc(Pt6, ut, burn)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut; diff --git a/gen164/6/ut_busk.c b/gen164/6/ut_busk.c index 368734e82..dc8c45b25 100644 --- a/gen164/6/ut_busk.c +++ b/gen164/6/ut_busk.c @@ -5,13 +5,13 @@ #include "all.h" #include "../pit.h" - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, busk)[]; /* logic */ u2_noun // transfer - j2_mcx(Pt6, ut, busk)(u2_wire wir_r, + j2_mcx(Pt6, ut, busk)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun cog, // retain @@ -29,14 +29,14 @@ /* boilerplate */ u2_noun // transfer - j2_mc(Pt6, ut, busk)(u2_wire wir_r, + j2_mc(Pt6, ut, busk)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, cog, hyp, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &cog, - u2_cv_sam_3, &hyp, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &cog, + u2_cv_sam_3, &hyp, + u2_cv_con, &van, 0)) || (u2_no == u2_stud(cog)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) @@ -50,7 +50,7 @@ u2_weak // transfer j2_mci(Pt6, ut, busk)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun cog, // retain u2_noun hyp) // retain { @@ -67,7 +67,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, busk)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, busk)[0].xip = xip; } @@ -121,10 +121,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, busk)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, busk), + { ".2", c3__hevy, + j2_mc(Pt6, ut, busk), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, busk), c3__busk, diff --git a/gen164/6/ut_bust.c b/gen164/6/ut_bust.c index 319cb43d4..9de3e71f1 100644 --- a/gen164/6/ut_bust.c +++ b/gen164/6/ut_bust.c @@ -8,7 +8,7 @@ /* logic */ u2_noun // transfer - j2_mcx(Pt6, ut, bust)(u2_wire wir_r, + j2_mcx(Pt6, ut, bust)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun dib) // retain @@ -35,11 +35,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, bust)[]; u2_noun // transfer - j2_mc(Pt6, ut, bust)(u2_wire wir_r, + j2_mc(Pt6, ut, bust)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, dib, van; @@ -56,7 +56,7 @@ u2_weak // transfer j2_mci(Pt6, ut, bust)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun dib) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "bust"); @@ -71,7 +71,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, bust)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, bust)[0].xip = xip; } @@ -139,10 +139,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, bust)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, bust), + { ".2", c3__hevy, + j2_mc(Pt6, ut, bust), Tier6_b, u2_none, u2_none, j2_mck(Pt6, ut, bust), c3__bust, diff --git a/gen164/6/ut_conk.c b/gen164/6/ut_conk.c index ae520d7d5..43f551297 100644 --- a/gen164/6/ut_conk.c +++ b/gen164/6/ut_conk.c @@ -8,7 +8,7 @@ /* logic */ u2_bean // transfer - j2_mcx(Pt6, ut, conk)(u2_wire wir_r, + j2_mcx(Pt6, ut, conk)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun got) // retain @@ -24,16 +24,16 @@ } case 1: { return j2_mby(Pt6, face) - (wir_r, u2h(u2t(got)), + (wir_r, u2h(u2t(got)), j2_mcx(Pt6, ut, conk)(wir_r, van, sut, u2t(u2t(got)))); } case 2: { - u2_bean vet = u2_frag(j2_ut_van_vet, van); + u2_bean vet = u2_frag(j2_ut_van_vet, van); u2_noun hed, tal, ret; if ( u2_yes == vet ) { u2_noun cel = u2nt(c3__cell, c3__noun, c3__noun); - + if ( u2_no == j2_mcy(Pt6, ut, nest)(wir_r, van, cel, u2_yes, sut) ) { return u2_bl_bail(wir_r, c3__fail); } @@ -43,7 +43,7 @@ tal = j2_mcy(Pt6, ut, peek)(wir_r, van, sut, c3__both, 3); ret = j2_mby(Pt6, cell) - (wir_r, + (wir_r, j2_mcx(Pt6, ut, conk)(wir_r, van, hed, u2h(u2t(got))), j2_mcx(Pt6, ut, conk)(wir_r, van, tal, u2t(u2t(got)))); @@ -57,17 +57,17 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, conk)[]; u2_noun // transfer - j2_mc(Pt6, ut, conk)(u2_wire wir_r, + j2_mc(Pt6, ut, conk)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, got, van; if ( (u2_no == u2_mean(cor, u2_cv_sam, &got, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -80,7 +80,7 @@ u2_bean j2_mci(Pt6, ut, conk)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun got) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "conk"); @@ -91,13 +91,13 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam, u2_rx(wir_r, got), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam, u2_rx(wir_r, got), 0); if ( (u2_none == j2_mcj(Pt6, ut, conk)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, conk)[0].xip = xip; } @@ -135,7 +135,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, conk)[] = { { ".2", c3__hevy, j2_mc(Pt6, ut, conk), Tier6_b, u2_none, u2_none }, { } diff --git a/gen164/6/ut_crop.c b/gen164/6/ut_crop.c index 262cdc181..e59190377 100644 --- a/gen164/6/ut_crop.c +++ b/gen164/6/ut_crop.c @@ -36,7 +36,7 @@ } } - static u2_noun // produce + static u2_noun // produce _crop_dext(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain @@ -91,7 +91,7 @@ u2_bi_cell(wir_r, u2_t(ref), &p_ref, &q_ref); if ( u2_yes == j2_mcy(Pt6, ut, nest) - (wir_r, van, p_ref, u2_no, p_sut) ) + (wir_r, van, p_ref, u2_no, p_sut) ) { u2_noun foz = _crop_dext(wir_r, van, q_sut, q_ref, bix); u2_noun ret = j2_mby(Pt6, cell)(wir_r, p_sut, foz); @@ -103,7 +103,7 @@ } else return _crop_sint(wir_r, van, sut, ref, bix); } - case c3__core: + case c3__core: { if ( (c3__atom == u2_h(ref)) || (c3__cell == u2_h(ref)) ) { return u2_rx(wir_r, sut); @@ -112,11 +112,11 @@ } case c3__cube: u2_bi_cell(wir_r, u2_t(sut), &p_sut, &q_sut); { - if ( (c3__cube == u2_h(ref)) && + if ( (c3__cube == u2_h(ref)) && (u2_yes == u2_sing(p_sut, u2_h(u2_t(ref)))) ) { return c3__void; - } + } else if ( (c3__atom == u2_h(ref)) || (c3__cell == u2_h(ref)) ) { u2_noun foz = _crop_dext(wir_r, van, q_sut, ref, bix); u2_noun ret; @@ -219,7 +219,7 @@ } u2_noun // transfer - j2_mcx(Pt6, ut, crop)(u2_wire wir_r, + j2_mcx(Pt6, ut, crop)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun ref) // retain @@ -229,11 +229,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, crop)[]; u2_noun // transfer - j2_mc(Pt6, ut, crop)(u2_wire wir_r, + j2_mc(Pt6, ut, crop)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, ref, van; @@ -250,7 +250,7 @@ u2_weak // transfer j2_mci(Pt6, ut, crop)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun ref) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "crop"); @@ -265,7 +265,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, crop)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, crop)[0].xip = xip; } @@ -333,10 +333,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, crop)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, crop), + { ".2", c3__hevy, + j2_mc(Pt6, ut, crop), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, crop), c3__crop, diff --git a/gen164/6/ut_cull.c b/gen164/6/ut_cull.c index 49915dc2b..725973102 100644 --- a/gen164/6/ut_cull.c +++ b/gen164/6/ut_cull.c @@ -10,8 +10,8 @@ u2_noun j2_mcx(Pt6, ut, cull)(u2_wire, u2_noun, u2_noun, u2_bean, u2_atom, u2_noun); - static u2_noun - _cull_in(u2_wire wir_r, + static u2_noun + _cull_in(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_bean pol, // retain @@ -29,9 +29,9 @@ case c3__noun: { u2_noun pyr = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); u2_noun yot = j2_mcx(Pt6, ut, cull)(wir_r, van, pyr, pol, axe, ref); - + if ( u2_yes == u2_sing(pyr, yot) ) { - ret = u2_rx(wir_r, sut); + ret = u2_rx(wir_r, sut); } else { ret = u2_rx(wir_r, yot); } @@ -47,7 +47,7 @@ default: return u2_bl_bail(wir_r, c3__fail); case c3__atom: { - ret = c3__void; + ret = c3__void; break; } case c3__bull: u2_bi_cell(wir_r, u2_t(sut), &p_sut, &q_sut); @@ -56,7 +56,7 @@ (wir_r, van, q_sut, pol, axe, ref); if ( u2_yes == u2_sing(hic, q_sut) ) { - ret = u2_rx(wir_r, sut); + ret = u2_rx(wir_r, sut); } else { ret = j2_mby(Pt6, bull)(wir_r, p_sut, hic); } @@ -98,7 +98,7 @@ (wir_r, van, q_sut, pol, axe, ref); if ( u2_yes == u2_sing(hic, q_sut) ) { - ret = u2_rx(wir_r, sut); + ret = u2_rx(wir_r, sut); } else { ret = j2_mby(Pt6, face)(wir_r, p_sut, hic); } @@ -116,7 +116,7 @@ (wir_r, van, p_sut, pol, axe, ref, now, lat, zoc); u2_noun dex = _cull_in (wir_r, van, q_sut, pol, axe, ref, now, lat, zoc); - + ret = j2_mby(Pt6, fork)(wir_r, sin, dex); u2_rl_lose(wir_r, sin); u2_rl_lose(wir_r, dex); @@ -125,8 +125,8 @@ return ret; } } - case c3__cube: - case c3__hold: + case c3__cube: + case c3__hold: { u2_noun pyr = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); u2_noun yot = _cull_in(wir_r, van, pyr, pol, axe, ref, now, lat, vil); @@ -135,7 +135,7 @@ if ( c3__void == pyr ) { ret = c3__void; } - else ret = u2_rx(wir_r, sut); + else ret = u2_rx(wir_r, sut); } else { ret = u2_rx(wir_r, yot); } @@ -149,7 +149,7 @@ } u2_noun // transfer - j2_mcx(Pt6, ut, cull)(u2_wire wir_r, + j2_mcx(Pt6, ut, cull)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_bean pol, // retain @@ -169,20 +169,20 @@ return _cull_in(wir_r, van, sut, pol, axe, ref, now, lat, u2_nul); } } - + /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, cull)[]; u2_noun // transfer - j2_mc(Pt6, ut, cull)(u2_wire wir_r, + j2_mc(Pt6, ut, cull)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, axe, pol, ref, van; if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &pol, - u2_cv_sam_6, &axe, + u2_cv_sam_6, &axe, u2_cv_sam_7, &ref, u2_cv_con, &van, 0)) || (u2_no == u2_stud(axe)) || @@ -197,7 +197,7 @@ u2_weak // transfer j2_mci(Pt6, ut, cull)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_bean pol, // retain u2_atom axe, // retain u2_noun ref) // retain @@ -210,15 +210,15 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, + u2_weak cor = u2_rl_molt(wir_r, gat, u2_cv_sam_2, pol, - u2_cv_sam_6, u2_rx(wir_r, axe), - u2_cv_sam_7, u2_rx(wir_r, ref), + u2_cv_sam_6, u2_rx(wir_r, axe), + u2_cv_sam_7, u2_rx(wir_r, ref), 0); if ( (u2_none == j2_mcj(Pt6, ut, cull)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, cull)[0].xip = xip; } @@ -278,9 +278,9 @@ u2_noun sut, pol, axe, ref, van; if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &pol, - u2_cv_sam_6, &axe, + u2_cv_sam_6, &axe, u2_cv_sam_7, &ref, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (pol > 1) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) @@ -294,10 +294,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, cull)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, cull), + { ".2", c3__hevy, + j2_mc(Pt6, ut, cull), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, cull), c3__cull, diff --git a/gen164/6/ut_find.c b/gen164/6/ut_find.c index daf52ffc6..16e043889 100644 --- a/gen164/6/ut_find.c +++ b/gen164/6/ut_find.c @@ -27,24 +27,24 @@ case c3__bull: { if ( (u2_no == u2_as_trel(sut, 0, &p_sut, &q_sut)) ) { return u2_bl_bail(wir_r, c3__fail); - } - else { + } + else { if ( u2_no == u2_sing(cog, u2_h(p_sut)) ) { return _fino_in (wir_r, van, q_sut, dep, way, cog, gil); - } + } else { if ( 0 == dep ) { return u2_bc - (wir_r, 0, - u2_bt(wir_r, - u2_nul, + (wir_r, 0, + u2_bt(wir_r, + u2_nul, 1, u2_bt(wir_r, 2, u2_rx(wir_r, p_sut), u2_rx(wir_r, q_sut)))); } else { return _fino_in - (wir_r, + (wir_r, van, q_sut, j2_mbc(Pt1, dec)(wir_r, dep), way, cog, gil); } } @@ -66,7 +66,7 @@ if ( u2_nul == q_bov ) { ret = u2_rx(wir_r, bov); - } + } else { u2_noun puq_bov, quq_bov; @@ -78,7 +78,7 @@ u2_rx(wir_r, quq_bov)); } u2_rl_lose(wir_r, bov); - } + } else { u2_noun puq_taf, quq_taf; @@ -123,7 +123,7 @@ if ( u2_nul == q_taf ) { u2_rl_lose(wir_r, taf); return u2_bc(wir_r, u2_rx(wir_r, dep), u2_nul); - } + } else { u2_noun puq_taf, quq_taf; u2_noun pro; @@ -168,15 +168,15 @@ u2_rx(wir_r, rq_sut))); pro = u2_bc - (wir_r, + (wir_r, 0, - u2_bq(wir_r, + u2_bq(wir_r, u2_nul, _1, _1, u2_bc (wir_r, j2_mbc(Pt3, peg)(wir_r, 2, pu_zem), - u2_bc(wir_r, + u2_bc(wir_r, u2_bc(wir_r, mut, u2_rx(wir_r, qu_zem)), u2_nul)))); u2_rz(wir_r, zem); @@ -187,13 +187,13 @@ case c3__face: { if ( (u2_no == u2_as_trel(sut, 0, &p_sut, &q_sut)) ) { return u2_bl_bail(wir_r, c3__fail); - } else { + } else { if ( u2_no == u2_sing(cog, p_sut) ) { return u2_bc(wir_r, u2_rx(wir_r, dep), u2_nul); } else { if ( 0 == dep ) { return u2_bc - (wir_r, 0, + (wir_r, 0, u2_bq(wir_r, u2_nul, _1, 0, u2_rx(wir_r, q_sut))); } else { return u2_bc @@ -216,10 +216,10 @@ if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, q_sut)) ) { return _fino_in(wir_r, van, p_sut, dep, way, cog, gil); - } + } else if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, p_sut)) ) { return _fino_in(wir_r, van, q_sut, dep, way, cog, gil); - } + } else { u2_noun hax = _fino_in(wir_r, van, p_sut, dep, way, cog, gil); u2_noun yor = _fino_in(wir_r, van, q_sut, dep, way, cog, gil); @@ -255,10 +255,10 @@ u2_noun pquq_yor = u2_t(quq_yor); ret = u2_bc - (wir_r, + (wir_r, u2_rx(wir_r, p_hax), u2_bq - (wir_r, + (wir_r, u2_nul, u2_rx(wir_r, puq_hax), 0, @@ -275,7 +275,7 @@ return u2_bl_error(wir_r, "find-fork"); } else { ret = u2_bc - (wir_r, + (wir_r, u2_rx(wir_r, p_hax), u2_bq (wir_r, u2_nul, @@ -295,11 +295,11 @@ u2_bi_cell(wir_r, u2_t(quq_hax), &pquq_hax, &qquq_hax); u2_bi_cell(wir_r, u2_t(quq_yor), &pquq_yor, &qquq_yor); - u2_bi_qual(wir_r, - pquq_hax, + u2_bi_qual(wir_r, + pquq_hax, &ppquq_hax, &qpquq_hax, &rpquq_hax, &spquq_hax); - u2_bi_qual(wir_r, - pquq_yor, + u2_bi_qual(wir_r, + pquq_yor, &ppquq_yor, &qpquq_yor, &rpquq_yor, &spquq_yor); if ( (u2_no == u2_sing(ppquq_hax, ppquq_yor)) || @@ -310,10 +310,10 @@ } else { ret = u2_bc - (wir_r, + (wir_r, u2_rx(wir_r, p_hax), u2_bq - (wir_r, + (wir_r, u2_nul, u2_rx(wir_r, puq_hax), 2, @@ -322,8 +322,8 @@ u2_rx(wir_r, ppquq_hax), u2_rx(wir_r, qpquq_hax), u2_rx(wir_r, rpquq_hax), - j2_mby(Pt6, fork)(wir_r, - spquq_hax, + j2_mby(Pt6, fork)(wir_r, + spquq_hax, spquq_yor)), j2_mby(Pt6, fork)(wir_r, qquq_hax, qquq_yor)))); break; @@ -336,12 +336,12 @@ return ret; } - } + } case c3__hold: p_sut = u2_t(sut); { if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, sut)) ) { return u2_bc(wir_r, u2_rx(wir_r, dep), u2_nul); - } + } else { u2_noun zoc = j2_mcc(Pt4, in, put)(wir_r, gil, sut); u2_type fop = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); @@ -378,24 +378,24 @@ (u2_no == u2_as_qual(p_sut, &pp_sut, &qp_sut, &rp_sut, &sp_sut)) ) { return u2_bl_bail(wir_r, c3__fail); - } - else { + } + else { if ( u2_no == u2_sing(cog, pp_sut) ) { return _find_in (wir_r, van, q_sut, dep, way, cog, gil); - } + } else { if ( 0 == dep ) { return u2_bc - (wir_r, 0, - u2_bq(wir_r, - u2_nul, - u2_rx(wir_r, rp_sut), - u2_yes, + (wir_r, 0, + u2_bq(wir_r, + u2_nul, + u2_rx(wir_r, rp_sut), + u2_yes, u2_rx(wir_r, sp_sut))); } else { return _find_in - (wir_r, + (wir_r, van, q_sut, j2_mbc(Pt1, dec)(wir_r, dep), way, cog, gil); return u2_bc (wir_r, j2_mbc(Pt1, dec)(wir_r, dep), u2_nul); @@ -419,7 +419,7 @@ if ( u2_nul == q_bov ) { ret = u2_rx(wir_r, bov); - } + } else { u2_noun puq_bov, quq_bov; @@ -431,7 +431,7 @@ u2_rx(wir_r, quq_bov)); } u2_rl_lose(wir_r, bov); - } + } else { u2_noun puq_taf, quq_taf; @@ -476,7 +476,7 @@ if ( u2_nul == q_taf ) { u2_rl_lose(wir_r, taf); return u2_bc(wir_r, u2_rx(wir_r, dep), u2_nul); - } + } else { u2_noun puq_taf, quq_taf; u2_noun pro; @@ -521,15 +521,15 @@ u2_rx(wir_r, rq_sut))); pro = u2_bc - (wir_r, + (wir_r, 0, - u2_bq(wir_r, + u2_bq(wir_r, u2_nul, _1, u2_no, u2_bc (wir_r, j2_mbc(Pt3, peg)(wir_r, 2, pu_zem), - u2_bc(wir_r, + u2_bc(wir_r, u2_bc(wir_r, mut, u2_rx(wir_r, qu_zem)), u2_nul)))); u2_rz(wir_r, zem); @@ -540,13 +540,13 @@ case c3__face: { if ( (u2_no == u2_as_trel(sut, 0, &p_sut, &q_sut)) ) { return u2_bl_bail(wir_r, c3__fail); - } else { + } else { if ( u2_no == u2_sing(cog, p_sut) ) { return u2_bc(wir_r, u2_rx(wir_r, dep), u2_nul); } else { if ( 0 == dep ) { return u2_bc - (wir_r, 0, + (wir_r, 0, u2_bq(wir_r, u2_nul, _1, u2_yes, u2_rx(wir_r, q_sut))); } else { return u2_bc @@ -569,10 +569,10 @@ if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, q_sut)) ) { return _find_in(wir_r, van, p_sut, dep, way, cog, gil); - } + } else if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, p_sut)) ) { return _find_in(wir_r, van, q_sut, dep, way, cog, gil); - } + } else { u2_noun hax = _find_in(wir_r, van, p_sut, dep, way, cog, gil); u2_noun yor = _find_in(wir_r, van, q_sut, dep, way, cog, gil); @@ -608,10 +608,10 @@ u2_noun pquq_yor = u2_t(quq_yor); ret = u2_bc - (wir_r, + (wir_r, u2_rx(wir_r, p_hax), u2_bq - (wir_r, + (wir_r, u2_nul, u2_rx(wir_r, puq_hax), u2_yes, @@ -628,7 +628,7 @@ return u2_bl_error(wir_r, "find-fork"); } else { ret = u2_bc - (wir_r, + (wir_r, u2_rx(wir_r, p_hax), u2_bq (wir_r, u2_nul, @@ -648,12 +648,12 @@ return ret; } - } + } case c3__hold: p_sut = u2_t(sut); { if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, sut)) ) { return u2_bc(wir_r, u2_rx(wir_r, dep), u2_nul); - } + } else { u2_noun zoc = j2_mcc(Pt4, in, put)(wir_r, gil, sut); u2_type fop = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); @@ -669,7 +669,7 @@ } u2_noun // transfer - j2_mcx(Pt6, ut, find)(u2_wire wir_r, + j2_mcx(Pt6, ut, find)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun dep, // retain @@ -680,7 +680,7 @@ } u2_noun // transfer - j2_mcx(Pt6, ut, fino)(u2_wire wir_r, + j2_mcx(Pt6, ut, fino)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun dep, // retain @@ -692,19 +692,19 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fino)[]; u2_noun // transfer - j2_mc(Pt6, ut, fino)(u2_wire wir_r, + j2_mc(Pt6, ut, fino)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, dep, way, cog, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, - u2_cv_sam_6, &way, - u2_cv_sam_7, &cog, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, + u2_cv_sam_6, &way, + u2_cv_sam_7, &cog, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -717,7 +717,7 @@ u2_weak // transfer j2_mci(Pt6, ut, fino)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun dep, // retain u2_noun way, // retain u2_noun cog) // retain @@ -730,15 +730,15 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam_2, u2_rx(wir_r, dep), - u2_cv_sam_6, u2_rx(wir_r, way), - u2_cv_sam_7, u2_rx(wir_r, cog), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam_2, u2_rx(wir_r, dep), + u2_cv_sam_6, u2_rx(wir_r, way), + u2_cv_sam_7, u2_rx(wir_r, cog), 0); if ( (u2_none == j2_mcj(Pt6, ut, fino)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, fino)[0].xip = xip; } @@ -797,29 +797,29 @@ { u2_noun sut, dep, way, cog, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, - u2_cv_sam_6, &way, - u2_cv_sam_7, &cog, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, + u2_cv_sam_6, &way, + u2_cv_sam_7, &cog, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { return u2_none; } else { return u2_rq - (wir_r, u2_rx(wir_r, sut), - u2_rx(wir_r, dep), - u2_rx(wir_r, way), + (wir_r, u2_rx(wir_r, sut), + u2_rx(wir_r, dep), + u2_rx(wir_r, way), u2_rx(wir_r, cog)); } } /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fino)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, fino), + { ".2", c3__hevy, + j2_mc(Pt6, ut, fino), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, fino), c3__fino, @@ -829,19 +829,19 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, find)[]; u2_noun // transfer - j2_mc(Pt6, ut, find)(u2_wire wir_r, + j2_mc(Pt6, ut, find)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, dep, way, cog, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, - u2_cv_sam_6, &way, - u2_cv_sam_7, &cog, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, + u2_cv_sam_6, &way, + u2_cv_sam_7, &cog, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -854,7 +854,7 @@ u2_weak // transfer j2_mci(Pt6, ut, find)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun dep, // retain u2_noun way, // retain u2_noun cog) // retain @@ -867,15 +867,15 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam_2, u2_rx(wir_r, dep), - u2_cv_sam_6, u2_rx(wir_r, way), - u2_cv_sam_7, u2_rx(wir_r, cog), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam_2, u2_rx(wir_r, dep), + u2_cv_sam_6, u2_rx(wir_r, way), + u2_cv_sam_7, u2_rx(wir_r, cog), 0); if ( (u2_none == j2_mcj(Pt6, ut, find)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, find)[0].xip = xip; } @@ -934,29 +934,29 @@ { u2_noun sut, dep, way, cog, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, - u2_cv_sam_6, &way, - u2_cv_sam_7, &cog, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, + u2_cv_sam_6, &way, + u2_cv_sam_7, &cog, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { return u2_none; } else { return u2_rq - (wir_r, u2_rx(wir_r, sut), - u2_rx(wir_r, dep), - u2_rx(wir_r, way), + (wir_r, u2_rx(wir_r, sut), + u2_rx(wir_r, dep), + u2_rx(wir_r, way), u2_rx(wir_r, cog)); } } /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, find)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, find), + { ".2", c3__hevy, + j2_mc(Pt6, ut, find), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, find), c3__find, diff --git a/gen164/6/ut_fink.c b/gen164/6/ut_fink.c index 2bbd08a3d..d2c9df02c 100644 --- a/gen164/6/ut_fink.c +++ b/gen164/6/ut_fink.c @@ -8,7 +8,7 @@ /* logic */ u2_noun // transfer - j2_mcx(Pt6, ut, fink)(u2_wire wir_r, + j2_mcx(Pt6, ut, fink)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun dep, // retain @@ -16,7 +16,7 @@ u2_noun cog) // retain { // u2_noun dun = j2_mcy(Pt6, ut, dunq)(wir_r, van, "type", sut); - u2_noun nuc = (u2_blip == cog) + u2_noun nuc = (u2_blip == cog) ? j2_mcy(Pt6, ut, shew) (wir_r, van, u2_bc @@ -48,19 +48,19 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fink)[]; u2_noun // transfer - j2_mc(Pt6, ut, fink)(u2_wire wir_r, + j2_mc(Pt6, ut, fink)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, dep, way, cog, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, - u2_cv_sam_6, &way, - u2_cv_sam_7, &cog, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, + u2_cv_sam_6, &way, + u2_cv_sam_7, &cog, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -73,7 +73,7 @@ u2_weak // transfer j2_mci(Pt6, ut, fink)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun dep, // retain u2_noun way, // retain u2_noun cog) // retain @@ -86,15 +86,15 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam_2, u2_rx(wir_r, dep), - u2_cv_sam_6, u2_rx(wir_r, way), - u2_cv_sam_7, u2_rx(wir_r, cog), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam_2, u2_rx(wir_r, dep), + u2_cv_sam_6, u2_rx(wir_r, way), + u2_cv_sam_7, u2_rx(wir_r, cog), 0); if ( (u2_none == j2_mcj(Pt6, ut, fink)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, fink)[0].xip = xip; } @@ -153,29 +153,29 @@ { u2_noun sut, dep, way, cog, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, - u2_cv_sam_6, &way, - u2_cv_sam_7, &cog, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &dep, + u2_cv_sam_6, &way, + u2_cv_sam_7, &cog, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { return u2_none; } else { return u2_rq - (wir_r, u2_rx(wir_r, sut), - u2_rx(wir_r, dep), - u2_rx(wir_r, way), + (wir_r, u2_rx(wir_r, sut), + u2_rx(wir_r, dep), + u2_rx(wir_r, way), u2_rx(wir_r, cog)); } } /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fink)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, fink), + { ".2", c3__hevy, + j2_mc(Pt6, ut, fink), Tier6_b, u2_none, u2_none, j2_mck(Pt6, ut, fink), c3__fink, diff --git a/gen164/6/ut_fire.c b/gen164/6/ut_fire.c index 7c16055f3..357cc0b61 100644 --- a/gen164/6/ut_fire.c +++ b/gen164/6/ut_fire.c @@ -19,14 +19,14 @@ u2_rx(wir_r, dox), u2_rx(wir_r, gen)); u2_bean ret; - + if ( u2_yes == j2_mcc(Pt4, in, has)(wir_r, rib, key) ) { ret = u2_yes; } else { u2_noun rob = j2_mcc(Pt4, in, put)(wir_r, rib, key); - u2_noun von = u2_bn_molt(wir_r, van, - j2_ut_van_rib, rob, + u2_noun von = u2_bn_molt(wir_r, van, + j2_ut_van_rib, rob, 0); ret = j2_mcy(Pt6, ut, mull)(wir_r, von, sut, c3__noun, dox, gen); @@ -37,8 +37,8 @@ return ret; } - static u2_noun - _fire_each(u2_wire wir_r, + static u2_noun + _fire_each(u2_wire wir_r, u2_noun van, u2_noun vet, u2_noun typ, @@ -49,7 +49,7 @@ if ( (u2_no == u2_dust(typ)) || (c3__core != u2_h(typ)) ) { return u2_bl_error(wir_r, "fire-core"); - } else if + } else if ( (u2_no == u2_as_cell(u2_t(typ), &p_typ, &q_typ)) || (u2_no == u2_as_trel(q_typ, &pq_typ, &qq_typ, &rq_typ)) || (u2_no == u2_as_cell(gat, &h_gat, &t_gat)) ) @@ -124,7 +124,7 @@ } } u2_noun // produce - j2_mcx(Pt6, ut, fire)(u2_wire wir_r, + j2_mcx(Pt6, ut, fire)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun hag) // retain @@ -136,29 +136,29 @@ u2_noun i_hag = u2_h(hag); u2_noun pi_hag = u2_h(i_hag); u2_noun qi_hag = u2_t(i_hag); - + if ( c3__elm == u2_h(qi_hag) ) { u2_noun qqi_hag = u2_t(qi_hag); - + if ( u2_yes == u2_dust(qqi_hag) && (u2_nul == u2_h(qqi_hag)) && - (_1 == u2_t(qqi_hag)) ) + (_1 == u2_t(qqi_hag)) ) { return u2_rx(wir_r, pi_hag); } } } - } + } return u2_bc(wir_r, c3__hold, _fire_in(wir_r, van, vet, hag)); } /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fire)[]; u2_noun // transfer - j2_mc(Pt6, ut, fire)(u2_wire wir_r, + j2_mc(Pt6, ut, fire)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, hag, van; @@ -175,7 +175,7 @@ u2_weak // transfer j2_mci(Pt6, ut, fire)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun hag) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "fire"); @@ -190,7 +190,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, fire)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, fire)[0].xip = xip; } @@ -228,7 +228,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fire)[] = { { ".2", c3__hevy, j2_mc(Pt6, ut, fire), Tier6_b, u2_none, u2_none }, { } diff --git a/gen164/6/ut_firm.c b/gen164/6/ut_firm.c index 012d3c141..b62bdadfd 100644 --- a/gen164/6/ut_firm.c +++ b/gen164/6/ut_firm.c @@ -8,7 +8,7 @@ /* logic */ u2_noun // transfer - j2_mcx(Pt6, ut, firm)(u2_wire wir_r, + j2_mcx(Pt6, ut, firm)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun dib) // retain @@ -18,7 +18,7 @@ if ( u2_no == u2_dust(sut) ) switch ( sut ) { default: return u2_bl_bail(wir_r, c3__fail); - case c3__noun: + case c3__noun: { return u2_yes; } @@ -80,7 +80,7 @@ return u2_or(j2_mcx(Pt6, ut, firm)(wir_r, van, p_sut, dib), j2_mcx(Pt6, ut, firm)(wir_r, van, q_sut, dib)); } - case c3__hold: + case c3__hold: { u2_noun goy = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); u2_noun ret = j2_mcx(Pt6, ut, firm)(wir_r, van, goy, dib); @@ -93,11 +93,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, firm)[]; u2_noun // transfer - j2_mc(Pt6, ut, firm)(u2_wire wir_r, + j2_mc(Pt6, ut, firm)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, dib, van; @@ -114,7 +114,7 @@ u2_weak // transfer j2_mci(Pt6, ut, firm)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun dib) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "firm"); @@ -129,7 +129,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, firm)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, firm)[0].xip = xip; } @@ -197,10 +197,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, firm)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, firm), + { ".2", c3__hevy, + j2_mc(Pt6, ut, firm), Tier6_b, u2_none, u2_none, j2_mck(Pt6, ut, firm), c3__firm, diff --git a/gen164/6/ut_fish.c b/gen164/6/ut_fish.c index aea5ae591..33d3f34e5 100644 --- a/gen164/6/ut_fish.c +++ b/gen164/6/ut_fish.c @@ -69,7 +69,7 @@ return u2_bl_bail(wir_r, c3__fail); } else { return u2_bt - (wir_r, _5, + (wir_r, _5, u2_bc(wir_r, _1, u2_rx(wir_r, p_sut)), u2_bc(wir_r, _0, u2_rx(wir_r, axe))); } @@ -77,7 +77,7 @@ case c3__face: { if ( (u2_no == u2_as_trel(sut, 0, &p_sut, &q_sut)) ) { return u2_bl_bail(wir_r, c3__fail); - } else { + } else { return _fish_in(wir_r, van, q_sut, axe, vit); } } @@ -95,7 +95,7 @@ return pro; } - } + } case c3__hold: { p_sut = u2_t(sut); { @@ -123,7 +123,7 @@ } } u2_noun // transfer - j2_mcx(Pt6, ut, fish)(u2_wire wir_r, + j2_mcx(Pt6, ut, fish)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_atom axe) // retain @@ -134,11 +134,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fish)[]; u2_noun // transfer - j2_mc(Pt6, ut, fish)(u2_wire wir_r, + j2_mc(Pt6, ut, fish)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, axe, van; @@ -156,7 +156,7 @@ u2_weak // transfer j2_mci(Pt6, ut, fish)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun axe) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "fish"); @@ -171,7 +171,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, fish)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, fish)[0].xip = xip; } @@ -239,10 +239,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fish)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, fish), + { ".2", c3__hevy, + j2_mc(Pt6, ut, fish), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, fish), c3__fish, diff --git a/gen164/6/ut_fuse.c b/gen164/6/ut_fuse.c index fe82132f2..67375f09c 100644 --- a/gen164/6/ut_fuse.c +++ b/gen164/6/ut_fuse.c @@ -49,7 +49,7 @@ if ( u2_no == u2_dust(sut) ) switch ( sut ) { default: return u2_bl_bail(wir_r, c3__fail); - case c3__noun: + case c3__noun: { return u2_rx(wir_r, ref); } @@ -98,7 +98,7 @@ } else return _fuse_in(wir_r, van, ref, sut, bix); } - case c3__core: + case c3__core: { return _fuse_repo(wir_r, van, sut, ref, bix); } @@ -106,7 +106,7 @@ { u2_noun foz = _fuse_in(wir_r, van, q_sut, ref, bix); u2_noun ret; - + if ( u2_no == j2_mcy(Pt6, ut, firm)(wir_r, van, foz, p_sut) ) { ret = c3__void; } else { @@ -158,7 +158,7 @@ } u2_noun // transfer - j2_mcx(Pt6, ut, fuse)(u2_wire wir_r, + j2_mcx(Pt6, ut, fuse)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun ref) // retain @@ -168,11 +168,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fuse)[]; u2_noun // transfer - j2_mc(Pt6, ut, fuse)(u2_wire wir_r, + j2_mc(Pt6, ut, fuse)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, ref, van; @@ -189,7 +189,7 @@ u2_weak // transfer j2_mci(Pt6, ut, fuse)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun ref) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "fuse"); @@ -204,7 +204,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, fuse)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, fuse)[0].xip = xip; } @@ -272,10 +272,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, fuse)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, fuse), + { ".2", c3__hevy, + j2_mc(Pt6, ut, fuse), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, fuse), c3__fuse, diff --git a/gen164/6/ut_gain.c b/gen164/6/ut_gain.c index 46197303b..4d0b13ae0 100644 --- a/gen164/6/ut_gain.c +++ b/gen164/6/ut_gain.c @@ -31,14 +31,14 @@ } static u2_noun // produce - _gain_in(u2_wire wir_r, + _gain_in(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gen) // retain { u2_noun p_gen, q_gen; - if ( u2_no == u2_dust(gen) ) { + if ( u2_no == u2_dust(gen) ) { return u2_rx(wir_r, sut); } else switch ( u2_h(gen) ) { default: return u2_rx(wir_r, sut); @@ -75,7 +75,7 @@ } } u2_noun // transfer - j2_mcx(Pt6, ut, gain)(u2_wire wir_r, + j2_mcx(Pt6, ut, gain)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gen) // retain @@ -85,11 +85,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, gain)[]; u2_noun // transfer - j2_mc(Pt6, ut, gain)(u2_wire wir_r, + j2_mc(Pt6, ut, gain)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, gen, van; @@ -106,7 +106,7 @@ u2_weak // transfer j2_mci(Pt6, ut, gain)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun gen) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "gain"); @@ -121,7 +121,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, gain)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, gain)[0].xip = xip; } @@ -159,7 +159,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, gain)[] = { // Dead for the moment because wtts behavior is wrong & bore is not // available. diff --git a/gen164/6/ut_heal.c b/gen164/6/ut_heal.c index 4ad7bc9e6..54a94671c 100644 --- a/gen164/6/ut_heal.c +++ b/gen164/6/ut_heal.c @@ -15,7 +15,7 @@ _heal_by(u2_wire wir_r, u2_noun van, u2_noun sut, - u2_noun qog, + u2_noun qog, u2_noun ref) { u2_noun p_sut, q_sut; @@ -153,7 +153,7 @@ case c3__hold: { if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, sut)) ) { return c3__void; - } + } else { u2_noun zoc = j2_mcc(Pt4, in, put)(wir_r, gil, sut); u2_type rep = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); @@ -198,11 +198,11 @@ return ret; } } - + /* functions */ u2_noun // transfer - j2_mcx(Pt6, ut, heal)(u2_wire wir_r, + j2_mcx(Pt6, ut, heal)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun qog, // retain @@ -214,19 +214,19 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, heal)[]; u2_noun // transfer - j2_mc(Pt6, ut, heal)(u2_wire wir_r, + j2_mc(Pt6, ut, heal)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, sut, qog, axe, ref; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &qog, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &qog, u2_cv_sam_6, &axe, u2_cv_sam_7, &ref, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_no == u2_stud(axe)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) @@ -253,14 +253,14 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, u2_cv_sam_2, u2_rx(wir_r, qog), + u2_weak cor = u2_rl_molt(wir_r, gat, u2_cv_sam_2, u2_rx(wir_r, qog), u2_cv_sam_6, u2_rx(wir_r, axe), u2_cv_sam_7, u2_rx(wir_r, ref), 0); if ( (u2_none == j2_mcj(Pt6, ut, heal)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, heal)[0].xip = xip; } @@ -319,10 +319,10 @@ { u2_noun sut, qog, axe, ref, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &qog, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &qog, u2_cv_sam_6, &axe, u2_cv_sam_7, &ref, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -330,18 +330,18 @@ } else { return u2_rq (wir_r, u2_rx(wir_r, qog), - u2_rx(wir_r, sut), - u2_rx(wir_r, axe), + u2_rx(wir_r, sut), + u2_rx(wir_r, axe), u2_rx(wir_r, ref)); } } /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, heal)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, heal), + { ".2", c3__hevy, + j2_mc(Pt6, ut, heal), Tier6_b, u2_none, u2_none, j2_mck(Pt6, ut, heal), c3__heal, diff --git a/gen164/6/ut_lose.c b/gen164/6/ut_lose.c index 22f876585..82e48109a 100644 --- a/gen164/6/ut_lose.c +++ b/gen164/6/ut_lose.c @@ -31,14 +31,14 @@ } static u2_noun // produce - _lose_in(u2_wire wir_r, + _lose_in(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gen) // retain { u2_noun p_gen, q_gen; - if ( u2_no == u2_dust(gen) ) { + if ( u2_no == u2_dust(gen) ) { return u2_rx(wir_r, sut); } else switch ( u2_h(gen) ) { default: return u2_rx(wir_r, sut); @@ -75,7 +75,7 @@ } } u2_noun // transfer - j2_mcx(Pt6, ut, lose)(u2_wire wir_r, + j2_mcx(Pt6, ut, lose)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gen) // retain @@ -85,11 +85,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, lose)[]; u2_noun // transfer - j2_mc(Pt6, ut, lose)(u2_wire wir_r, + j2_mc(Pt6, ut, lose)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, gen, van; @@ -106,7 +106,7 @@ u2_weak // transfer j2_mci(Pt6, ut, lose)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun gen) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "lose"); @@ -121,7 +121,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, lose)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, lose)[0].xip = xip; } @@ -159,7 +159,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, lose)[] = { // Dead for the moment because wtts behavior is wrong & bore is not // available. diff --git a/gen164/6/ut_mint.c b/gen164/6/ut_mint.c index 7051ef8ce..5ae1a6d99 100644 --- a/gen164/6/ut_mint.c +++ b/gen164/6/ut_mint.c @@ -7,33 +7,33 @@ /* logic */ - static u2_noun + static u2_noun _mint_in(u2_wire, u2_noun, u2_noun, u2_noun, u2_noun); static u2_noun _mint_bean(u2_wire wir_r) { - return u2_bt(wir_r, c3__fork, + return u2_bt(wir_r, c3__fork, u2_bq(wir_r, c3__cube, _0, c3__atom, 'f'), u2_bq(wir_r, c3__cube, _1, c3__atom, 'f')); } static u2_bean - _mint_vet(u2_wire wir_r, + _mint_vet(u2_wire wir_r, u2_noun van) { // u2_bean vet = u2_bn_hook(wir_r, van, "vet"); u2_bean vet = u2_frag(j2_ut_van_vet, van); switch ( vet ) { - case u2_no: + case u2_no: case u2_yes: return vet; - default: return u2_bl_bail(wir_r, c3__fail); + default: return u2_bl_bail(wir_r, c3__fail); } } static u2_noun // produce - _mint_core(u2_wire wir_r, + _mint_core(u2_wire wir_r, u2_noun pac, // submit u2_noun con) // submit { @@ -55,11 +55,11 @@ if ( u2_yes == u2_h(q_pok) ) { u2_noun pq_pok = u2_t(q_pok); - ret = u2_bc(wir_r, + ret = u2_bc(wir_r, u2_rx(wir_r, p_pok), u2_bc(wir_r, u2_nul, u2_bc(wir_r, - u2_bc(wir_r, + u2_bc(wir_r, u2_rx(wir_r, pq_pok), u2_bt(wir_r, c3__elm, u2_nul, _1)), u2_nul))); @@ -75,7 +75,7 @@ u2_rz(wir_r, pok); return ret; } - + static u2_noun // produce _mint_cond(u2_wire wir_r, u2_noun pex, // submit @@ -84,13 +84,13 @@ { if ( _1 == u2_h(pex) ) { if ( _0 == u2_t(pex) ) { - u2_rz(wir_r, pex); + u2_rz(wir_r, pex); u2_rz(wir_r, woq); return yom; - } + } else if ( _1 == u2_t(pex) ) { - u2_rz(wir_r, pex); + u2_rz(wir_r, pex); u2_rz(wir_r, yom); return woq; @@ -119,7 +119,7 @@ u2_noun typ) // submit { if ( (u2_yes == _mint_vet(wir_r, van)) && - (u2_no == j2_mcy(Pt6, ut, nest)(wir_r, van, gol, u2_yes, typ)) ) + (u2_no == j2_mcy(Pt6, ut, nest)(wir_r, van, gol, u2_yes, typ)) ) { // u2_noun dun = j2_mcy(Pt6, ut, dunq)(wir_r, van, "need", gol); // u2_noun niz = j2_mcy(Pt6, ut, dunq)(wir_r, van, "have", typ); @@ -180,7 +180,7 @@ u2_noun q_zil = u2_t(zil); u2_noun wip = j2_mcy(Pt6, ut, tock) (wir_r, van, sut, pi_mew, p_zil, rag); - + u2_rz(wir_r, rag); rag = u2_rx(wir_r, u2_t(wip)); @@ -204,12 +204,12 @@ u2_noun gen) { u2_noun von; - + switch ( tov ) { default: return u2_bl_bail(wir_r, c3__fail); - case u2_yes: + case u2_yes: von = u2_rx(wir_r, van); break; - case u2_no: + case u2_no: von = u2_bn_molt(wir_r, van, j2_ut_van_vet, u2_no, 0); break; } { @@ -223,7 +223,7 @@ } static u2_noun // produce - _mint_bake(u2_wire wir_r, + _mint_bake(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun dab) // retain @@ -232,12 +232,12 @@ return _0; } else { - u2_noun n_dab, l_dab, r_dab; - + u2_noun n_dab, l_dab, r_dab; + u2_as_trel(dab, &n_dab, &l_dab, &r_dab); if ( u2_no == u2_dust(n_dab) ) { return u2_bl_bail(wir_r, c3__fail); - } + } else { u2_noun qn_dab = u2_t(n_dab); u2_noun vad; @@ -275,7 +275,7 @@ } } - static u2_noun + static u2_noun _mint_grow(u2_wire wir_r, u2_noun van, u2_noun sut, @@ -289,19 +289,19 @@ u2_noun q_dan = u2_t(dan); u2_noun toc = _mint_core (wir_r, u2_rx(wir_r, p_dan), - u2_bt(wir_r, c3__gold, - u2_rx(wir_r, p_dan), + u2_bt(wir_r, c3__gold, + u2_rx(wir_r, p_dan), u2_bc(wir_r, u2_nul, u2_rx(wir_r, dab)))); u2_noun dez = _mint_bake(wir_r, van, toc, dab); u2_noun zod = u2_bc(wir_r, 1, dez); u2_noun cot = _mint_core (wir_r, u2_rx(wir_r, p_dan), - u2_bt(wir_r, mel, - u2_rx(wir_r, p_dan), - u2_bc(wir_r, u2_rx(wir_r, dez), + u2_bt(wir_r, mel, + u2_rx(wir_r, p_dan), + u2_bc(wir_r, u2_rx(wir_r, dez), u2_rx(wir_r, dab)))); u2_noun ret = u2_bc - (wir_r, + (wir_r, _mint_nice(wir_r, van, gol, cot), j2_mby(Pt6, cons)(wir_r, zod, q_dan)); @@ -317,10 +317,10 @@ u2_noun van, // retain u2_noun loc) // retain { - u2_noun mol = u2_bc(wir_r, 'o', u2_rx(wir_r, loc)); + u2_noun mol = u2_bc(wir_r, 'o', u2_rx(wir_r, loc)); u2_noun sho = u2_bn_hook(wir_r, van, "show"); u2_noun ret = u2_bn_molt(wir_r, sho, u2_cv_sam, mol, 0); - + u2_rz(wir_r, mol); u2_rz(wir_r, sho); @@ -330,7 +330,7 @@ # define _mint_used(wir_r) static u2_noun // produce - _mint_in(u2_wire wir_r, + _mint_in(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gol, // retain @@ -339,11 +339,11 @@ u2_noun p_gen, q_gen, r_gen; u2_noun ret; - if ( (c3__void == sut) && + if ( (c3__void == sut) && !((u2_yes == u2_dust(gen)) && (c3__zpcb == u2_h(gen))) ) { if ( (u2_no == _mint_vet(wir_r, van)) - || ((u2_yes == u2_dust(gen)) && + || ((u2_yes == u2_dust(gen)) && ((c3__zpfs == u2_h(gen)) || (c3__zpzp == u2_h(gen)))) ) { return u2_bt(wir_r, c3__void, _0, _0); @@ -361,7 +361,7 @@ u2_rl_lose(wir_r, rex); return ret; - } + } else if ( u2_yes == u2_dust(u2_h(gen)) ) { _mint_used(wir_r); { @@ -401,7 +401,7 @@ return ret; } - + case c3__bcpt: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); _mint_used(wir_r); { @@ -457,7 +457,7 @@ ret = u2_bc (wir_r, j2_mby(Pt6, fork)(wir_r, u2_h(hiq), u2_h(ran)), - _mint_cond(wir_r, duy, + _mint_cond(wir_r, duy, u2_rx(wir_r, u2_t(hiq)), u2_rx(wir_r, u2_t(ran)))); @@ -493,7 +493,7 @@ u2_noun typ = _mint_nice(wir_r, van, gol, _mint_bean(wir_r)); return u2_bc - (wir_r, + (wir_r, typ, u2_bt(wir_r, _5, _mint_corn(wir_r, van, sut, p_gen), _mint_corn(wir_r, van, sut, q_gen))); @@ -504,7 +504,7 @@ u2_noun typ = _mint_nice(wir_r, van, gol, _mint_bean(wir_r)); return u2_bc - (wir_r, + (wir_r, typ, u2_bc(wir_r, _3, _mint_corn(wir_r, van, sut, p_gen))); } @@ -515,10 +515,10 @@ u2_noun sam = _mint_in(wir_r, van, sut, tom, p_gen); ret = u2_bc - (wir_r, + (wir_r, _mint_nice(wir_r, van, gol, tom), u2_bc(wir_r, _11, u2_rx(wir_r, u2_t(sam)))); - + u2_rz(wir_r, sam); return ret; } @@ -529,21 +529,21 @@ u2_noun sam = _mint_in(wir_r, van, sut, tom, p_gen); ret = u2_bc - (wir_r, + (wir_r, _mint_nice(wir_r, van, gol, tom), u2_bc(wir_r, _4, u2_rx(wir_r, u2_t(sam)))); - + u2_rz(wir_r, sam); return ret; } case c3__dtzz: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); _mint_used(wir_r); { - u2_noun boc = (u2_no == u2_stud(q_gen)) + u2_noun boc = (u2_no == u2_stud(q_gen)) ? c3__noun : u2_bc(wir_r, c3__atom, u2_rx(wir_r, p_gen)); u2_noun typ = j2_mby(Pt6, cube)(wir_r, q_gen, boc); - u2_noun ret = + u2_noun ret = u2_bc(wir_r, _mint_nice(wir_r, van, gol, typ), u2_bc(wir_r, _1, u2_rx(wir_r, q_gen))); @@ -555,7 +555,7 @@ _mint_used(wir_r); { return u2_bc - (wir_r, + (wir_r, _mint_nice(wir_r, van, gol, c3__noun), u2_bt(wir_r, _2, _mint_corn(wir_r, van, sut, p_gen), _mint_corn(wir_r, van, sut, q_gen))); @@ -564,7 +564,7 @@ _mint_used(wir_r); { u2_noun typ = j2_mcy(Pt6, ut, play)(wir_r, van, sut, gen); - u2_noun ret = + u2_noun ret = u2_bc(wir_r, _mint_nice(wir_r, van, gol, typ), u2_bc(wir_r, _1, u2_rx(wir_r, q_gen))); @@ -605,7 +605,7 @@ _mint_used(wir_r); { u2_noun vat = _mint_in(wir_r, van, sut, gol, q_gen); - + ret = u2_bc (wir_r, j2_mcy(Pt6, ut, conk)(wir_r, van, u2h(vat), p_gen), @@ -618,7 +618,7 @@ _mint_used(wir_r); { u2_noun vat = _mint_in(wir_r, van, sut, gol, q_gen); - + ret = u2_bc (wir_r, j2_mcy(Pt6, ut, conk)(wir_r, van, u2h(vat), p_gen), @@ -647,7 +647,7 @@ u2z(wim); } ret = u2_bc(wir_r, u2_rx(wir_r, p_nef), fom); - + u2_rz(wir_r, nef); return ret; } @@ -673,10 +673,10 @@ u2_noun q_dov = u2_t(dov); ret = u2_bc - (wir_r, u2_rx(wir_r, p_dov), + (wir_r, u2_rx(wir_r, p_dov), j2_mbc(Pt6, comb)(wir_r, q_fid, q_dov)); - u2_rl_lose(wir_r, fid); + u2_rl_lose(wir_r, fid); u2_rl_lose(wir_r, dov); return ret; } @@ -713,7 +713,7 @@ : u2_bt(wir_r, _9, u2_rx(wir_r, pq_lar), u2_rx(wir_r, q_yom))); - + u2_rz(wir_r, yom); u2_rz(wir_r, mew); u2_rz(wir_r, lar); @@ -724,7 +724,7 @@ _mint_used(wir_r); { u2_noun ruf = u2_bt - (wir_r, c3__clhp, + (wir_r, c3__clhp, u2_bc(wir_r, u2_nul, _1), u2_rx(wir_r, p_gen)); u2_noun ret = _mint_grow(wir_r, van, sut, gol, c3__zinc, ruf, q_gen); @@ -756,7 +756,7 @@ _mint_used(wir_r); { u2_noun ruf = u2_bt - (wir_r, c3__clhp, + (wir_r, c3__clhp, u2_bc(wir_r, u2_nul, _1), u2_rx(wir_r, p_gen)); u2_noun ret = _mint_grow(wir_r, van, sut, gol, c3__iron, ruf, q_gen); @@ -773,7 +773,7 @@ u2_bl_push(wir_r, u2_bc(wir_r, c3__mean, dug)); { ret = _mint_in(wir_r, van, sut, gol, q_gen); - } + } u2_bl_drop(wir_r); u2_rz(wir_r, typ); @@ -784,17 +784,17 @@ { u2_noun hum = _mint_in(wir_r, van, sut, gol, q_gen); u2_noun bez; - + if ( u2_yes == u2_stud(p_gen) ) { bez = u2_rx(wir_r, p_gen); } else { bez = u2_bc(wir_r, u2_rx(wir_r, u2_h(p_gen)), _mint_corn(wir_r, van, sut, u2_t(p_gen))); } - ret = u2_bc(wir_r, + ret = u2_bc(wir_r, u2_rx(wir_r, u2_h(hum)), u2_bt(wir_r, _10, bez, u2_rx(wir_r, u2_t(hum)))); - + u2_rl_lose(wir_r, hum); return ret; } @@ -811,9 +811,9 @@ _mint_used(wir_r); { return u2_bc - (wir_r, - _mint_nice(wir_r, van, - gol, + (wir_r, + _mint_nice(wir_r, van, + gol, j2_mcy(Pt6, ut, play)(wir_r, van, sut, p_gen)), u2_bc(wir_r, 1, u2_rx(wir_r, q_gen))); } @@ -824,7 +824,7 @@ u2_noun hum = _mint_in(wir_r, van, sut, gol, q_gen); u2_noun bez = u2_bt(wir_r, c3__spot, _1, u2_rx(wir_r, p_gen)); - ret = u2_bc(wir_r, + ret = u2_bc(wir_r, u2_rx(wir_r, u2_h(hum)), u2_bt(wir_r, _10, bez, u2_rx(wir_r, u2_t(hum)))); @@ -893,7 +893,7 @@ } u2_noun // produce - j2_mcx(Pt6, ut, mint)(u2_wire wir_r, + j2_mcx(Pt6, ut, mint)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gol, @@ -904,18 +904,18 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, mint)[]; u2_noun // produce - j2_mc(Pt6, ut, mint)(u2_wire wir_r, + j2_mc(Pt6, ut, mint)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, gol, gen, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &gol, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &gol, u2_cv_sam_3, &gen, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -928,7 +928,7 @@ u2_weak // produce j2_mci(Pt6, ut, mint)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun gol, // retain u2_noun gen) // retain { @@ -940,14 +940,14 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam_2, u2_rx(wir_r, gol), - u2_cv_sam_3, u2_rx(wir_r, gen), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam_2, u2_rx(wir_r, gol), + u2_cv_sam_3, u2_rx(wir_r, gen), 0); if ( (u2_none == j2_mcj(Pt6, ut, mint)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, mint)[0].xip = xip; } @@ -1008,9 +1008,9 @@ { u2_noun sut, gol, gen, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &gol, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &gol, u2_cv_sam_3, &gen, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -1027,10 +1027,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, mint)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, mint), + { ".2", c3__hevy, + j2_mc(Pt6, ut, mint), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, mint), c3__mint, diff --git a/gen164/6/ut_moot.c b/gen164/6/ut_moot.c index 0c1b9657e..ec1bf0538 100644 --- a/gen164/6/ut_moot.c +++ b/gen164/6/ut_moot.c @@ -90,7 +90,7 @@ { if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, sut)) ) { return u2_yes; - } + } else { u2_noun zoc = j2_mcc(Pt4, in, put)(wir_r, gil, sut); u2_type fop = j2_mcy(Pt6, ut, rest)(wir_r, van, sut, p_sut); @@ -106,11 +106,11 @@ } - extern u2_ho_jet + extern u2_ho_jet j2_mbj(Pt6, ut)[]; u2_noun // transfer - j2_mcy(Pt6, ut, moot)(u2_wire wir_r, + j2_mcy(Pt6, ut, moot)(u2_wire wir_r, u2_noun van, // retain u2_noun sut) // retain { @@ -118,7 +118,7 @@ } u2_noun // transfer - j2_mc(Pt6, ut, moot)(u2_wire wir_r, + j2_mc(Pt6, ut, moot)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut; diff --git a/gen164/6/ut_mull.c b/gen164/6/ut_mull.c index 79eea6a81..0a9f73c5f 100644 --- a/gen164/6/ut_mull.c +++ b/gen164/6/ut_mull.c @@ -11,21 +11,21 @@ _mull_in(u2_wire, u2_noun, u2_noun, u2_noun, u2_noun, u2_noun); static u2_bean - _mull_vet(u2_wire wir_r, + _mull_vet(u2_wire wir_r, u2_noun van) { // u2_bean vet = u2_bn_hook(wir_r, van, "vet"); u2_bean vet = u2_frag(j2_ut_van_vet, van); switch ( vet ) { - case u2_no: + case u2_no: case u2_yes: return vet; - default: return u2_bl_bail(wir_r, c3__fail); + default: return u2_bl_bail(wir_r, c3__fail); } } static u2_noun // produce - _mull_core(u2_wire wir_r, + _mull_core(u2_wire wir_r, u2_noun pac, // submit u2_noun con) // submit { @@ -39,7 +39,7 @@ static u2_noun _mull_bean(u2_wire wir_r) { - return u2_bt(wir_r, c3__fork, + return u2_bt(wir_r, c3__fork, u2_bq(wir_r, c3__cube, _0, c3__atom, 'f'), u2_bq(wir_r, c3__cube, _1, c3__atom, 'f')); } @@ -49,10 +49,10 @@ u2_noun van, // retain u2_noun loc) // retain { - u2_noun mol = u2_bc(wir_r, 'o', u2_rx(wir_r, loc)); + u2_noun mol = u2_bc(wir_r, 'o', u2_rx(wir_r, loc)); u2_noun sho = u2_bn_hook(wir_r, van, "show"); u2_noun ret = u2_bn_molt(wir_r, sho, u2_cv_sam, mol, 0); - + u2_rz(wir_r, mol); u2_rz(wir_r, sho); @@ -70,11 +70,11 @@ if ( u2_yes == u2_h(q_pok) ) { u2_noun pq_pok = u2_t(q_pok); - ret = u2_bc(wir_r, + ret = u2_bc(wir_r, u2_rx(wir_r, p_pok), u2_bc(wir_r, u2_nul, u2_bc(wir_r, - u2_bc(wir_r, + u2_bc(wir_r, u2_rx(wir_r, pq_pok), u2_bt(wir_r, c3__elm, u2_nul, _1)), u2_nul))); @@ -90,7 +90,7 @@ u2_rz(wir_r, pok); return ret; } - + static u2_noun // produce _mull_coke(u2_wire wir_r, u2_noun nug) // submit @@ -114,7 +114,7 @@ static u2_noun _mull_doke(u2_wire wir_r, u2_noun van, - u2_noun sut, + u2_noun sut, u2_noun gen) { u2_noun fug = j2_mcy(Pt6, ut, mint)(wir_r, van, sut, c3__noun, gen); @@ -143,19 +143,19 @@ } static void - _mull_bake(u2_wire wir_r, + _mull_bake(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun dox, // retain u2_noun dab) // retain { if ( u2_nul != dab ) { - u2_noun n_dab, l_dab, r_dab; - + u2_noun n_dab, l_dab, r_dab; + u2_as_trel(dab, &n_dab, &l_dab, &r_dab); if ( u2_no == u2_dust(n_dab) ) { u2_bl_bail(wir_r, c3__fail); - } + } else { u2_noun qn_dab = u2_t(n_dab); u2_noun vad; @@ -190,7 +190,7 @@ } } - static u2_noun + static u2_noun _mull_grow(u2_wire wir_r, u2_noun van, u2_noun sut, @@ -205,24 +205,24 @@ u2_noun q_dan = u2_t(dan); u2_noun p_toc = _mull_core (wir_r, u2_rx(wir_r, p_dan), - u2_bt(wir_r, c3__gold, - u2_rx(wir_r, p_dan), + u2_bt(wir_r, c3__gold, + u2_rx(wir_r, p_dan), u2_bc(wir_r, u2_nul, u2_rx(wir_r, dab)))); u2_noun q_toc = _mull_core (wir_r, u2_rx(wir_r, q_dan), - u2_bt(wir_r, c3__gold, - u2_rx(wir_r, q_dan), + u2_bt(wir_r, c3__gold, + u2_rx(wir_r, q_dan), u2_bc(wir_r, u2_nul, u2_rx(wir_r, dab)))); u2_noun p_ret = _mull_core (wir_r, u2_rx(wir_r, p_dan), u2_bt(wir_r, u2_rx(wir_r, mel), - u2_rx(wir_r, p_dan), + u2_rx(wir_r, p_dan), u2_bc(wir_r, u2_bc(wir_r, u2_nul, u2_nul), u2_rx(wir_r, dab)))); u2_noun q_ret = _mull_core (wir_r, u2_rx(wir_r, q_dan), u2_bt(wir_r, u2_rx(wir_r, mel), - u2_rx(wir_r, q_dan), + u2_rx(wir_r, q_dan), u2_bc(wir_r, u2_bc(wir_r, u2_nul, u2_nul), u2_rx(wir_r, dab)))); u2_noun ret = u2_bc(wir_r, _mull_nice(wir_r, van, gol, p_ret), q_ret); @@ -242,7 +242,7 @@ u2_noun gol, // retain u2_noun typ) // submit { - return u2_bc(wir_r, _mull_nice(wir_r, van, gol, u2_rx(wir_r, typ)), + return u2_bc(wir_r, _mull_nice(wir_r, van, gol, u2_rx(wir_r, typ)), typ); } @@ -274,7 +274,7 @@ if ( u2_sing(u2_h(cuf), u2_h(dof)) ) { u2_bl_error(wir_r, "mull-bonk-a"); } - + u2_rz(wir_r, p_yom); p_yom = u2_rx(wir_r, u2_t(cuf)); @@ -293,7 +293,7 @@ # define _mull_used(wir_r) static u2_noun // produce - _mull_in(u2_wire wir_r, + _mull_in(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gol, // retain @@ -311,7 +311,7 @@ u2_rl_lose(wir_r, rex); return ret; - } + } else if ( u2_yes == u2_dust(u2_h(gen)) ) { _mull_used(wir_r); { @@ -349,7 +349,7 @@ return ret; } - + case c3__bcpt: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); _mull_used(wir_r); { @@ -367,7 +367,7 @@ u2z(sep); u2z(pox); u2z(rex); - + return ret; } } @@ -385,7 +385,7 @@ u2_noun q_pov = j2_mcy(Pt6, ut, fish)(wir_r, van, q_waz, q_syx); if ( (u2_no == u2_sing(p_syx, q_syx)) || - (u2_no == u2_sing(p_pov, q_pov)) ) + (u2_no == u2_sing(p_pov, q_pov)) ) { return u2_bl_error(wir_r, "mull-bonk-b"); } @@ -410,10 +410,10 @@ u2_noun hiq, ran; u2_noun dis, dat; u2_noun ret; - + if ( c3__void == p_fex ) { - hiq = u2_bc(wir_r, - c3__void, + hiq = u2_bc(wir_r, + c3__void, (c3__void == q_fex) ? c3__void : j2_mcy(Pt6, ut, play)(wir_r, van, q_fex, q_gen)); @@ -423,8 +423,8 @@ else hiq = _mull_in(wir_r, van, p_fex, gol, q_fex, q_gen); if ( c3__void == p_wux ) { - ran = u2_bc(wir_r, - c3__void, + ran = u2_bc(wir_r, + c3__void, (c3__void == q_wux) ? c3__void : j2_mcy(Pt6, ut, play)(wir_r, van, q_wux, r_gen)); @@ -478,7 +478,7 @@ _mull_used(wir_r); { u2_noun vay = _mull_in(wir_r, van, sut, c3__noun, dox, p_gen); - + u2_rz(wir_r, vay); return _mull_both(wir_r, van, gol, _mull_bean(wir_r)); } @@ -487,7 +487,7 @@ { u2_noun wuq = c3__noun; u2_noun vay = _mull_in(wir_r, van, sut, wuq, dox, p_gen); - + u2_rz(wir_r, vay); return _mull_both(wir_r, van, gol, wuq); } @@ -496,7 +496,7 @@ { u2_noun wuq = u2_bc(wir_r, c3__atom, u2_blip); u2_noun vay = _mull_in(wir_r, van, sut, wuq, dox, p_gen); - + u2_rz(wir_r, vay); return _mull_both(wir_r, van, gol, wuq); } @@ -566,8 +566,8 @@ _mull_used(wir_r); { u2_noun vat = _mull_in(wir_r, van, sut, gol, dox, q_gen); - u2_noun ret = - u2_bc(wir_r, + u2_noun ret = + u2_bc(wir_r, j2_mcy(Pt6, ut, conk)(wir_r, van, u2_h(vat), p_gen), j2_mcy(Pt6, ut, conk)(wir_r, van, u2_t(vat), p_gen)); @@ -578,8 +578,8 @@ _mull_used(wir_r); { u2_noun vat = _mull_in(wir_r, van, sut, gol, dox, q_gen); - u2_noun ret = - u2_bc(wir_r, + u2_noun ret = + u2_bc(wir_r, j2_mcy(Pt6, ut, conk)(wir_r, van, u2_h(vat), p_gen), j2_mcy(Pt6, ut, conk)(wir_r, van, u2_t(vat), p_gen)); @@ -648,14 +648,14 @@ u2_noun q_vug = u2_t(vug); u2_noun pq_vug = u2_h(q_vug); u2_noun qq_vug = u2_t(q_vug); - + if ( u2_and(u2_sing(p_lar, p_vug), u2_sing(pq_lar, pq_vug)) ) { u2_bl_error(wir_r, "mull-bonk-e"); } { u2_noun mew = j2_mcy(Pt6, ut, snub)(wir_r, van, sut, q_gen); u2_noun yom = _mull_edit - (wir_r, van, sut, dox, mew, u2_rx(wir_r, qq_lar), + (wir_r, van, sut, dox, mew, u2_rx(wir_r, qq_lar), u2_rx(wir_r, qq_vug)); u2_noun von = u2_bn_molt(wir_r, van, j2_ut_van_vet, u2_no, 0); u2_noun p_ret = j2_mcy(Pt6, ut, fire)(wir_r, van, sut, u2_h(yom)); @@ -674,7 +674,7 @@ _mull_used(wir_r); { u2_noun ruf = u2_bt - (wir_r, c3__clhp, + (wir_r, c3__clhp, u2_bc(wir_r, u2_nul, _1), u2_rx(wir_r, p_gen)); u2_noun ret = _mull_grow @@ -707,7 +707,7 @@ _mull_used(wir_r); { u2_noun ruf = u2_bt - (wir_r, c3__clhp, + (wir_r, c3__clhp, u2_bc(wir_r, u2_nul, _1), u2_rx(wir_r, p_gen)); u2_noun ret = _mull_grow @@ -726,7 +726,7 @@ u2_bl_push(wir_r, u2_bc(wir_r, c3__mean, dug)); { ret = _mull_in(wir_r, van, sut, gol, dox, q_gen); - } + } u2_bl_drop(wir_r); u2_rz(wir_r, typ); @@ -796,9 +796,9 @@ } } } - + u2_bean // transfer - j2_mcx(Pt6, ut, mull)(u2_wire wir_r, + j2_mcx(Pt6, ut, mull)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gol, // retain @@ -817,19 +817,19 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, mull)[]; u2_noun // transfer - j2_mc(Pt6, ut, mull)(u2_wire wir_r, + j2_mc(Pt6, ut, mull)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, gol, dox, gen, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &gol, - u2_cv_sam_6, &dox, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &gol, + u2_cv_sam_6, &dox, u2_cv_sam_7, &gen, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -842,8 +842,8 @@ u2_weak // transfer j2_mci(Pt6, ut, mull)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain - u2_noun gol, // retain + u2_noun sut, // retain + u2_noun gol, // retain u2_noun dox, // retain u2_noun gen) // retain { @@ -855,15 +855,15 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam_2, u2_rx(wir_r, gol), - u2_cv_sam_6, u2_rx(wir_r, dox), - u2_cv_sam_7, u2_rx(wir_r, gen), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam_2, u2_rx(wir_r, gol), + u2_cv_sam_6, u2_rx(wir_r, dox), + u2_cv_sam_7, u2_rx(wir_r, gen), 0); if ( (u2_none == j2_mcj(Pt6, ut, mull)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, mull)[0].xip = xip; } @@ -924,27 +924,27 @@ { u2_noun sut, gol, dox, gen, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &gol, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &gol, u2_cv_sam_6, &dox, u2_cv_sam_7, &gen, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { return u2_none; } else { return u2_rq - (wir_r, u2_rx(wir_r, sut), - u2_rx(wir_r, gol), - u2_rx(wir_r, dox), + (wir_r, u2_rx(wir_r, sut), + u2_rx(wir_r, gol), + u2_rx(wir_r, dox), u2_rx(wir_r, gen)); } } - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, mull)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, mull), + { ".2", c3__hevy, + j2_mc(Pt6, ut, mull), Tier6_b, u2_none, u2_none, j2_mck(Pt6, ut, mull), c3__mull, diff --git a/gen164/6/ut_nest.c b/gen164/6/ut_nest.c index f97798236..5b50946fc 100644 --- a/gen164/6/ut_nest.c +++ b/gen164/6/ut_nest.c @@ -14,7 +14,7 @@ static u2_bean _nest_dext(u2_wire, u2_noun, u2_noun, u2_bean, u2_noun, u2_noun); - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, nest)[]; static u2_bean @@ -24,7 +24,7 @@ u2_bean tel, u2_noun ref, u2_noun dab, - u2_noun hem, + u2_noun hem, u2_noun gil) { if ( u2_nul == dab ) { @@ -53,7 +53,7 @@ } else { if ( (u2_no == u2_dust(qn_dab)) || (u2_no == u2_dust(qn_hem)) ) { return u2_bl_bail(wir_r, c3__fail); - } + } else switch ( u2_h(qn_dab) ) { default: return u2_bl_bail(wir_r, c3__exit); case c3__ash: { @@ -78,7 +78,7 @@ } } } - + static u2_bean _nest_cong(u2_wire wir_r, u2_noun van, @@ -122,14 +122,14 @@ u2_rl_lose(wir_r, hud); return u2_yes; - } + } else { u2_noun zoc = j2_mcc(Pt4, in, put)(wir_r, gil, hud); - u2_noun tus = u2_bt(wir_r, c3__core, - u2_rx(wir_r, qq_sut), + u2_noun tus = u2_bt(wir_r, c3__core, + u2_rx(wir_r, qq_sut), u2_rx(wir_r, q_sut)); - u2_noun fer = u2_bt(wir_r, c3__core, - u2_rx(wir_r, qq_ref), + u2_noun fer = u2_bt(wir_r, c3__core, + u2_rx(wir_r, qq_ref), u2_rx(wir_r, q_ref)); ret = _nest_cram(wir_r, van, tus, tel, fer, qrq_sut, qrq_ref, zoc); @@ -146,7 +146,7 @@ default: return u2_bl_bail(wir_r, c3__fail); case c3__gold: { - return + return u2_and(_nest_dext(wir_r, van, qq_sut, tel, qq_ref, gil), _nest_dext(wir_r, van, qq_ref, tel, qq_sut, gil)); } @@ -220,7 +220,7 @@ case c3__bull: { if ( (u2_no == u2_as_trel(sut, 0, &p_sut, &q_sut)) ) { return u2_bl_bail(wir_r, c3__fail); - } else { + } else { return _nest_dext(wir_r, van, q_sut, tel, ref, gil); } } @@ -258,7 +258,7 @@ case c3__face: { if ( (u2_no == u2_as_trel(sut, 0, &p_sut, &q_sut)) ) { return u2_bl_bail(wir_r, c3__fail); - } else { + } else { return _nest_dext(wir_r, van, q_sut, tel, ref, gil); } } @@ -275,9 +275,9 @@ } else switch ( u2_h(ref) ) { default: return _nest_sint(wir_r, van, sut, tel, ref, gil); - + case c3__atom: - case c3__cell: + case c3__cell: case c3__cube: case c3__core: break; @@ -286,10 +286,10 @@ return u2_or(_nest_dext(wir_r, van, p_sut, u2_no, ref, gil), _nest_dext(wir_r, van, q_sut, u2_no, ref, gil)); } - } + } case c3__hold: p_sut = u2_t(sut); { - u2_noun hud = u2_bc(wir_r, u2_rx(wir_r, sut), + u2_noun hud = u2_bc(wir_r, u2_rx(wir_r, sut), u2_rx(wir_r, ref)); if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, hud)) ) { @@ -370,7 +370,7 @@ static u2_bean _nest_sint(u2_wire wir_r, u2_noun van, - u2_noun sut, + u2_noun sut, u2_bean tel, u2_noun ref, u2_noun gil) @@ -426,11 +426,11 @@ _nest_dext(wir_r, van, sut, u2_no, q_ref, gil)); } else return u2_bl_bail(wir_r, c3__fail); - } + } case c3__hold: { p_ref = u2_t(ref); { - u2_noun hud = u2_bc(wir_r, u2_rx(wir_r, sut), + u2_noun hud = u2_bc(wir_r, u2_rx(wir_r, sut), u2_rx(wir_r, ref)); if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, hud)) ) { @@ -452,13 +452,13 @@ } } } - } + } } } } - + u2_bean // transfer - j2_mcx(Pt6, ut, nest)(u2_wire wir_r, + j2_mcx(Pt6, ut, nest)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_bean tel, // retain @@ -470,14 +470,14 @@ /* boilerplate */ u2_noun // transfer - j2_mc(Pt6, ut, nest)(u2_wire wir_r, + j2_mc(Pt6, ut, nest)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, tel, ref, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &tel, - u2_cv_sam_3, &ref, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &tel, + u2_cv_sam_3, &ref, + u2_cv_con, &van, 0)) || (u2_no == u2_stud(tel)) || (tel > 1) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) @@ -491,7 +491,7 @@ u2_weak // transfer j2_mci(Pt6, ut, nest)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_bean tel, // retain u2_noun ref) // retain { @@ -508,7 +508,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, nest)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, nest)[0].xip = xip; } @@ -562,10 +562,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, nest)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, nest), + { ".2", c3__hevy, + j2_mc(Pt6, ut, nest), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, nest), c3__nest, diff --git a/gen164/6/ut_park.c b/gen164/6/ut_park.c index d86f420eb..4a2d1298b 100644 --- a/gen164/6/ut_park.c +++ b/gen164/6/ut_park.c @@ -8,7 +8,7 @@ /* logic */ u2_bean // transfer - j2_mcx(Pt6, ut, park)(u2_wire wir_r, + j2_mcx(Pt6, ut, park)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun way, // retain @@ -39,7 +39,7 @@ case c3__gold: return u2_yes; case c3__lead: return u2_no; case c3__iron: return u2_no; - case c3__zinc: return + case c3__zinc: return u2_and(u2_not(u2_sing(_1, axe)), u2_sing(_2, j2_mbc(Pt3, cap)(wir_r, axe))); } @@ -50,7 +50,7 @@ case c3__gold: return u2_yes; case c3__lead: return u2_no; - case c3__iron: return + case c3__iron: return u2_and(u2_not(u2_sing(_1, axe)), u2_sing(_2, j2_mbc(Pt3, cap)(wir_r, axe))); case c3__zinc: return u2_no; @@ -63,18 +63,18 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, park)[]; u2_noun // transfer - j2_mc(Pt6, ut, park)(u2_wire wir_r, + j2_mc(Pt6, ut, park)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, way, axe, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, u2_cv_sam_3, &axe, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_no == u2_stud(axe)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) @@ -88,7 +88,7 @@ u2_bean j2_mci(Pt6, ut, park)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun way, // retain u2_noun axe) // retain { @@ -100,14 +100,14 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam_2, u2_rx(wir_r, way), - u2_cv_sam_3, u2_rx(wir_r, axe), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam_2, u2_rx(wir_r, way), + u2_cv_sam_3, u2_rx(wir_r, axe), 0); if ( (u2_none == j2_mcj(Pt6, ut, park)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, park)[0].xip = xip; } @@ -146,7 +146,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, park)[] = { { ".2", c3__hevy, j2_mc(Pt6, ut, park), Tier6_b, u2_none, u2_none }, { } diff --git a/gen164/6/ut_peek.c b/gen164/6/ut_peek.c index 13429dd44..2bc42ef3d 100644 --- a/gen164/6/ut_peek.c +++ b/gen164/6/ut_peek.c @@ -57,7 +57,7 @@ else { pro = j2_mcx(Pt6, ut, peek)(wir_r, van, q_sut, way, tap); } - u2_rl_lose(wir_r, tap); + u2_rl_lose(wir_r, tap); u2_rl_lose(wir_r, tip); return pro; @@ -77,7 +77,7 @@ u2_atom tap = j2_mbc(Pt3, mas)(wir_r, axe); if ( _3 == tip ) { - if ( u2_no == j2_mcy(Pt6, ut, park)(wir_r, van, sut, way, tap) ) + if ( u2_no == j2_mcy(Pt6, ut, park)(wir_r, van, sut, way, tap) ) { // u2_noun dun = j2_mcy(Pt6, ut, dunq)(wir_r, van, "type", sut); u2_noun waz = j2_mcy(Pt6, ut, shep) @@ -93,7 +93,7 @@ else { pro = c3__noun; } - u2_rl_lose(wir_r, tap); + u2_rl_lose(wir_r, tap); u2_rl_lose(wir_r, tip); return pro; @@ -127,12 +127,12 @@ return pro; } - } + } case c3__hold: { p_sut = u2_t(sut); if ( (u2_yes == j2_mcc(Pt4, in, has)(wir_r, gil, sut)) ) { return c3__void; - } + } else { u2_noun zoc = j2_mcc(Pt4, in, put)(wir_r, gil, sut); u2_type fop = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); @@ -148,7 +148,7 @@ } u2_noun // transfer - j2_mcx(Pt6, ut, peek)(u2_wire wir_r, + j2_mcx(Pt6, ut, peek)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun way, @@ -162,18 +162,18 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, peek)[]; u2_noun // transfer - j2_mc(Pt6, ut, peek)(u2_wire wir_r, + j2_mc(Pt6, ut, peek)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, way, axe, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, u2_cv_sam_3, &axe, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_no == u2_stud(axe)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) @@ -187,7 +187,7 @@ u2_weak // transfer j2_mci(Pt6, ut, peek)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun way, // retain u2_noun axe) // retain { @@ -199,14 +199,14 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam_2, u2_rx(wir_r, way), - u2_cv_sam_3, u2_rx(wir_r, axe), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam_2, u2_rx(wir_r, way), + u2_cv_sam_3, u2_rx(wir_r, axe), 0); if ( (u2_none == j2_mcj(Pt6, ut, peek)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, peek)[0].xip = xip; } @@ -264,9 +264,9 @@ { u2_noun sut, way, axe, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, u2_cv_sam_3, &axe, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -279,10 +279,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, peek)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, peek), + { ".2", c3__hevy, + j2_mc(Pt6, ut, peek), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, peek), c3__peek diff --git a/gen164/6/ut_play.c b/gen164/6/ut_play.c index b9ca263cb..bf88c34ab 100644 --- a/gen164/6/ut_play.c +++ b/gen164/6/ut_play.c @@ -15,13 +15,13 @@ static u2_noun // produce _play_bean(u2_wire wir_r) { - return u2_bt(wir_r, c3__fork, + return u2_bt(wir_r, c3__fork, u2_bq(wir_r, c3__cube, _0, c3__atom, 'f'), u2_bq(wir_r, c3__cube, _1, c3__atom, 'f')); } static u2_noun // produce - _play_core(u2_wire wir_r, + _play_core(u2_wire wir_r, u2_noun pac, // submit u2_noun con) // submit { @@ -39,10 +39,10 @@ u2_noun van, // retain u2_noun loc) // retain { - u2_noun mol = u2_bc(wir_r, 'o', u2_rx(wir_r, loc)); + u2_noun mol = u2_bc(wir_r, 'o', u2_rx(wir_r, loc)); u2_noun sho = u2_bn_hook(wir_r, van, "show"); u2_noun ret = u2_bn_molt(wir_r, sho, u2_cv_sam, mol, 0); - + u2_rz(wir_r, mol); u2_rz(wir_r, sho); @@ -60,11 +60,11 @@ if ( u2_yes == u2_h(q_pok) ) { u2_noun pq_pok = u2_t(q_pok); - ret = u2_bc(wir_r, + ret = u2_bc(wir_r, u2_rx(wir_r, p_pok), u2_bc(wir_r, u2_nul, u2_bc(wir_r, - u2_bc(wir_r, + u2_bc(wir_r, u2_rx(wir_r, pq_pok), u2_bt(wir_r, c3__elm, u2_nul, _1)), u2_nul))); @@ -80,7 +80,7 @@ u2_rz(wir_r, pok); return ret; } - + static u2_noun // produce _play_edit(u2_wire wir_r, u2_noun van, // retain @@ -98,7 +98,7 @@ u2_noun qi_mew = u2_t(i_mew); u2_noun laf = _play_in(wir_r, van, sut, qi_mew); u2_noun ruz = j2_mcy(Pt6, ut, tock)(wir_r, van, sut, pi_mew, laf, rag); - + u2_rz(wir_r, laf); u2_rz(wir_r, rag); rag = u2_rx(wir_r, u2_t(ruz)); @@ -109,7 +109,7 @@ } } - static u2_noun + static u2_noun _play_grow(u2_wire wir_r, u2_noun van, u2_noun sut, @@ -122,7 +122,7 @@ return _play_core (wir_r, dan, u2_bt(wir_r, u2_rx(wir_r, mel), - u2_rx(wir_r, dan), + u2_rx(wir_r, dan), u2_bc(wir_r, u2_bc(wir_r, u2_nul, u2_nul), u2_rx(wir_r, dab)))); } @@ -133,7 +133,7 @@ u2_noun sut, u2_noun gen); - static u2_noun + static u2_noun _play_x(u2_wire wir_r, u2_noun van, u2_noun sut, @@ -181,7 +181,7 @@ return ret; } - } + } else if ( u2_yes == u2_dust(u2_h(gen)) ) { _play_used(wir_r); { @@ -220,12 +220,12 @@ { u2_noun fex = j2_mcy(Pt6, ut, gain)(wir_r, van, sut, p_gen); u2_noun wux = j2_mcy(Pt6, ut, lose)(wir_r, van, sut, p_gen); - u2_noun dez = (fex == c3__void) ? c3__void + u2_noun dez = (fex == c3__void) ? c3__void : _play_x(wir_r, van, fex, q_gen); - u2_noun doz = (wux == c3__void) ? c3__void + u2_noun doz = (wux == c3__void) ? c3__void : _play_x(wir_r, van, wux, r_gen); u2_noun ret = j2_mby(Pt6, fork)(wir_r, dez, doz); - + u2_rz(wir_r, dez); u2_rz(wir_r, doz); u2_rz(wir_r, fex); u2_rz(wir_r, wux); return ret; @@ -264,7 +264,7 @@ case c3__dtzz: u2_bi_cell(wir_r, u2_t(gen), &p_gen, &q_gen); _play_used(wir_r); { - u2_noun boc = (u2_no == u2_stud(q_gen)) + u2_noun boc = (u2_no == u2_stud(q_gen)) ? c3__noun : u2_bc(wir_r, c3__atom, u2_rx(wir_r, p_gen)); u2_noun ret = j2_mby(Pt6, cube)(wir_r, q_gen, boc); @@ -387,7 +387,7 @@ _play_used(wir_r); { u2_noun ruf = u2_bt - (wir_r, c3__clhp, + (wir_r, c3__clhp, u2_bc(wir_r, u2_nul, _1), u2_rx(wir_r, p_gen)); u2_noun ret = _play_grow(wir_r, van, sut, c3__zinc, ruf, q_gen); @@ -417,7 +417,7 @@ _play_used(wir_r); { u2_noun ruf = u2_bt - (wir_r, c3__clhp, + (wir_r, c3__clhp, u2_bc(wir_r, u2_nul, _1), u2_rx(wir_r, p_gen)); u2_noun ret = _play_grow(wir_r, van, sut, c3__iron, ruf, q_gen); @@ -435,7 +435,7 @@ u2_bl_push(wir_r, u2_bc(wir_r, c3__mean, dug)); { ret = _play_x(wir_r, van, sut, q_gen); - } + } u2_bl_drop(wir_r); u2_rz(wir_r, typ); @@ -498,7 +498,7 @@ } u2_noun // transfer - j2_mcx(Pt6, ut, play)(u2_wire wir_r, + j2_mcx(Pt6, ut, play)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gen) // retain @@ -512,11 +512,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, play)[]; u2_noun // transfer - j2_mc(Pt6, ut, play)(u2_wire wir_r, + j2_mc(Pt6, ut, play)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, gen, van; @@ -533,7 +533,7 @@ u2_weak // transfer j2_mci(Pt6, ut, play)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun gen) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "play"); @@ -548,7 +548,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, play)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, play)[0].xip = xip; } @@ -586,7 +586,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, play)[] = { { ".2", c3__hevy, j2_mc(Pt6, ut, play), Tier6_b, u2_none, u2_none }, { } diff --git a/gen164/6/ut_repo.c b/gen164/6/ut_repo.c index dac1d2e0e..1b46eb3a8 100644 --- a/gen164/6/ut_repo.c +++ b/gen164/6/ut_repo.c @@ -8,7 +8,7 @@ /* logic */ u2_noun // transfer - j2_mcy(Pt6, ut, repo)(u2_wire wir_r, + j2_mcy(Pt6, ut, repo)(u2_wire wir_r, u2_noun van, // retain u2_noun sut) // retain { @@ -17,8 +17,8 @@ if ( u2_no == u2_dust(sut) ) switch ( sut ) { default: return u2_rx(wir_r, sut); - case c3__noun: - return u2_bt(wir_r, c3__fork, + case c3__noun: + return u2_bt(wir_r, c3__fork, u2_bc(wir_r, c3__atom, u2_blip), u2_bt(wir_r, c3__cell, c3__noun, c3__noun)); } @@ -63,7 +63,7 @@ } u2_noun // transfer - j2_mc(Pt6, ut, repo)(u2_wire wir_r, + j2_mc(Pt6, ut, repo)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut; diff --git a/gen164/6/ut_rest.c b/gen164/6/ut_rest.c index 5e654af0f..3ee9aec08 100644 --- a/gen164/6/ut_rest.c +++ b/gen164/6/ut_rest.c @@ -7,8 +7,8 @@ /* logic */ - static u2_noun - _rest_in_list(u2_wire wir_r, + static u2_noun + _rest_in_list(u2_wire wir_r, u2_noun van, // retain u2_noun leg) // retain { @@ -37,7 +37,7 @@ } static u2_noun // produce - _rest_in_fork(u2_wire wir_r, + _rest_in_fork(u2_wire wir_r, u2_noun nog, // retain u2_noun fub) // retain { @@ -45,7 +45,7 @@ return fub; } else { u2_noun buf = _rest_in_fork - (wir_r, + (wir_r, u2_t(nog), j2_mby(Pt6, fork)(wir_r, u2_h(nog), fub)); @@ -83,7 +83,7 @@ } u2_noun // produce - j2_mcx(Pt6, ut, rest)(u2_wire wir_r, + j2_mcx(Pt6, ut, rest)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun leg) // retain @@ -102,15 +102,15 @@ u2_rz(wir_r, nav); return mez; } - } + } /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, rest)[]; u2_noun // transfer - j2_mc(Pt6, ut, rest)(u2_wire wir_r, + j2_mc(Pt6, ut, rest)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, leg, van; @@ -127,7 +127,7 @@ u2_weak // transfer j2_mci(Pt6, ut, rest)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun leg) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "rest"); @@ -142,7 +142,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, rest)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, rest)[0].xip = xip; } @@ -210,10 +210,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, rest)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, rest), + { ".2", c3__hevy, + j2_mc(Pt6, ut, rest), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, rest), c3__rest, diff --git a/gen164/6/ut_seek.c b/gen164/6/ut_seek.c index 71b8b6bd5..b7734c8fe 100644 --- a/gen164/6/ut_seek.c +++ b/gen164/6/ut_seek.c @@ -26,7 +26,7 @@ #if 0 static u2_noun // transfer - _seek_silk_yew(u2_wire wir_r, + _seek_silk_yew(u2_wire wir_r, u2_noun van, // retain u2_noun syx, // retain u2_noun qq_tor) // retain @@ -53,7 +53,7 @@ return yon; } } - } + } } static u2_noun // retain _seek_silk_yaw(u2_noun wir_r, @@ -87,7 +87,7 @@ } static u2_noun // transfer - _seek_silk(u2_wire wir_r, + _seek_silk(u2_wire wir_r, u2_noun van, // retain u2_noun syx, // retain u2_noun tor) // retain @@ -100,19 +100,19 @@ return u2_nul; } u2_as_cell(u2_t(q_tor), &pq_tor, &qq_tor); - + hey = _seek_silk_yew(wir_r, van, syx, qq_tor); if ( u2_nul == hey ) { return u2_nul; } - if ( u2_ckb_lent(u2_rx(wir_r, hey)) != - u2_ckb_lent(u2_rx(wir_r, qq_tor)) ) + if ( u2_ckb_lent(u2_rx(wir_r, hey)) != + u2_ckb_lent(u2_rx(wir_r, qq_tor)) ) { return u2_bl_error(wir_r, "silk"); } ret = u2_bq - (wir_r, u2_nul, + (wir_r, u2_nul, u2_no, j2_mbc(Pt3, peg)(wir_r, pq_tor, _seek_silk_yaw(wir_r, hey)), _seek_silk_fum(wir_r, hey, qq_tor)); @@ -123,7 +123,7 @@ #endif u2_noun // transfer - j2_mcx(Pt6, ut, seek)(u2_wire wir_r, + j2_mcx(Pt6, ut, seek)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun way, // retain @@ -139,7 +139,7 @@ else { u2_noun i_hyp = u2_h(hyp); u2_noun t_hyp = u2_t(hyp); - u2_noun zar; + u2_noun zar; u2_noun p_zar, q_zar; u2_noun yip, syp, ret; @@ -192,11 +192,11 @@ u2_as_cell(hud, &p_hud, &q_hud); - ret = u2_bc(wir_r, j2_mbc(Pt3, peg)(wir_r, p_zar, p_hud), + ret = u2_bc(wir_r, j2_mbc(Pt3, peg)(wir_r, p_zar, p_hud), u2_rx(wir_r, q_hud)); u2_rz(wir_r, hud); } - } + } else { u2_noun p_yip = u2_t(yip); @@ -219,18 +219,18 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, seek)[]; u2_noun // transfer - j2_mc(Pt6, ut, seek)(u2_wire wir_r, + j2_mc(Pt6, ut, seek)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, way, hyp, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, - u2_cv_sam_3, &hyp, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, + u2_cv_sam_3, &hyp, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -243,7 +243,7 @@ u2_weak // transfer j2_mci(Pt6, ut, seek)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun way, // retain u2_noun hyp) // retain { @@ -255,14 +255,14 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, - u2_cv_sam_2, u2_rx(wir_r, way), - u2_cv_sam_3, u2_rx(wir_r, hyp), + u2_weak cor = u2_rl_molt(wir_r, gat, + u2_cv_sam_2, u2_rx(wir_r, way), + u2_cv_sam_3, u2_rx(wir_r, hyp), 0); if ( (u2_none == j2_mcj(Pt6, ut, seek)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, seek)[0].xip = xip; } @@ -329,7 +329,7 @@ return u2_cm_bail(c3__exit); } else { - u2_noun ret = u2_bc(wir_r, u2_rx(wir_r, p_zar), + u2_noun ret = u2_bc(wir_r, u2_rx(wir_r, p_zar), u2_rx(wir_r, u2t(q_zar))); u2_rz(wir_r, zar); @@ -343,9 +343,9 @@ { u2_noun sut, way, hyp, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, - u2_cv_sam_3, &hyp, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &way, + u2_cv_sam_3, &hyp, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -358,10 +358,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, seek)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, seek), + { ".2", c3__hevy, + j2_mc(Pt6, ut, seek), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, seek), c3__seek diff --git a/gen164/6/ut_sift.c b/gen164/6/ut_sift.c index 1643f63f9..b4c256b73 100644 --- a/gen164/6/ut_sift.c +++ b/gen164/6/ut_sift.c @@ -7,17 +7,17 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, sift)[]; u2_noun // transfer - j2_mc(Pt6, ut, sift)(u2_wire wir_r, + j2_mc(Pt6, ut, sift)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, ref, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &ref, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam, &ref, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -30,7 +30,7 @@ u2_weak // transfer j2_mci(Pt6, ut, sift)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun ref) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "sift"); @@ -45,7 +45,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, sift)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + // c3_assert(u2_none != xip); j2_mcj(Pt6, ut, sift)[0].xip = xip; } @@ -83,7 +83,7 @@ } } return pro; - } else + } else #else { u2_noun cor, pro; @@ -106,8 +106,8 @@ { u2_noun sut, ref, van; - if ( (u2_no == u2_mean(cor, u2_cv_sam, &ref, - u2_cv_con, &van, + if ( (u2_no == u2_mean(cor, u2_cv_sam, &ref, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -120,10 +120,10 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, sift)[] = { - { ".2", c3__hevy, - j2_mc(Pt6, ut, sift), + { ".2", c3__hevy, + j2_mc(Pt6, ut, sift), Tier6_b_memo, u2_none, u2_none, j2_mck(Pt6, ut, sift), c3__sift diff --git a/gen164/6/ut_swab.c b/gen164/6/ut_swab.c index 67f2f83e5..7ef3d1545 100644 --- a/gen164/6/ut_swab.c +++ b/gen164/6/ut_swab.c @@ -11,7 +11,7 @@ /* functions */ u2_noun // produce - j2_mcx(Pt6, ut, snub)(u2_wire wir_r, + j2_mcx(Pt6, ut, snub)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun har) // retain @@ -34,17 +34,17 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, snub)[]; u2_noun // transfer - j2_mc(Pt6, ut, snub)(u2_wire wir_r, + j2_mc(Pt6, ut, snub)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, sut, har; if ( (u2_no == u2_mean(cor, u2_cv_sam, &har, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -73,7 +73,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, snub)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, snub)[0].xip = xip; } @@ -111,7 +111,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, snub)[] = { { ".2", c3__hevy, j2_mc(Pt6, ut, snub), Tier6_c, u2_none, u2_none }, { } diff --git a/gen164/6/ut_tack.c b/gen164/6/ut_tack.c index 40f559a1e..385039165 100644 --- a/gen164/6/ut_tack.c +++ b/gen164/6/ut_tack.c @@ -12,7 +12,7 @@ /* internals */ static u2_noun // transfer - _tack_in(u2_wire wir_r, + _tack_in(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun peh, // retain @@ -23,12 +23,12 @@ if ( u2_no == u2_dust(peh) ) { return u2_bc(wir_r, u2_rx(wir_r, axe), u2_rx(wir_r, mur)); - } + } else { u2_noun i_peh = u2_h(peh); u2_noun t_peh = u2_t(peh); - if ( (u2_yes == u2_stud(i_peh)) || (u2_no == u2_h(i_peh)) ) + if ( (u2_yes == u2_stud(i_peh)) || (u2_no == u2_h(i_peh)) ) { u2_noun pi_peh = (u2_yes == u2_stud(i_peh)) ? 0 : u2_h(u2_t(i_peh)); u2_noun qi_peh = (u2_yes == u2_stud(i_peh)) ? i_peh : u2_t(u2_t(i_peh)); @@ -37,7 +37,7 @@ u2_noun wuf = j2_mby(Pt6, flay)(wir_r, pok); u2_noun p_wuf = u2_h(wuf); u2_noun q_wuf = u2_t(wuf); - u2_noun nax = j2_mbc(Pt3, peg)(wir_r, axe, p_wuf); + u2_noun nax = j2_mbc(Pt3, peg)(wir_r, axe, p_wuf); u2_noun gav = _tack_in(wir_r, van, q_wuf, t_peh, mur, nax); u2_noun p_gav = u2_h(gav); u2_noun q_gav = u2_t(gav); @@ -57,14 +57,14 @@ else { u2_noun bax = u2_t(i_peh); u2_noun vas = j2_mcy(Pt6, ut, peek)(wir_r, van, sut, c3__rite, bax); - u2_noun nax = j2_mbc(Pt3, peg)(wir_r, axe, bax); + u2_noun nax = j2_mbc(Pt3, peg)(wir_r, axe, bax); u2_noun gav = _tack_in(wir_r, van, vas, t_peh, mur, nax); u2_noun p_gav = u2_h(gav); u2_noun q_gav = u2_t(gav); u2_noun ret = u2_bc (wir_r, u2_rx(wir_r, p_gav), j2_mcy(Pt6, ut, heal)(wir_r, van, sut, u2_nul, bax, q_gav)); - + u2_rz(wir_r, gav); u2_rz(wir_r, nax); u2_rz(wir_r, vas); @@ -77,7 +77,7 @@ /* functions */ u2_noun // transfer - j2_mcx(Pt6, ut, tack)(u2_wire wir_r, + j2_mcx(Pt6, ut, tack)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun peh, // retain @@ -88,18 +88,18 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, tack)[]; u2_noun // transfer - j2_mc(Pt6, ut, tack)(u2_wire wir_r, + j2_mc(Pt6, ut, tack)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, sut, peh, mur; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &peh, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &peh, u2_cv_sam_3, &mur, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -124,13 +124,13 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, u2_cv_sam_2, u2_rx(wir_r, peh), + u2_weak cor = u2_rl_molt(wir_r, gat, u2_cv_sam_2, u2_rx(wir_r, peh), u2_cv_sam_3, u2_rx(wir_r, mur), 0); if ( (u2_none == j2_mcj(Pt6, ut, tack)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, tack)[0].xip = xip; } @@ -169,11 +169,11 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, tack)[] = { - { ".2", c3__hevy, j2_mc(Pt6, ut, tack), - u2_jet_dead, - // Tier6_b, + { ".2", c3__hevy, j2_mc(Pt6, ut, tack), + u2_jet_dead, + // Tier6_b, u2_none, u2_none }, { } }; diff --git a/gen164/6/ut_tock.c b/gen164/6/ut_tock.c index be46efdcf..5c4bc8d5b 100644 --- a/gen164/6/ut_tock.c +++ b/gen164/6/ut_tock.c @@ -8,7 +8,7 @@ /* internals */ static u2_noun // transfer - _tock_in(u2_wire wir_r, + _tock_in(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun peh, // retain @@ -17,7 +17,7 @@ { if ( u2_no == u2_dust(men) ) { return u2_bc(wir_r, u2_nul, u2_nul); - } + } else { u2_noun i_men = u2_h(men); u2_noun pi_men = u2_h(i_men); @@ -31,13 +31,13 @@ u2_noun q_mox = u2_t(mox); u2_noun ret; - ret = u2_bc(wir_r, - ( (u2_nul == p_mox) - ? u2_bc(wir_r, u2_nul, u2_rx(wir_r, p_geq)) + ret = u2_bc(wir_r, + ( (u2_nul == p_mox) + ? u2_bc(wir_r, u2_nul, u2_rx(wir_r, p_geq)) : (u2_no == u2_sing(p_geq, u2_t(p_mox))) ? u2_bl_bail(wir_r, c3__exit) : u2_rx(wir_r, p_mox) ), - u2_bc(wir_r, u2_bc(wir_r, u2_rx(wir_r, q_geq), + u2_bc(wir_r, u2_bc(wir_r, u2_rx(wir_r, q_geq), u2_rx(wir_r, qi_men)), u2_rx(wir_r, q_mox))); @@ -45,12 +45,12 @@ u2_rz(wir_r, geq); return ret; } - } + } /* functions */ u2_noun // transfer - j2_mcx(Pt6, ut, tock)(u2_wire wir_r, + j2_mcx(Pt6, ut, tock)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun peh, // retain @@ -64,7 +64,7 @@ if ( u2_nul == p_wib ) { return u2_bl_bail(wir_r, c3__exit); } else { - u2_noun ret = u2_bc(wir_r, u2_rx(wir_r, u2_t(p_wib)), + u2_noun ret = u2_bc(wir_r, u2_rx(wir_r, u2_t(p_wib)), u2_rx(wir_r, q_wib)); u2_rz(wir_r, wib); @@ -74,19 +74,19 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, tock)[]; u2_noun // transfer - j2_mc(Pt6, ut, tock)(u2_wire wir_r, + j2_mc(Pt6, ut, tock)(u2_wire wir_r, u2_noun cor) // retain { u2_noun van, sut, peh, mur, men; - if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &peh, + if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &peh, u2_cv_sam_6, &mur, u2_cv_sam_7, &men, - u2_cv_con, &van, + u2_cv_con, &van, 0)) || (u2_none == (sut = u2_frag(u2_cv_sam, van))) ) { @@ -112,14 +112,14 @@ } else { u2_weak von = u2_rl_molt(wir_r, van, u2_cv_sam, u2_rx(wir_r, sut), 0); u2_weak gat = u2_nk_soft(wir_r, von, hoc); - u2_weak cor = u2_rl_molt(wir_r, gat, u2_cv_sam_2, u2_rx(wir_r, peh), + u2_weak cor = u2_rl_molt(wir_r, gat, u2_cv_sam_2, u2_rx(wir_r, peh), u2_cv_sam_6, u2_rx(wir_r, mur), u2_cv_sam_7, u2_rx(wir_r, men), 0); if ( (u2_none == j2_mcj(Pt6, ut, tock)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, tock)[0].xip = xip; } @@ -159,7 +159,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, tock)[] = { { ".2", c3__hevy, j2_mc(Pt6, ut, tock), Tier6_c, u2_none, u2_none }, { } diff --git a/gen164/6/ut_wrap.c b/gen164/6/ut_wrap.c index 5251f2cf0..300693385 100644 --- a/gen164/6/ut_wrap.c +++ b/gen164/6/ut_wrap.c @@ -15,7 +15,7 @@ if ( u2_no == u2_dust(sut) ) { return u2_bl_error(wir_r, "wrap-type"); - } + } else switch ( u2_h(sut) ) { default: return u2_bl_error(wir_r, "wrap-type"); @@ -43,7 +43,7 @@ (wir_r, j2_mcx(Pt6, ut, wrap)(wir_r, van, p_sut, yoz), j2_mcx(Pt6, ut, wrap)(wir_r, van, q_sut, yoz)); } - case c3__hold: + case c3__hold: { u2_type fop = j2_mcy(Pt6, ut, repo)(wir_r, van, sut); u2_noun pro = j2_mcx(Pt6, ut, wrap)(wir_r, van, fop, yoz); @@ -56,11 +56,11 @@ /* boilerplate */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, wrap)[]; u2_noun // transfer - j2_mc(Pt6, ut, wrap)(u2_wire wir_r, + j2_mc(Pt6, ut, wrap)(u2_wire wir_r, u2_noun cor) // retain { u2_noun sut, yoz, van; @@ -77,7 +77,7 @@ u2_weak // transfer j2_mci(Pt6, ut, wrap)(u2_wire wir_r, u2_noun van, // retain - u2_noun sut, // retain + u2_noun sut, // retain u2_noun yoz) // retain { u2_weak hoc = u2_ds_look(wir_r, van, "wrap"); @@ -92,7 +92,7 @@ if ( (u2_none == j2_mcj(Pt6, ut, wrap)[0].xip) ) { u2_noun xip = u2_ds_find(wir_r, cor); - + c3_assert(u2_none != xip); j2_mcj(Pt6, ut, wrap)[0].xip = xip; } @@ -145,7 +145,7 @@ /* structures */ - u2_ho_jet + u2_ho_jet j2_mcj(Pt6, ut, wrap)[] = { { ".2", c3__hevy, j2_mc(Pt6, ut, wrap), Tier6_b, u2_none, u2_none }, { } diff --git a/gen164/pit.h b/gen164/pit.h index 4068beb4c..ab55fd54f 100644 --- a/gen164/pit.h +++ b/gen164/pit.h @@ -17,7 +17,7 @@ **/ # define Tier1 u2_jet_live # define Tier2 u2_jet_live -# define Tier3 u2_jet_live +# define Tier3 u2_jet_live # define Tier4 u2_jet_live # define Tier5 u2_jet_live //# define Tier5_b (u2_jet_live | u2_jet_test | u2_jet_memo) @@ -72,318 +72,318 @@ /** Tier 1. **/ u2_weak // transfer - j2_mbc(Pt1, add)(u2_wire wir_r, + j2_mbc(Pt1, add)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt1, dec)(u2_wire wir_r, + j2_mbc(Pt1, dec)(u2_wire wir_r, u2_atom a); // retain u2_weak // transfer - j2_mbc(Pt1, div)(u2_wire wir_r, + j2_mbc(Pt1, div)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt1, gte)(u2_wire wir_r, + j2_mbc(Pt1, gte)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt1, gth)(u2_wire wir_r, + j2_mbc(Pt1, gth)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt1, inc)(u2_wire wir_r, + j2_mbc(Pt1, inc)(u2_wire wir_r, u2_atom a); // retain u2_weak // transfer - j2_mbc(Pt1, lte)(u2_wire wir_r, + j2_mbc(Pt1, lte)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt1, lth)(u2_wire wir_r, + j2_mbc(Pt1, lth)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt1, mul)(u2_wire wir_r, + j2_mbc(Pt1, mul)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt1, sub)(u2_wire wir_r, + j2_mbc(Pt1, sub)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain /** Tier 2. **/ u2_weak // transfer - j2_mbc(Pt2, bind)(u2_wire wir_r, + j2_mbc(Pt2, bind)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, clap)(u2_wire wir_r, + j2_mbc(Pt2, clap)(u2_wire wir_r, u2_noun a, // retain u2_noun b, // retain u2_noun c); // retain u2_weak // transfer - j2_mbc(Pt2, drop)(u2_wire wir_r, + j2_mbc(Pt2, drop)(u2_wire wir_r, u2_noun a); // retain u2_weak // transfer - j2_mbc(Pt2, flop)(u2_wire wir_r, + j2_mbc(Pt2, flop)(u2_wire wir_r, u2_noun a); // retain u2_weak // transfer - j2_mbc(Pt2, lent)(u2_wire wir_r, + j2_mbc(Pt2, lent)(u2_wire wir_r, u2_noun a); // retain u2_weak // transfer - j2_mbc(Pt2, levy)(u2_wire wir_r, + j2_mbc(Pt2, levy)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, lien)(u2_wire wir_r, + j2_mbc(Pt2, lien)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, need)(u2_wire wir_r, + j2_mbc(Pt2, need)(u2_wire wir_r, u2_noun a); // retain u2_weak // transfer - j2_mbc(Pt2, reel)(u2_wire wir_r, + j2_mbc(Pt2, reel)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, roll)(u2_wire wir_r, + j2_mbc(Pt2, roll)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, skim)(u2_wire wir_r, + j2_mbc(Pt2, skim)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, skip)(u2_wire wir_r, + j2_mbc(Pt2, skip)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, snag)(u2_wire wir_r, + j2_mbc(Pt2, snag)(u2_wire wir_r, u2_atom a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, sort)(u2_wire wir_r, + j2_mbc(Pt2, sort)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, turn)(u2_wire wir_r, + j2_mbc(Pt2, turn)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt2, weld)(u2_wire wir_r, + j2_mbc(Pt2, weld)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain /** Tier 3. **/ u2_weak // transfer - j2_mbc(Pt3, bex)(u2_wire wir_r, + j2_mbc(Pt3, bex)(u2_wire wir_r, u2_atom a); // retain u2_noun // transfer - j2_mbc(Pt3, can)(u2_wire wir_r, + j2_mbc(Pt3, can)(u2_wire wir_r, u2_atom a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt3, cap)(u2_wire wir_r, + j2_mbc(Pt3, cap)(u2_wire wir_r, u2_atom a); // retain u2_weak // transfer - j2_mbc(Pt3, cat)(u2_wire wir_r, + j2_mbc(Pt3, cat)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c); // retain u2_weak // transfer - j2_mbc(Pt3, con)(u2_wire wir_r, + j2_mbc(Pt3, con)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, cut)(u2_wire wir_r, + j2_mbc(Pt3, cut)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c, // retain u2_atom d); // retain u2_weak // transfer - j2_mbc(Pt3, dor)(u2_wire wir_r, + j2_mbc(Pt3, dor)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, dis)(u2_wire wir_r, + j2_mbc(Pt3, dis)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, end)(u2_wire wir_r, + j2_mbc(Pt3, end)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c); // retain u2_weak // transfer - j2_mbc(Pt3, gor)(u2_wire wir_r, + j2_mbc(Pt3, gor)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, hor)(u2_wire wir_r, + j2_mbc(Pt3, hor)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, lsh)(u2_wire wir_r, + j2_mbc(Pt3, lsh)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c); // retain u2_weak // transfer - j2_mbc(Pt3, mas)(u2_wire wir_r, + j2_mbc(Pt3, mas)(u2_wire wir_r, u2_atom a); // retain u2_weak // transfer - j2_mbc(Pt3, met)(u2_wire wir_r, + j2_mbc(Pt3, met)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, mix)(u2_wire wir_r, + j2_mbc(Pt3, mix)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, peg)(u2_wire wir_r, + j2_mbc(Pt3, peg)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, rap)(u2_wire wir_r, + j2_mbc(Pt3, rap)(u2_wire wir_r, u2_atom a, // retain u2_noun b); // retain u2_weak // transfer - j2_mbc(Pt3, rip)(u2_wire wir_r, + j2_mbc(Pt3, rip)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain u2_weak // transfer - j2_mbc(Pt3, rsh)(u2_wire wir_r, + j2_mbc(Pt3, rsh)(u2_wire wir_r, u2_atom a, // retain u2_atom b, // retain u2_atom c); // retain u2_weak // transfer - j2_mbc(Pt3, vor)(u2_wire wir_r, + j2_mbc(Pt3, vor)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain - + /** Tier 4. **/ u2_weak // transfer - j2_mcc(Pt4, in, put)(u2_wire wir_r, + j2_mcc(Pt4, in, put)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mcc(Pt4, in, gas)(u2_wire wir_r, + j2_mcc(Pt4, in, gas)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain - u2_bean - j2_mcc(Pt4, in, has)(u2_wire wir_r, + u2_bean + j2_mcc(Pt4, in, has)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain - u2_weak // transfer - j2_mcc(Pt4, in, tap)(u2_wire wir_r, + u2_weak // transfer + j2_mcc(Pt4, in, tap)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_noun // transfer - j2_mcc(Pt4, by, get)(u2_wire wir_r, + j2_mcc(Pt4, by, get)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain u2_weak // transfer - j2_mcc(Pt4, by, put)(u2_wire wir_r, + j2_mcc(Pt4, by, put)(u2_wire wir_r, u2_noun a, // retain u2_noun b, // retain u2_noun c); // retain u2_weak // transfer - j2_mcc(Pt4, by, gas)(u2_wire wir_r, + j2_mcc(Pt4, by, gas)(u2_wire wir_r, u2_noun a, // retain u2_noun b); // retain /** Tier 5. **/ u2_noun // transfer - j2_mby(Pt5, cue)(u2_wire wir_r, + j2_mby(Pt5, cue)(u2_wire wir_r, u2_atom a); // retain u2_noun // transfer - j2_mby(Pt5, jam)(u2_wire wir_r, + j2_mby(Pt5, jam)(u2_wire wir_r, u2_atom a); // retain u2_noun // produce - j2_mby(Pt5, mat)(u2_wire wir_r, + j2_mby(Pt5, mat)(u2_wire wir_r, u2_atom a); // retain u2_noun // produce - j2_mby(Pt5, rub)(u2_wire wir_r, + j2_mby(Pt5, rub)(u2_wire wir_r, u2_atom a, // retain u2_atom b); // retain /** Tier 6. **/ u2_noun // transfer - j2_mby(Pt6, bull)(u2_wire wir_r, + j2_mby(Pt6, bull)(u2_wire wir_r, u2_noun bid, // retain u2_noun der); // retain u2_noun // transfer - j2_mby(Pt6, cell)(u2_wire wir_r, + j2_mby(Pt6, cell)(u2_wire wir_r, u2_noun hed, // retain u2_noun tal); // retain u2_noun // transfer - j2_mbc(Pt6, comb)(u2_wire wir_r, + j2_mbc(Pt6, comb)(u2_wire wir_r, u2_noun mal, // retain u2_noun buz); // retain u2_noun // transfer - j2_mby(Pt6, cons)(u2_wire wir_r, + j2_mby(Pt6, cons)(u2_wire wir_r, u2_noun vur, // retain u2_noun sed); // retain u2_noun // transfer - j2_mby(Pt6, core)(u2_wire wir_r, + j2_mby(Pt6, core)(u2_wire wir_r, u2_noun pac, // retain u2_noun con); // retain u2_noun // transfer - j2_mby(Pt6, cube)(u2_wire wir_r, + j2_mby(Pt6, cube)(u2_wire wir_r, u2_noun dil, // retain u2_noun goq); // retain u2_noun // transfer - j2_mby(Pt6, face)(u2_wire wir_r, + j2_mby(Pt6, face)(u2_wire wir_r, u2_noun cog, // retain u2_noun tip); // retain u2_noun // transfer - j2_mby(Pt6, fine)(u2_wire wir_r, + j2_mby(Pt6, fine)(u2_wire wir_r, u2_noun fuv, // retain u2_noun lup, // retain u2_noun mar); // retain @@ -393,21 +393,21 @@ u2_noun yaz, // retain u2_noun wix); // retain - u2_noun // produce - j2_mby(Pt6, flay)(u2_wire wir_r, + u2_noun // produce + j2_mby(Pt6, flay)(u2_wire wir_r, u2_noun pok); // retain u2_noun // transfer - j2_mby(Pt6, fork)(u2_wire wir_r, + j2_mby(Pt6, fork)(u2_wire wir_r, u2_noun hoz, // retain u2_noun bur); // retain u2_noun // transfer - j2_mby(Pt6, flip)(u2_wire wir_r, + j2_mby(Pt6, flip)(u2_wire wir_r, u2_noun hel); // retain u2_noun // transfer - j2_mby(Pt6, flor)(u2_wire wir_r, + j2_mby(Pt6, flor)(u2_wire wir_r, u2_noun bos, // retain u2_noun nif); // retain @@ -425,17 +425,17 @@ u2_noun ref); // retain u2_noun // transfer - j2_mby(Pt6, hike)(u2_wire wir_r, + j2_mby(Pt6, hike)(u2_wire wir_r, u2_noun axe, // retain u2_noun pac); // retain u2_noun // transfer - j2_mby(Pt6, look)(u2_wire wir_r, + j2_mby(Pt6, look)(u2_wire wir_r, u2_noun cog, // retain u2_noun dab); // retain u2_noun // transfer - j2_mcy(Pt6, ap, hack)(u2_wire wir_r, + j2_mcy(Pt6, ap, hack)(u2_wire wir_r, u2_noun ter, // retain u2_noun gen); // retain @@ -460,16 +460,16 @@ u2_noun gen); // retain u2_noun // transfer - j2_mcy(Pt6, ap, late)(u2_wire wir_r, + j2_mcy(Pt6, ap, late)(u2_wire wir_r, u2_noun gen); // retain u2_noun // transfer - j2_mcy(Pt6, ut, burn)(u2_wire wir_r, + j2_mcy(Pt6, ut, burn)(u2_wire wir_r, u2_noun van, // retain u2_noun sut); // retain u2_noun // transfer - j2_mcy(Pt6, ut, busk)(u2_wire wir_r, + j2_mcy(Pt6, ut, busk)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun cog, // retain @@ -538,7 +538,7 @@ u2_noun gib); // retain u2_noun // transfer - j2_mcy(Pt6, ut, fish)(u2_wire wir_r, + j2_mcy(Pt6, ut, fish)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_atom axe); // retain @@ -550,13 +550,13 @@ u2_noun ref); // retain u2_noun // transfer - j2_mcy(Pt6, ut, gain)(u2_wire wir_r, + j2_mcy(Pt6, ut, gain)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gen); // retain u2_noun // transfer - j2_mcy(Pt6, ut, lose)(u2_wire wir_r, + j2_mcy(Pt6, ut, lose)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gen); // retain @@ -567,9 +567,9 @@ u2_noun sut, // retain u2_noun gol, // retain u2_noun gen); // retain - + u2_noun // transfer - j2_mcy(Pt6, ut, mull)(u2_wire wir_r, + j2_mcy(Pt6, ut, mull)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gol, // retain @@ -577,14 +577,14 @@ u2_noun gen); // retain u2_bean // transfer - j2_mcy(Pt6, ut, nest)(u2_wire wir_r, + j2_mcy(Pt6, ut, nest)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_bean tel, // retain u2_noun ref); // retain u2_bean // transfer - j2_mcy(Pt6, ut, orth)(u2_wire wir_r, + j2_mcy(Pt6, ut, orth)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun ref); // retain @@ -602,15 +602,15 @@ u2_noun sut, // retain u2_noun way, // retain u2_noun axe); // retain - + u2_noun // transfer - j2_mcy(Pt6, ut, play)(u2_wire wir_r, + j2_mcy(Pt6, ut, play)(u2_wire wir_r, u2_noun van, // retain u2_noun sut, // retain u2_noun gen); // retain u2_noun // transfer - j2_mcy(Pt6, ut, repo)(u2_wire wir_r, + j2_mcy(Pt6, ut, repo)(u2_wire wir_r, u2_noun van, // retain u2_noun sut); // retain diff --git a/gen164/watt.c b/gen164/watt.c index 407e514e9..e569b8dc0 100644 --- a/gen164/watt.c +++ b/gen164/watt.c @@ -160,7 +160,7 @@ { } }; - static u2_ho_driver + static u2_ho_driver _watt_drivers_2[] = { { j2_sb(Pt1, add), j2_mbj(Pt1, add), 0, 0, u2_none }, { j2_sb(Pt1, dec), j2_mbj(Pt1, dec), 0, 0, u2_none }, From 292156b2beaeb5d3015e5b4fd4ade5330c701749 Mon Sep 17 00:00:00 2001 From: Steven Dee Date: Tue, 22 Apr 2014 01:52:43 +0000 Subject: [PATCH 2/3] Trivial self-healing log code --- v/sist.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/v/sist.c b/v/sist.c index 840b123e1..a95bedb9f 100644 --- a/v/sist.c +++ b/v/sist.c @@ -882,8 +882,9 @@ _sist_rest(u2_reck* rec_u) // Read in the fscking events. These are probably corrupt as well. { - c3_w ent_w; - c3_d end_d; + c3_w ent_w; + c3_d end_d; + u2_bean rup = u2_no; end_d = u2R->lug_u.len_d; ent_w = 0; @@ -913,8 +914,17 @@ _sist_rest(u2_reck* rec_u) } if ( lar_u.syn_w != u2_mug((c3_w)tar_d) ) { - uL(fprintf(uH, "record (%s) is corrupt (f)\n", ful_c)); - u2_lo_bail(rec_u); + if ( u2_no == rup ) { + uL(fprintf(uH, "corruption detected; attempting to fix\n")); + rup = u2_yes; + } + uL(fprintf(uH, "lar:%x mug:%x\n", lar_u.syn_w, u2_mug((c3_w)tar_d))); + end_d--; u2R->lug_u.len_d--; + continue; + } + else if ( u2_yes == rup ) { + uL(fprintf(uH, "matched at %x\n", lar_u.syn_w)); + rup = u2_no; } if ( lar_u.ent_w == 0 ) { From 65e9634db1ee3e05278e875ebc9a6b0ad95f1aa6 Mon Sep 17 00:00:00 2001 From: Steve Dee Date: Mon, 21 Apr 2014 18:59:09 -0700 Subject: [PATCH 3/3] fsync after pack Well, this might help. Apparently "useless" was a bit too strong a word. --- v/sist.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/v/sist.c b/v/sist.c index a95bedb9f..b5d68a93a 100644 --- a/v/sist.c +++ b/v/sist.c @@ -72,9 +72,13 @@ u2_sist_pack(u2_reck* rec_u, c3_w tem_w, c3_w typ_w, c3_w* bob_w, c3_w len_w) c3_assert(0); } lug_u->len_d += (c3_d)(lar_u.len_w + c3_wiseof(lar_u)); - free(bob_w); + // Sync. Or, what goes by sync. + { + fsync(lug_u->fid_i); // fsync is almost useless, F_FULLFSYNC too slow + } + return rec_u->ent_w; }