diff --git a/include/c/motes.h b/include/c/motes.h index 45b910fbdc..c315edd69a 100644 --- a/include/c/motes.h +++ b/include/c/motes.h @@ -142,6 +142,7 @@ # define c3__brtg c3_s4('b','r','t','g') # define c3__brtr c3_s4('b','r','t','r') # define c3__brts c3_s4('b','r','t','s') +# define c3__brvt c3_s4('b','r','v','t') # define c3__brwt c3_s4('b','r','w','t') # define c3__brzp c3_s4('b','r','z','p') # define c3__bud c3_s3('b','u','d') @@ -1183,6 +1184,7 @@ # define c3__watt c3_s4('w','a','t','t') # define c3__weak c3_s4('w','e','a','k') # define c3__web c3_s3('w','e','b') +# define c3__wet c3_s3('w','e','t') # define c3__werp c3_s4('w','e','r','p') # define c3__west c3_s4('w','e','s','t') # define c3__what c3_s4('w','h','a','t') diff --git a/include/noun/xtract.h b/include/noun/xtract.h index ecbc295440..7db51a0d0d 100644 --- a/include/noun/xtract.h +++ b/include/noun/xtract.h @@ -19,6 +19,8 @@ # define u3x_sam_7 27 # define u3x_sam_14 54 # define u3x_sam_15 55 +# define u3x_sam_30 110 +# define u3x_sam_31 111 # define u3x_con 7 // context # define u3x_con_2 14 // context # define u3x_con_3 15 // context diff --git a/jets/f/core.c b/jets/f/core.c index fddb8f8134..36b6827802 100644 --- a/jets/f/core.c +++ b/jets/f/core.c @@ -13,6 +13,19 @@ if ( (c3__void == pac) ) { return c3__void; } else { + { + u3_noun p_con, q_con, r_con, hr_con, tr_con; + + u3r_trel(con, &p_con, &q_con, &r_con); + u3r_cell(r_con, &hr_con, &tr_con); + if ( (c3y == u3du(hr_con)) && + (u3_nul == u3h(hr_con)) && + (u3_nul == u3t(hr_con)) ) + { + fprintf(stderr, "old core\r\n"); + abort(); + } + } return u3nt(c3__core, u3k(pac), u3k(con)); } } diff --git a/jets/f/look.c b/jets/f/look.c index eb1fb2ec9c..b03df87709 100644 --- a/jets/f/look.c +++ b/jets/f/look.c @@ -19,7 +19,9 @@ u3r_trel(dab, &n_dab, &l_dab, &r_dab); if ( c3n == u3du(n_dab) ) { - return u3m_bail(c3__fail); + // return u3m_bail(c3__fail); + fprintf(stderr, "bad look\r\n"); + return u3m_bail(c3__exit) ; } else { u3_noun pn_dab = u3h(n_dab); diff --git a/jets/f/loot.c b/jets/f/loot.c index 06abf7542c..d3836e5b88 100644 --- a/jets/f/loot.c +++ b/jets/f/loot.c @@ -22,8 +22,8 @@ return u3m_bail(c3__fail); } else { - u3_noun qqn_dom = u3t(u3t(n_dom)); - u3_noun yep = u3qf_look(cog, qqn_dom); + u3_noun qn_dom = u3t(n_dom); + u3_noun yep = u3qf_look(cog, qn_dom); if ( (u3_nul == l_dom) && (u3_nul == r_dom) ) { if ( u3_nul == yep ) { diff --git a/jets/f/ut_conk.c b/jets/f/ut_conk.c index acf8b0ff0e..d851143a12 100644 --- a/jets/f/ut_conk.c +++ b/jets/f/ut_conk.c @@ -12,10 +12,8 @@ u3_noun got) { if ( c3y == u3ud(got) ) { - u3_noun nux = u3nc(u3_nul, u3k(got)); - u3_noun ret = u3qf_face(nux, sut); + u3_noun ret = u3qf_face(u3k(got), sut); - u3z(nux); return ret; } else switch ( u3h(got) ) { diff --git a/jets/f/ut_find.c b/jets/f/ut_find.c index 8be815c71c..9bde4ef061 100644 --- a/jets/f/ut_find.c +++ b/jets/f/ut_find.c @@ -41,9 +41,9 @@ return poy; } else { - u3_noun ttt_poy = u3t(u3t(u3t(poy))); // opal + u3_noun tt_poy = u3t(u3t(poy)); // opal - _opal_sane(ttt_poy); + _opal_sane(tt_poy); return poy; } } @@ -104,9 +104,8 @@ u3_noun gil) { if ( 0 == p_heg ) { - return u3nq + return u3nt (c3y, - u3_nul, u3nt(u3_nul, u3nc(u3_nul, u3k(axe)), u3k(lon)), @@ -118,17 +117,6 @@ } } - static u3_noun - _find_join(u3_noun a, - u3_noun b) - { - if ( c3y == u3r_sing(a, b) ) { - return u3k(a); - } else { - return u3kb_weld(u3k(a), u3nc(c3_s2('|', '|'), u3k(b))); - } - } - static u3_noun _find_buck_lose(u3_noun van, u3_noun sut, @@ -208,17 +196,19 @@ u3_noun lon, u3_noun gil) { - u3_noun p_sut, q_sut, pq_sut, qq_sut, rq_sut, sq_sut, psq_sut, qsq_sut; + u3_noun p_sut, q_sut, pq_sut, qq_sut, rq_sut, prq_sut, qrq_sut; + u3_noun ppq_sut, qpq_sut, rpq_sut; u3x_cell(u3t(sut), &p_sut, &q_sut); - u3x_qual(q_sut, &pq_sut, &qq_sut, &rq_sut, &sq_sut); - u3x_cell(sq_sut, &psq_sut, &qsq_sut); + u3x_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); + u3x_trel(pq_sut, &ppq_sut, &qpq_sut, &rpq_sut); + u3x_cell(rq_sut, &prq_sut, &qrq_sut); { if ( u3_nul == q_heg ) { return _find_buck_here(van, sut, way, p_heg, q_heg, axe, lon, gil); } else { - u3_noun zem = u3qf_loot(u3t(q_heg), qsq_sut); + u3_noun zem = u3qf_loot(u3t(q_heg), qrq_sut); if ( (u3_nul != zem) && (0 != p_heg) ) { u3_noun ped; @@ -234,21 +224,18 @@ u3_noun u_zem = u3t(zem); u3_noun pu_zem = u3h(u_zem); u3_noun qu_zem = u3t(u_zem); - u3_noun pqu_zem = u3h(qu_zem); u3_noun qqu_zem = u3t(qu_zem); u3_noun mut; u3_noun pro; mut = u3nt(c3__core, u3k(p_sut), - u3nq(c3__gold, + u3nt(u3nt(u3k(ppq_sut), u3k(qpq_sut), c3__gold), u3k(qq_sut), - u3k(rq_sut), - u3k(sq_sut))); + u3k(rq_sut))); - pro = u3nq + pro = u3nt (c3y, - u3k(pqu_zem), u3nc(u3nc(u3_nul, u3k(axe)), u3k(lon)), u3nt(c3n, u3qc_peg(2, pu_zem), @@ -258,7 +245,7 @@ return pro; } else { - u3_noun pec = u3qfu_peel(van, sut, way, pq_sut); + u3_noun pec = u3qfu_peel(van, sut, way, rpq_sut); u3_noun pro; if ( c3n == u3h(pec) ) { @@ -313,24 +300,19 @@ else { u3_noun pp_hax = u3t(p_hax); // {span nock} u3_noun pp_yor = u3t(p_yor); // {span nock} - u3_noun ppp_hax = u3h(pp_hax); // wain - u3_noun ppp_yor = u3h(pp_yor); // wain - u3_noun qpp_hax = u3t(pp_hax); - u3_noun qpp_yor = u3t(pp_yor); - u3_noun pqpp_hax = u3h(qpp_hax); // span - u3_noun pqpp_yor = u3h(qpp_yor); // span - u3_noun qqpp_hax = u3t(qpp_hax); // nock - u3_noun qqpp_yor = u3t(qpp_yor); // nock + u3_noun ppp_hax = u3h(pp_hax); // span + u3_noun ppp_yor = u3h(pp_yor); // span + u3_noun qpp_hax = u3t(pp_hax); // nock + u3_noun qpp_yor = u3t(pp_yor); // nock - if ( c3n == u3r_sing(qqpp_hax, qqpp_yor) ) { + if ( c3n == u3r_sing(qpp_hax, qpp_yor) ) { return u3m_error("find-fork-c"); } - return u3nq(c3n, + return u3nt(c3n, c3n, - _find_join(ppp_hax, ppp_yor), u3nc( - u3kf_fork(u3nt(u3k(pqpp_hax), u3k(pqpp_yor), u3_nul)), - u3k(qqpp_hax))); + u3kf_fork(u3nt(u3k(ppp_hax), u3k(ppp_yor), u3_nul)), + u3k(qpp_hax))); } } } @@ -339,52 +321,46 @@ return u3m_error("find-fork-d"); } else { - u3_noun p_hax = u3t(hax); // {wain vein opal} - u3_noun p_yor = u3t(yor); // {wain vein opal} - u3_noun pp_hax = u3h(p_hax); // wain - u3_noun pp_yor = u3h(p_yor); // wain - u3_noun qp_hax = u3t(p_hax); // {vein opal} - u3_noun qp_yor = u3t(p_yor); // {vein opal} - u3_noun pqp_hax = u3h(qp_hax); // vein - u3_noun pqp_yor = u3h(qp_yor); // vein - u3_noun qqp_hax = u3t(qp_hax); // opal - u3_noun qqp_yor = u3t(qp_yor); // opal + u3_noun p_hax = u3t(hax); // {vein opal} + u3_noun p_yor = u3t(yor); // {vein opal} + u3_noun pp_hax = u3h(p_hax); // vein + u3_noun pp_yor = u3h(p_yor); // vein + u3_noun qp_hax = u3t(p_hax); // opal + u3_noun qp_yor = u3t(p_yor); // opal - if ( c3n == u3r_sing(pqp_hax, pqp_yor) ) { + if ( c3n == u3r_sing(pp_hax, pp_yor) ) { return u3m_error("find-fork-e"); } else { - if ( c3y == u3h(qqp_hax) ) { - if ( c3y != u3h(qqp_yor) ) { + if ( c3y == u3h(qp_hax) ) { + if ( c3y != u3h(qp_yor) ) { return u3m_error("find-fork-f"); } else { - u3_noun pqqp_hax = u3t(qqp_hax); // span - u3_noun pqqp_yor = u3t(qqp_yor); // span + u3_noun pqp_hax = u3t(qp_hax); // type + u3_noun pqp_yor = u3t(qp_yor); // type return - u3nq(c3y, - _find_join(pp_hax, pp_yor), - u3k(pqp_hax), + u3nt(c3y, + u3k(pp_hax), u3nc(c3y, u3kf_fork - (u3nt(u3k(pqqp_hax), u3k(pqqp_yor), u3_nul)))); + (u3nt(u3k(pqp_hax), u3k(pqp_yor), u3_nul)))); } } - else if ( c3n != u3h(qqp_yor) ) { + else if ( c3n != u3h(qp_yor) ) { return u3m_error("find-fork-g"); } else { - u3_noun pqqp_hax = u3h(u3t(qqp_hax)); // axis - u3_noun pqqp_yor = u3h(u3t(qqp_yor)); // axis - u3_noun qqqp_hax = u3t(u3t(qqp_hax)); // (set {span foot}) - u3_noun qqqp_yor = u3t(u3t(qqp_yor)); // (set {span foot}) + u3_noun pqp_hax = u3h(u3t(qp_hax)); // axis + u3_noun pqp_yor = u3h(u3t(qp_yor)); // axis + u3_noun qqp_hax = u3t(u3t(qp_hax)); // (set {type foot}) + u3_noun qqp_yor = u3t(u3t(qp_yor)); // (set {type foot}) - if ( c3n == u3r_sing(pqqp_hax, pqqp_yor) ) { + if ( c3n == u3r_sing(pqp_hax, pqp_yor) ) { return u3m_error("find-fork-h"); } else { return - u3nq(c3y, - u3_nul, - u3k(pqp_hax), - u3nt(c3n, u3k(pqqp_hax), u3qdi_uni(qqqp_hax, qqqp_yor))); + u3nt(c3y, + u3k(pp_hax), + u3nt(c3n, u3k(pqp_hax), u3qdi_uni(qqp_hax, qqp_yor))); } } } @@ -481,10 +457,10 @@ } else { u3_noun iqp_sut = u3h(qp_sut); // twig - u3_noun tiv = u3qfu_mint // (pair span nock) + u3_noun tiv = u3qfu_mint // (pair type nock) (van, q_sut, c3__noun, iqp_sut); u3_noun tqp_sut = u3t(qp_sut); // (list twig) - u3_noun p_tiv = u3h(tiv); // span + u3_noun p_tiv = u3h(tiv); // type u3_noun q_tiv = u3t(tiv); // nock u3_noun fid = _find_buck // pony (van, p_tiv, way, p_heg, q_heg, 1, u3_nul, u3_nul); @@ -504,28 +480,24 @@ } else { u3_noun tor; // port - u3_noun vat; // (pair span nock) + u3_noun vat; // (pair type nock) u3_noun ret; u3_noun dog = u3nc(0, u3k(axe)); // nock u3_noun cob = u3qf_comb(dog, q_tiv); - u3_noun wan; if ( c3y == u3h(fid) ) { - wan = u3k(u3h(u3t(fid))); - tor = u3nc(c3y, u3k(u3t(u3t(fid)))); + tor = u3nc(c3y, u3k(u3t(fid))); } else { - wan = u3k(u3h(u3t(u3t(fid)))); - tor = u3nc(c3n, u3k(u3t(u3t(u3t(fid))))); + tor = u3nc(c3n, u3k(u3t(u3t(fid)))); } u3z(fid); vat = u3qfu_fine(van, sut, tor); u3z(tor); - ret = u3nq + ret = u3nt (c3n, c3n, - wan, u3nc(u3k(u3h(vat)), u3qf_comb(cob, u3t(vat)))); u3z(vat); @@ -549,10 +521,8 @@ u3_noun gil) { u3_noun p_sut, q_sut; - u3_noun pp_sut, qp_sut; u3x_cell(u3t(sut), &p_sut, &q_sut); - u3x_cell(p_sut, &pp_sut, &qp_sut); if ( u3_nul == q_heg ) { return _find_buck_here(van, q_sut, way, p_heg, q_heg, axe, lon, gil); @@ -560,8 +530,8 @@ else { u3_noun uq_heg = u3t(q_heg); // term - if ( c3y == u3ud(qp_sut) ) { - if ( c3y == u3r_sing(qp_sut, uq_heg) ) { + if ( c3y == u3ud(p_sut) ) { + if ( c3y == u3r_sing(p_sut, uq_heg) ) { return _find_buck_here(van, q_sut, way, p_heg, q_heg, axe, lon, gil); } else { @@ -569,17 +539,16 @@ } } else { - u3_noun pqp_sut = u3h(qp_sut); // (map term {wain (unit twig)}) - u3_noun qqp_sut = u3t(qp_sut); // (list (pair span nock)) - u3_noun tyr = u3qdb_get(pqp_sut, uq_heg); // (unit {wain (unit twig)}) + u3_noun pp_sut = u3h(p_sut); // (map term {wain (unit twig)}) + u3_noun qp_sut = u3t(p_sut); // (list (pair type nock)) + u3_noun tyr = u3qdb_get(pp_sut, uq_heg); // (unit {wain (unit twig)}) if ( u3_nul == tyr ) { return _find_buck_face_next - (van, sut, q_sut, qqp_sut, way, p_heg, q_heg, axe, lon, gil); + (van, sut, q_sut, qp_sut, way, p_heg, q_heg, axe, lon, gil); } else { u3_noun u_tyr = u3t(tyr); // (pair wain (unit twig)) - u3_noun pu_tyr = u3h(u_tyr); u3_noun qu_tyr = u3t(u_tyr); if ( u3_nul == qu_tyr ) { @@ -605,22 +574,21 @@ u3nt(u3_nul, u3nc(u3_nul, u3k(axe)), u3k(lon)); u3_noun ret; - ret = u3nq(c3y, u3_nul, u3qb_weld(pp_tor, nol), u3k(qp_tor)); + ret = u3nt(c3y, u3qb_weld(pp_tor, nol), u3k(qp_tor)); u3z(nol); u3z(tor); u3z(tyr); return ret; } else { - u3_noun p_tor = u3t(tor); // (pair span nock) - u3_noun pp_tor = u3h(p_tor); // span + u3_noun p_tor = u3t(tor); // (pair type nock) + u3_noun pp_tor = u3h(p_tor); // type u3_noun qp_tor = u3t(p_tor); // nock u3_noun dog = u3nc(0, u3k(axe)); // nock u3_noun ret; - ret = u3nq(c3n, + ret = u3nt(c3n, c3n, - u3k(pu_tyr), u3nc(u3k(pp_tor), u3qf_comb(dog, qp_tor))); u3z(dog); u3z(tor); @@ -729,19 +697,18 @@ static u3_noun _find_limb(u3_noun van, - u3_noun sut, // span + u3_noun sut, // type u3_noun way, // ?(%read %rite %free %both) u3_noun i_hyp, // limb - u3_noun p_mor) // {wain palo} + u3_noun p_mor) // palo { - u3_noun qp_mor = u3t(p_mor); // palo - u3_noun pqp_mor = u3h(qp_mor); // vein - u3_noun qqp_mor = u3t(qp_mor); // opal + u3_noun pp_mor = u3h(p_mor); // vein + u3_noun qp_mor = u3t(p_mor); // opal - qqp_mor = _opal_sane(qqp_mor); + qp_mor = _opal_sane(qp_mor); { - u3_noun ref = u3qfu_felt(van, sut, qqp_mor); - u3_noun lon = u3k(pqp_mor); + u3_noun ref = u3qfu_felt(van, sut, qp_mor); + u3_noun lon = u3k(pp_mor); u3_noun heg = (c3y == u3du(i_hyp)) ? u3k(i_hyp) : u3nq(c3n, 0, u3_nul, u3k(i_hyp)); @@ -750,9 +717,8 @@ if ( c3y == u3h(heg) ) { u3_noun p_heg = u3t(heg); // axis - ret = u3nq + ret = u3nt (c3y, - u3_nul, u3nc(u3nc(u3_nul, u3k(p_heg)), u3k(lon)), u3nc(c3y, u3qfu_peek(van, ref, way, p_heg))); @@ -780,7 +746,7 @@ u3_noun hyp) { if ( u3_nul == hyp ) { - return _pony_sane(u3nq(c3y, u3_nul, u3_nul, u3nc(c3y, u3k(sut)))); + return _pony_sane(u3nt(c3y, u3_nul, u3nc(c3y, u3k(sut)))); } else { u3_noun i_hyp = u3h(hyp); @@ -796,18 +762,15 @@ return mor; } else { - u3_noun pp_mor = u3t(p_mor); // {wain span nock} - u3_noun ppp_mor = u3h(pp_mor); - u3_noun qpp_mor = u3t(pp_mor); - u3_noun pqpp_mor = u3h(qpp_mor); // span - u3_noun qqpp_mor = u3t(qpp_mor); // nock + u3_noun pp_mor = u3t(p_mor); // {span nock} + u3_noun ppp_mor = u3h(pp_mor); // span + u3_noun qpp_mor = u3t(pp_mor); // nock u3_noun gen = u3nt(c3__wing, u3k(i_hyp), u3_nul); - u3_noun fex = u3qfu_mint(van, pqpp_mor, c3__noun, gen); - u3_noun ret = u3nq(c3n, + u3_noun fex = u3qfu_mint(van, ppp_mor, c3__noun, gen); + u3_noun ret = u3nt(c3n, c3n, - u3k(ppp_mor), u3nc(u3k(u3h(fex)), - u3qf_comb(qqpp_mor, u3t(fex)))); + u3qf_comb(qpp_mor, u3t(fex)))); u3z(fex); u3z(gen); u3z(mor); @@ -851,8 +814,8 @@ } else { if ( c3y == u3h(taf) ) { - u3_noun fat = u3nc(c3y, u3k(u3t(u3t(taf)))); - + u3_noun fat = u3nc(c3y, u3k(u3t(taf))); + u3z(taf); return fat; } diff --git a/jets/f/ut_mint.c b/jets/f/ut_mint.c index 5dfd3322f8..01dbc0f40d 100644 --- a/jets/f/ut_mint.c +++ b/jets/f/ut_mint.c @@ -47,7 +47,8 @@ _mint_mine(u3_noun van, u3_noun sut, u3_noun mel, - u3_noun wad, + u3_noun nym, + u3_noun hud, u3_noun dom) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); @@ -57,8 +58,10 @@ u3x_sam_2, u3k(mel), u3x_sam_6, - u3k(wad), - u3x_sam_7, + u3k(nym), + u3x_sam_14, + u3k(hud), + u3x_sam_15, u3k(dom), 0)); } @@ -144,14 +147,15 @@ u3_noun sut, u3_noun gol, u3_atom mel, + u3_noun nym, + u3_noun hud, u3_noun ruf, - u3_noun wan, u3_noun dom) { u3_noun dan = _mint_in(van, sut, c3__noun, ruf); u3_noun p_dan = u3h(dan); u3_noun q_dan = u3t(dan); - u3_noun pul = _mint_mine(van, p_dan, mel, wan, dom); + u3_noun pul = _mint_mine(van, p_dan, mel, nym, hud, dom); u3_noun ret = u3nc(_mint_nice(van, gol, u3k(u3h(pul))), u3qf_cons(u3t(pul), q_dan)); @@ -631,12 +635,23 @@ return _mint_cnts(van, sut, gol, p_gen, q_gen); } - case c3__brcn: u3x_cell(u3t(gen), &p_gen, &q_gen); + case c3__brcn: p_gen = u3t(gen); _mint_used(); { u3_noun ruf = u3nc(u3_nul, 1); - ret = _mint_grow(van, sut, gol, c3__gold, ruf, p_gen, q_gen); + ret = _mint_grow(van, sut, gol, c3__gold, u3_nul, c3__dry, ruf, p_gen); + u3z(ruf); + + return ret; + } + + case c3__brvt: u3x_cell(u3t(gen), &p_gen, &q_gen); + _mint_used(); + { + u3_noun ruf = u3nc(u3_nul, 1); + + ret = _mint_grow(van, sut, gol, c3__gold, p_gen, c3__wet, ruf, q_gen); u3z(ruf); return ret; diff --git a/jets/f/ut_mull.c b/jets/f/ut_mull.c index e550c80d3e..aeed15bc56 100644 --- a/jets/f/ut_mull.c +++ b/jets/f/ut_mull.c @@ -63,7 +63,8 @@ u3_noun sut, u3_noun dox, u3_noun mel, - u3_noun wad, + u3_noun nym, + u3_noun hud, u3_noun dom) { u3_noun von = u3i_molt(u3k(van), u3x_sam, u3k(sut), 0); @@ -75,8 +76,10 @@ u3x_sam_6, u3k(mel), u3x_sam_14, - u3k(wad), - u3x_sam_15, + u3k(nym), + u3x_sam_30, + u3k(hud), + u3x_sam_31, u3k(dom), 0)); } @@ -116,14 +119,15 @@ u3_noun gol, u3_noun dox, u3_atom mel, + u3_noun nym, + u3_noun hud, u3_noun ruf, - u3_noun wan, u3_noun dom) { u3_noun dan = _mull_in(van, sut, c3__noun, dox, ruf); u3_noun p_dan = u3h(dan); u3_noun q_dan = u3t(dan); - u3_noun yaz = _mull_mile(van, p_dan, q_dan, mel, wan, dom); + u3_noun yaz = _mull_mile(van, p_dan, q_dan, mel, nym, hud, dom); u3_noun p_yaz = u3h(yaz); u3_noun q_yaz = u3t(yaz); u3_noun ret = u3nc(_mull_nice(van, gol, u3k(p_yaz)), u3k(q_yaz)); @@ -616,12 +620,25 @@ return _mull_cnts(van, sut, gol, dox, p_gen, q_gen); } - case c3__brcn: u3x_cell(u3t(gen), &p_gen, &q_gen); + case c3__brcn: p_gen = u3t(gen); _mull_used(); { u3_noun ruf = u3nc(u3_nul, 1); - ret = _mull_grow(van, sut, gol, dox, c3__gold, ruf, p_gen, q_gen); + ret = _mull_grow + (van, sut, gol, dox, c3__gold, u3_nul, c3__dry, ruf, p_gen); + u3z(ruf); + + return ret; + } + + case c3__brvt: u3x_cell(u3t(gen), &p_gen, &q_gen); + _mull_used(); + { + u3_noun ruf = u3nc(u3_nul, 1); + + ret = _mull_grow + (van, sut, gol, dox, c3__gold, p_gen, c3__wet, ruf, q_gen); u3z(ruf); return ret; diff --git a/jets/f/ut_nest.c b/jets/f/ut_nest.c index c95c45cdaa..03c4d0640a 100644 --- a/jets/f/ut_nest.c +++ b/jets/f/ut_nest.c @@ -89,7 +89,7 @@ } else { u3_noun n_dom, l_dom, r_dom; u3_noun n_vim, l_vim, r_vim; - u3_noun pn_vim, pqn_vim, qqn_vim, pn_dom, pqn_dom, qqn_dom; + u3_noun pn_vim, qn_vim, pn_dom, qn_dom; u3x_trel(dom, &n_dom, &l_dom, &r_dom); u3x_trel(vim, &n_vim, &l_vim, &r_vim); @@ -99,13 +99,13 @@ { return c3n; } - u3x_trel(n_dom, &pn_dom, &pqn_dom, &qqn_dom); - u3x_trel(n_vim, &pn_vim, &pqn_vim, &qqn_vim); + u3x_cell(n_dom, &pn_dom, &qn_dom); + u3x_cell(n_vim, &pn_vim, &qn_vim); if ( c3n == u3r_sing(pn_dom, pn_vim) ) { return c3n; } else { - return _nest_deep(van, sut, tel, ref, qqn_dom, qqn_vim, gil); + return _nest_deep(van, sut, tel, ref, qn_dom, qn_vim, gil); } } } @@ -118,19 +118,24 @@ u3_noun gil) { u3_noun p_sut, q_sut, p_ref, q_ref; - u3_noun pq_sut, qq_sut, rq_sut, sq_sut; - u3_noun pq_ref, qq_ref, rq_ref, sq_ref; - u3_noun psq_sut, qsq_sut, psq_ref, qsq_ref; + u3_noun pq_sut, qq_sut, rq_sut; + u3_noun pq_ref, qq_ref, rq_ref; + u3_noun prq_sut, qrq_sut, prq_ref, qrq_ref; + u3_noun ppq_sut, qpq_sut, rpq_sut; + u3_noun ppq_ref, qpq_ref, rpq_ref; u3_noun ret; u3x_trel(sut, 0, &p_sut, &q_sut); u3x_trel(ref, 0, &p_ref, &q_ref); - u3x_qual(q_sut, &pq_sut, &qq_sut, &rq_sut, &sq_sut); - u3x_qual(q_ref, &pq_ref, &qq_ref, &rq_ref, &sq_ref); + u3x_trel(q_sut, &pq_sut, &qq_sut, &rq_sut); + u3x_trel(q_ref, &pq_ref, &qq_ref, &rq_ref); + + u3x_trel(pq_sut, &ppq_sut, &qpq_sut, &rpq_sut); + u3x_trel(pq_ref, &ppq_ref, &qpq_ref, &rpq_ref); - u3x_cell(sq_sut, &psq_sut, &qsq_sut); - u3x_cell(sq_ref, &psq_ref, &qsq_ref); + u3x_cell(rq_sut, &prq_sut, &qrq_sut); + u3x_cell(rq_ref, &prq_ref, &qrq_ref); if ( c3y == u3r_sing(q_sut, q_ref) ) { return _nest_dext(van, p_sut, tel, p_ref, u3_nul, u3_nul, gil); @@ -145,9 +150,9 @@ return c3n; } else { - if ( (pq_sut != pq_ref) && - (c3__lead != pq_sut) && - (c3__gold != pq_ref) ) + if ( (rpq_sut != rpq_ref) && + (c3__lead != rpq_sut) && + (c3__gold != rpq_ref) ) { return c3n; } @@ -163,15 +168,15 @@ u3_noun zoc = u3qdi_put(gil, hud); u3_noun tus = u3nt(c3__core, u3k(qq_sut), - u3nc(c3__gold, + u3nc(u3nt(u3k(ppq_sut), u3k(qpq_sut), c3__gold), u3k(u3t(q_sut)))); u3_noun fer = u3nt(c3__core, u3k(qq_ref), - u3nc(c3__gold, + u3nc(u3nt(u3k(ppq_ref), u3k(qpq_ref), c3__gold), u3k(u3t(q_ref)))); - ret = _nest_dope(van, tus, tel, fer, qsq_sut, qsq_ref, zoc); + ret = _nest_dope(van, tus, tel, fer, qrq_sut, qrq_ref, zoc); u3z(fer); u3z(tus); u3z(zoc); @@ -181,7 +186,7 @@ return c3n; } else { - switch ( pq_sut ) { + switch ( rpq_sut ) { default: return u3m_bail(c3__fail); case c3__gold: { diff --git a/jets/f/ut_peek.c b/jets/f/ut_peek.c index ba8d0e670f..81f442353a 100644 --- a/jets/f/ut_peek.c +++ b/jets/f/ut_peek.c @@ -71,10 +71,12 @@ } case c3__core: { u3_noun pq_sut, qq_sut, rq_sut; + u3_noun ppq_sut, qpq_sut, rpq_sut; u3_noun prq_sut, qrq_sut; if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) || (c3n == u3r_trel(q_sut, &pq_sut, &qq_sut, &rq_sut)) || + (c3n == u3r_trel(pq_sut, &ppq_sut, &qpq_sut, &rpq_sut)) || (c3n == u3r_cell(rq_sut, &prq_sut, &qrq_sut)) ) { return u3m_bail(c3__fail); @@ -83,7 +85,7 @@ u3_atom lat = u3qc_mas(axe); if ( 3 == now ) { - u3_noun pec = u3qfu_peel(van, sut, way, pq_sut); + u3_noun pec = u3qfu_peel(van, sut, way, rpq_sut); u3_noun sam = u3h(pec); u3_noun con = u3t(pec); diff --git a/jets/f/ut_play.c b/jets/f/ut_play.c index 71d17a5baa..362a5a87b6 100644 --- a/jets/f/ut_play.c +++ b/jets/f/ut_play.c @@ -181,16 +181,16 @@ _play_grow(u3_noun van, u3_noun sut, u3_atom mel, + u3_noun nym, + u3_noun hud, u3_noun ruf, - u3_noun wan, u3_noun dom) { u3_noun dan = _play_in(van, sut, ruf); return _play_core(dan, - u3nq(u3k(mel), + u3nt(u3nt(u3k(nym), u3k(hud), u3k(mel)), u3k(dan), - u3k(wan), u3nc(u3nc(u3nc(c3__full, u3_nul), u3_nul), u3k(dom)))); } @@ -454,11 +454,23 @@ return _play_cnts(van, sut, p_gen, q_gen); } - case c3__brcn: u3x_cell(u3t(gen), &p_gen, &q_gen); + case c3__brcn: p_gen = u3t(gen); _play_used(); { u3_noun ruf = u3nc(u3_nul, 1); - u3_noun ret = _play_grow(van, sut, c3__gold, ruf, p_gen, q_gen); + u3_noun ret = _play_grow + (van, sut, c3__gold, u3_nul, c3__dry, ruf, p_gen); + + u3z(ruf); + return ret; + } + + case c3__brvt: u3x_cell(u3t(gen), &p_gen, &q_gen); + _play_used(); + { + u3_noun ruf = u3nc(u3_nul, 1); + u3_noun ret = _play_grow + (van, sut, c3__gold, p_gen, c3__wet, ruf, q_gen); u3z(ruf); return ret; diff --git a/jets/f/ut_wrap.c b/jets/f/ut_wrap.c index 29c78883e6..9ef5c85f85 100644 --- a/jets/f/ut_wrap.c +++ b/jets/f/ut_wrap.c @@ -32,21 +32,24 @@ case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut); { - u3_noun pq_sut, qq_sut, rq_sut, sq_sut; + u3_noun pq_sut, qq_sut, rq_sut; + u3_noun ppq_sut, qpq_sut, rpq_sut; - if ( c3n == u3r_qual(q_sut, &pq_sut, &qq_sut, &rq_sut, &sq_sut) ) { + if ( c3n == u3r_trel(q_sut, &pq_sut, &qq_sut, &rq_sut) ) { return u3m_bail(c3__fail); } - else if ( c3__gold != pq_sut ) { + if ( c3n == u3r_trel(pq_sut, &ppq_sut, &qpq_sut, &rpq_sut) ) { + return u3m_bail(c3__fail); + } + else if ( c3__gold != rpq_sut ) { return u3m_error("wrap-gold"); } else { return u3nt(c3__core, u3k(p_sut), - u3nq(u3k(yoz), + u3nt(u3nt(u3k(ppq_sut), u3k(qpq_sut), u3k(yoz)), u3k(qq_sut), - u3k(rq_sut), - u3k(sq_sut))); + u3k(rq_sut))); } } case c3__fork: p_sut = u3t(sut); diff --git a/jets/tree.c b/jets/tree.c index 5d4fea5c32..42b2a77dfb 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -2,666 +2,666 @@ */ #include "all.h" - static u3j_harm _143_hex_aes_ecba_en_a[] = {{".2", u3wea_ecba_en}, {}}; - static u3j_harm _143_hex_aes_ecba_de_a[] = {{".2", u3wea_ecba_de}, {}}; - static u3j_harm _143_hex_aes_ecbb_en_a[] = {{".2", u3wea_ecbb_en}, {}}; - static u3j_harm _143_hex_aes_ecbb_de_a[] = {{".2", u3wea_ecbb_de}, {}}; - static u3j_harm _143_hex_aes_ecbc_en_a[] = {{".2", u3wea_ecbc_en}, {}}; - static u3j_harm _143_hex_aes_ecbc_de_a[] = {{".2", u3wea_ecbc_de}, {}}; + static u3j_harm _141_hex_aes_ecba_en_a[] = {{".2", u3wea_ecba_en}, {}}; + static u3j_harm _141_hex_aes_ecba_de_a[] = {{".2", u3wea_ecba_de}, {}}; + static u3j_harm _141_hex_aes_ecbb_en_a[] = {{".2", u3wea_ecbb_en}, {}}; + static u3j_harm _141_hex_aes_ecbb_de_a[] = {{".2", u3wea_ecbb_de}, {}}; + static u3j_harm _141_hex_aes_ecbc_en_a[] = {{".2", u3wea_ecbc_en}, {}}; + static u3j_harm _141_hex_aes_ecbc_de_a[] = {{".2", u3wea_ecbc_de}, {}}; - static u3j_harm _143_hex_aes_cbca_en_a[] = {{".2", u3wea_cbca_en}, {}}; - static u3j_harm _143_hex_aes_cbca_de_a[] = {{".2", u3wea_cbca_de}, {}}; - static u3j_harm _143_hex_aes_cbcb_en_a[] = {{".2", u3wea_cbcb_en}, {}}; - static u3j_harm _143_hex_aes_cbcb_de_a[] = {{".2", u3wea_cbcb_de}, {}}; - static u3j_harm _143_hex_aes_cbcc_en_a[] = {{".2", u3wea_cbcc_en}, {}}; - static u3j_harm _143_hex_aes_cbcc_de_a[] = {{".2", u3wea_cbcc_de}, {}}; + static u3j_harm _141_hex_aes_cbca_en_a[] = {{".2", u3wea_cbca_en}, {}}; + static u3j_harm _141_hex_aes_cbca_de_a[] = {{".2", u3wea_cbca_de}, {}}; + static u3j_harm _141_hex_aes_cbcb_en_a[] = {{".2", u3wea_cbcb_en}, {}}; + static u3j_harm _141_hex_aes_cbcb_de_a[] = {{".2", u3wea_cbcb_de}, {}}; + static u3j_harm _141_hex_aes_cbcc_en_a[] = {{".2", u3wea_cbcc_en}, {}}; + static u3j_harm _141_hex_aes_cbcc_de_a[] = {{".2", u3wea_cbcc_de}, {}}; - static u3j_core _143_hex_aes_ecba_d[] = - { { "en", _143_hex_aes_ecba_en_a }, - { "de", _143_hex_aes_ecba_de_a }, + static u3j_core _141_hex_aes_ecba_d[] = + { { "en", _141_hex_aes_ecba_en_a }, + { "de", _141_hex_aes_ecba_de_a }, {} }; - static u3j_core _143_hex_aes_ecbb_d[] = - { { "en", _143_hex_aes_ecbb_en_a }, - { "de", _143_hex_aes_ecbb_de_a }, + static u3j_core _141_hex_aes_ecbb_d[] = + { { "en", _141_hex_aes_ecbb_en_a }, + { "de", _141_hex_aes_ecbb_de_a }, {} }; - static u3j_core _143_hex_aes_ecbc_d[] = - { { "en", _143_hex_aes_ecbc_en_a }, - { "de", _143_hex_aes_ecbc_de_a }, + static u3j_core _141_hex_aes_ecbc_d[] = + { { "en", _141_hex_aes_ecbc_en_a }, + { "de", _141_hex_aes_ecbc_de_a }, {} }; - static u3j_core _143_hex_aes_cbca_d[] = - { { "en", _143_hex_aes_cbca_en_a }, - { "de", _143_hex_aes_cbca_de_a }, + static u3j_core _141_hex_aes_cbca_d[] = + { { "en", _141_hex_aes_cbca_en_a }, + { "de", _141_hex_aes_cbca_de_a }, {} }; - static u3j_core _143_hex_aes_cbcb_d[] = - { { "en", _143_hex_aes_cbcb_en_a }, - { "de", _143_hex_aes_cbcb_de_a }, + static u3j_core _141_hex_aes_cbcb_d[] = + { { "en", _141_hex_aes_cbcb_en_a }, + { "de", _141_hex_aes_cbcb_de_a }, {} }; - static u3j_core _143_hex_aes_cbcc_d[] = - { { "en", _143_hex_aes_cbcc_en_a }, - { "de", _143_hex_aes_cbcc_de_a }, + static u3j_core _141_hex_aes_cbcc_d[] = + { { "en", _141_hex_aes_cbcc_en_a }, + { "de", _141_hex_aes_cbcc_de_a }, {} }; - static u3j_core _143_hex_aes_d[] = - { { "ecba", 0, _143_hex_aes_ecba_d }, - { "ecbb", 0, _143_hex_aes_ecbb_d }, - { "ecbc", 0, _143_hex_aes_ecbc_d }, - { "cbca", 0, _143_hex_aes_cbca_d }, - { "cbcb", 0, _143_hex_aes_cbcb_d }, - { "cbcc", 0, _143_hex_aes_cbcc_d }, + static u3j_core _141_hex_aes_d[] = + { { "ecba", 0, _141_hex_aes_ecba_d }, + { "ecbb", 0, _141_hex_aes_ecbb_d }, + { "ecbc", 0, _141_hex_aes_ecbc_d }, + { "cbca", 0, _141_hex_aes_cbca_d }, + { "cbcb", 0, _141_hex_aes_cbcb_d }, + { "cbcc", 0, _141_hex_aes_cbcc_d }, {} }; - static u3j_harm _143_hex_down_mark_a[] = {{".2", u3wg_down, c3y}, {}}; - static u3j_core _143_hex_down_d[] = - { { "mark", _143_hex_down_mark_a }, + static u3j_harm _141_hex_down_mark_a[] = {{".2", u3wg_down, c3y}, {}}; + static u3j_core _141_hex_down_d[] = + { { "mark", _141_hex_down_mark_a }, {} }; - static u3j_harm _143_hex_lore_a[] = {{".2", u3we_lore}, {}}; - static u3j_harm _143_hex_loss_a[] = {{".2", u3we_loss}, {}}; - static u3j_harm _143_hex_lune_a[] = {{".2", u3we_lune}, {}}; + static u3j_harm _141_hex_lore_a[] = {{".2", u3we_lore}, {}}; + static u3j_harm _141_hex_loss_a[] = {{".2", u3we_loss}, {}}; + static u3j_harm _141_hex_lune_a[] = {{".2", u3we_lune}, {}}; - static u3j_harm _143_hex_coed__ed_puck_a[] = {{".2", u3wee_puck}, {}}; - static u3j_harm _143_hex_coed__ed_sign_a[] = {{".2", u3wee_sign}, {}}; - static u3j_harm _143_hex_coed__ed_veri_a[] = {{".2", u3wee_veri}, {}}; - static u3j_harm _143_hex_coed__ed_shar_a[] = {{".2", u3wee_shar}, {}}; + static u3j_harm _141_hex_coed__ed_puck_a[] = {{".2", u3wee_puck}, {}}; + static u3j_harm _141_hex_coed__ed_sign_a[] = {{".2", u3wee_sign}, {}}; + static u3j_harm _141_hex_coed__ed_veri_a[] = {{".2", u3wee_veri}, {}}; + static u3j_harm _141_hex_coed__ed_shar_a[] = {{".2", u3wee_shar}, {}}; - static u3j_core _143_hex_coed__ed_d[] = - { { "sign", _143_hex_coed__ed_sign_a }, - { "puck", _143_hex_coed__ed_puck_a }, - { "veri", _143_hex_coed__ed_veri_a }, - { "shar", _143_hex_coed__ed_shar_a }, + static u3j_core _141_hex_coed__ed_d[] = + { { "sign", _141_hex_coed__ed_sign_a }, + { "puck", _141_hex_coed__ed_puck_a }, + { "veri", _141_hex_coed__ed_veri_a }, + { "shar", _141_hex_coed__ed_shar_a }, {} }; -static u3j_core _143_hex_coed_d[] = - { { "ed", 0, _143_hex_coed__ed_d }, +static u3j_core _141_hex_coed_d[] = + { { "ed", 0, _141_hex_coed__ed_d }, {} }; -static u3j_core _143_hex_d[] = - { { "down", 0, _143_hex_down_d }, - { "lore", _143_hex_lore_a }, - { "loss", _143_hex_loss_a }, - { "lune", _143_hex_lune_a }, - { "coed", 0, _143_hex_coed_d }, - { "aes", 0, _143_hex_aes_d }, +static u3j_core _141_hex_d[] = + { { "down", 0, _141_hex_down_d }, + { "lore", _141_hex_lore_a }, + { "loss", _141_hex_loss_a }, + { "lune", _141_hex_lune_a }, + { "coed", 0, _141_hex_coed_d }, + { "aes", 0, _141_hex_aes_d }, {} }; /* layer five */ - static u3j_harm _143_pen_cell_a[] = {{".2", u3wf_cell}, {}}; - static u3j_harm _143_pen_comb_a[] = {{".2", u3wf_comb}, {}}; - static u3j_harm _143_pen_cons_a[] = {{".2", u3wf_cons}, {}}; - static u3j_harm _143_pen_core_a[] = {{".2", u3wf_core}, {}}; - static u3j_harm _143_pen_face_a[] = {{".2", u3wf_face}, {}}; - static u3j_harm _143_pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; - static u3j_harm _143_pen_flan_a[] = {{".2", u3wf_flan}, {}}; - static u3j_harm _143_pen_flip_a[] = {{".2", u3wf_flip}, {}}; - static u3j_harm _143_pen_flor_a[] = {{".2", u3wf_flor}, {}}; - static u3j_harm _143_pen_fork_a[] = {{".2", u3wf_fork}, {}}; - static u3j_harm _143_pen_hike_a[] = {{".2", u3wf_hike}, {}}; - static u3j_harm _143_pen_look_a[] = {{".2", u3wf_look}, {}}; - static u3j_harm _143_pen_loot_a[] = {{".2", u3wf_loot}, {}}; + static u3j_harm _141_pen_cell_a[] = {{".2", u3wf_cell}, {}}; + static u3j_harm _141_pen_comb_a[] = {{".2", u3wf_comb}, {}}; + static u3j_harm _141_pen_cons_a[] = {{".2", u3wf_cons}, {}}; + static u3j_harm _141_pen_core_a[] = {{".2", u3wf_core}, {}}; + static u3j_harm _141_pen_face_a[] = {{".2", u3wf_face}, {}}; + static u3j_harm _141_pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; + static u3j_harm _141_pen_flan_a[] = {{".2", u3wf_flan}, {}}; + static u3j_harm _141_pen_flip_a[] = {{".2", u3wf_flip}, {}}; + static u3j_harm _141_pen_flor_a[] = {{".2", u3wf_flor}, {}}; + static u3j_harm _141_pen_fork_a[] = {{".2", u3wf_fork}, {}}; + static u3j_harm _141_pen_hike_a[] = {{".2", u3wf_hike}, {}}; + static u3j_harm _141_pen_look_a[] = {{".2", u3wf_look}, {}}; + static u3j_harm _141_pen_loot_a[] = {{".2", u3wf_loot}, {}}; - static u3j_harm _143_pen__ut_conk_a[] = {{".2", u3wfu_conk}, {}}; - static u3j_harm _143_pen__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; - // static u3j_harm _143_pen__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; - static u3j_harm _143_pen__ut_fond_a[] = {{".2", u3wfu_fond}, {}}; - static u3j_harm _143_pen__ut_fish_a[] = {{".2", u3wfu_fish}, {}}; - static u3j_harm _143_pen__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}}; - static u3j_harm _143_pen__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; - static u3j_harm _143_pen__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; - static u3j_harm _143_pen__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; - static u3j_harm _143_pen__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; - static u3j_harm _143_pen__ut_play_a[] = {{".2", u3wfu_play}, {}}; - static u3j_harm _143_pen__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; - static u3j_harm _143_pen__ut_toss_a[] = {{".2", u3wfu_toss}, {}}; - static u3j_harm _143_pen__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}}; - static u3j_core _143_pen__ut_d[] = + static u3j_harm _141_pen__ut_conk_a[] = {{".2", u3wfu_conk}, {}}; + static u3j_harm _141_pen__ut_crop_a[] = {{".2", u3wfu_crop}, {}}; + // static u3j_harm _141_pen__ut_fire_a[] = {{".2", u3wfu_fire}, {}}; + static u3j_harm _141_pen__ut_fond_a[] = {{".2", u3wfu_fond}, {}}; + static u3j_harm _141_pen__ut_fish_a[] = {{".2", u3wfu_fish}, {}}; + static u3j_harm _141_pen__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}}; + static u3j_harm _141_pen__ut_mint_a[] = {{".2", u3wfu_mint}, {}}; + static u3j_harm _141_pen__ut_mull_a[] = {{".2", u3wfu_mull}, {}}; + static u3j_harm _141_pen__ut_nest_a[] = {{".2", u3wfu_nest}, {}}; + static u3j_harm _141_pen__ut_peek_a[] = {{".2", u3wfu_peek}, {}}; + static u3j_harm _141_pen__ut_play_a[] = {{".2", u3wfu_play}, {}}; + static u3j_harm _141_pen__ut_rest_a[] = {{".2", u3wfu_rest}, {}}; + static u3j_harm _141_pen__ut_toss_a[] = {{".2", u3wfu_toss}, {}}; + static u3j_harm _141_pen__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}}; + static u3j_core _141_pen__ut_d[] = { - { "conk", _143_pen__ut_conk_a }, - { "crop", _143_pen__ut_crop_a }, - { "fond", _143_pen__ut_fond_a }, - // { "fire", _143_pen__ut_fire_a }, - { "fish", _143_pen__ut_fish_a }, - { "fuse", _143_pen__ut_fuse_a }, - { "mint", _143_pen__ut_mint_a }, - { "mull", _143_pen__ut_mull_a }, - { "nest", _143_pen__ut_nest_a }, - { "peek", _143_pen__ut_peek_a }, - { "play", _143_pen__ut_play_a }, - { "rest", _143_pen__ut_rest_a }, - { "toss", _143_pen__ut_toss_a }, - { "wrap", _143_pen__ut_wrap_a }, + { "conk", _141_pen__ut_conk_a }, + { "crop", _141_pen__ut_crop_a }, + { "fond", _141_pen__ut_fond_a }, + // { "fire", _141_pen__ut_fire_a }, + { "fish", _141_pen__ut_fish_a }, + { "fuse", _141_pen__ut_fuse_a }, + { "mint", _141_pen__ut_mint_a }, + { "mull", _141_pen__ut_mull_a }, + { "nest", _141_pen__ut_nest_a }, + { "peek", _141_pen__ut_peek_a }, + { "play", _141_pen__ut_play_a }, + { "rest", _141_pen__ut_rest_a }, + { "toss", _141_pen__ut_toss_a }, + { "wrap", _141_pen__ut_wrap_a }, {} }; - static u3j_harm _143_pen__ut_a[] = + static u3j_harm _141_pen__ut_a[] = { {"repo", u3wfu_repo}, {} }; #if 0 - static u3j_harm _143_pen__ap_a[] = + static u3j_harm _141_pen__ap_a[] = { {"open", u3wfp_open}, {"rake", u3wfp_rake}, {} }; - static u3j_harm _143_pen__al_a[] = + static u3j_harm _141_pen__al_a[] = { {"bunt", u3wfl_bunt}, {"whip", u3wfl_whip}, {} }; #endif -static u3j_core _143_pen_d[] = - { { "hex", 0, _143_hex_d }, +static u3j_core _141_pen_d[] = + { { "hex", 0, _141_hex_d }, - { "cell", _143_pen_cell_a }, - { "comb", _143_pen_comb_a }, - { "cons", _143_pen_cons_a }, - { "core", _143_pen_core_a }, - { "face", _143_pen_face_a }, - { "fitz", _143_pen_fitz_a }, - { "flan", _143_pen_flan_a }, - { "flip", _143_pen_flip_a }, - { "flor", _143_pen_flor_a }, - { "fork", _143_pen_fork_a }, - { "hike", _143_pen_hike_a }, - { "look", _143_pen_look_a }, - { "loot", _143_pen_loot_a }, + { "cell", _141_pen_cell_a }, + { "comb", _141_pen_comb_a }, + { "cons", _141_pen_cons_a }, + { "core", _141_pen_core_a }, + { "face", _141_pen_face_a }, + { "fitz", _141_pen_fitz_a }, + { "flan", _141_pen_flan_a }, + { "flip", _141_pen_flip_a }, + { "flor", _141_pen_flor_a }, + { "fork", _141_pen_fork_a }, + { "hike", _141_pen_hike_a }, + { "look", _141_pen_look_a }, + { "loot", _141_pen_loot_a }, - // { "ap", _143_pen__ap_a }, - // { "al", _143_pen__al_a }, - { "ut", _143_pen__ut_a, _143_pen__ut_d }, + // { "ap", _141_pen__ap_a }, + // { "al", _141_pen__al_a }, + { "ut", _141_pen__ut_a, _141_pen__ut_d }, {} }; /* layer four */ - static u3j_harm _143_qua_trip_a[] = {{".2", u3we_trip}, {}}; + static u3j_harm _141_qua_trip_a[] = {{".2", u3we_trip}, {}}; - static u3j_harm _143_qua__po_ind_a[] = {{".2", u3wcp_ind}, {}}; - static u3j_harm _143_qua__po_ins_a[] = {{".2", u3wcp_ins}, {}}; - static u3j_harm _143_qua__po_tod_a[] = {{".2", u3wcp_tod}, {}}; - static u3j_harm _143_qua__po_tos_a[] = {{".2", u3wcp_tos}, {}}; - static u3j_core _143_qua__po_d[] = - { { "ind", _143_qua__po_ind_a }, - { "ins", _143_qua__po_ins_a }, - { "tod", _143_qua__po_tod_a }, - { "tos", _143_qua__po_tos_a }, + static u3j_harm _141_qua__po_ind_a[] = {{".2", u3wcp_ind}, {}}; + static u3j_harm _141_qua__po_ins_a[] = {{".2", u3wcp_ins}, {}}; + static u3j_harm _141_qua__po_tod_a[] = {{".2", u3wcp_tod}, {}}; + static u3j_harm _141_qua__po_tos_a[] = {{".2", u3wcp_tos}, {}}; + static u3j_core _141_qua__po_d[] = + { { "ind", _141_qua__po_ind_a }, + { "ins", _141_qua__po_ins_a }, + { "tod", _141_qua__po_tod_a }, + { "tos", _141_qua__po_tos_a }, {} }; - static u3j_harm _143_qua__bend_fun_a[] = {{".2", u3we_bend_fun}, {}}; - static u3j_core _143_qua__bend_d[] = - { { "fun", _143_qua__bend_fun_a }, + static u3j_harm _141_qua__bend_fun_a[] = {{".2", u3we_bend_fun}, {}}; + static u3j_core _141_qua__bend_d[] = + { { "fun", _141_qua__bend_fun_a }, {} }; - static u3j_harm _143_qua__cold_fun_a[] = {{".2", u3we_cold_fun}, {}}; - static u3j_core _143_qua__cold_d[] = - { { "fun", _143_qua__cold_fun_a }, + static u3j_harm _141_qua__cold_fun_a[] = {{".2", u3we_cold_fun}, {}}; + static u3j_core _141_qua__cold_d[] = + { { "fun", _141_qua__cold_fun_a }, {} }; - static u3j_harm _143_qua__cook_fun_a[] = {{".2", u3we_cook_fun}, {}}; - static u3j_core _143_qua__cook_d[] = - { { "fun", _143_qua__cook_fun_a }, + static u3j_harm _141_qua__cook_fun_a[] = {{".2", u3we_cook_fun}, {}}; + static u3j_core _141_qua__cook_d[] = + { { "fun", _141_qua__cook_fun_a }, {} }; - static u3j_harm _143_qua__comp_fun_a[] = {{".2", u3we_comp_fun}, {}}; - static u3j_core _143_qua__comp_d[] = - { { "fun", _143_qua__comp_fun_a }, + static u3j_harm _141_qua__comp_fun_a[] = {{".2", u3we_comp_fun}, {}}; + static u3j_core _141_qua__comp_d[] = + { { "fun", _141_qua__comp_fun_a }, {} }; - static u3j_harm _143_qua__easy_fun_a[] = {{".2", u3we_easy_fun}, {}}; - static u3j_core _143_qua__easy_d[] = - { { "fun", _143_qua__easy_fun_a }, + static u3j_harm _141_qua__easy_fun_a[] = {{".2", u3we_easy_fun}, {}}; + static u3j_core _141_qua__easy_d[] = + { { "fun", _141_qua__easy_fun_a }, {} }; - static u3j_harm _143_qua__glue_fun_a[] = {{".2", u3we_glue_fun}, {}}; - static u3j_core _143_qua__glue_d[] = - { { "fun", _143_qua__glue_fun_a }, + static u3j_harm _141_qua__glue_fun_a[] = {{".2", u3we_glue_fun}, {}}; + static u3j_core _141_qua__glue_d[] = + { { "fun", _141_qua__glue_fun_a }, {} }; - static u3j_harm _143_qua__here_fun_a[] = {{".2", u3we_here_fun}, {}}; - static u3j_core _143_qua__here_d[] = - { { "fun", _143_qua__here_fun_a }, + static u3j_harm _141_qua__here_fun_a[] = {{".2", u3we_here_fun}, {}}; + static u3j_core _141_qua__here_d[] = + { { "fun", _141_qua__here_fun_a }, {} }; - static u3j_harm _143_qua__just_fun_a[] = {{".2", u3we_just_fun}, {}}; - static u3j_core _143_qua__just_d[] = - { { "fun", _143_qua__just_fun_a }, + static u3j_harm _141_qua__just_fun_a[] = {{".2", u3we_just_fun}, {}}; + static u3j_core _141_qua__just_d[] = + { { "fun", _141_qua__just_fun_a }, {} }; - static u3j_harm _143_qua__mask_fun_a[] = {{".2", u3we_mask_fun}, {}}; - static u3j_core _143_qua__mask_d[] = - { { "fun", _143_qua__mask_fun_a }, + static u3j_harm _141_qua__mask_fun_a[] = {{".2", u3we_mask_fun}, {}}; + static u3j_core _141_qua__mask_d[] = + { { "fun", _141_qua__mask_fun_a }, {} }; - static u3j_harm _143_qua__shim_fun_a[] = {{".2", u3we_shim_fun}, {}}; - static u3j_core _143_qua__shim_d[] = - { { "fun", _143_qua__shim_fun_a }, + static u3j_harm _141_qua__shim_fun_a[] = {{".2", u3we_shim_fun}, {}}; + static u3j_core _141_qua__shim_d[] = + { { "fun", _141_qua__shim_fun_a }, {} }; - static u3j_harm _143_qua__stag_fun_a[] = {{".2", u3we_stag_fun}, {}}; - static u3j_core _143_qua__stag_d[] = - { { "fun", _143_qua__stag_fun_a }, + static u3j_harm _141_qua__stag_fun_a[] = {{".2", u3we_stag_fun}, {}}; + static u3j_core _141_qua__stag_d[] = + { { "fun", _141_qua__stag_fun_a }, {} }; - static u3j_harm _143_qua__stew_fun_a[] = {{".2", u3we_stew_fun}, {}}; - static u3j_core _143_qua__stew_d[] = - { { "fun", _143_qua__stew_fun_a }, + static u3j_harm _141_qua__stew_fun_a[] = {{".2", u3we_stew_fun}, {}}; + static u3j_core _141_qua__stew_d[] = + { { "fun", _141_qua__stew_fun_a }, {} }; - static u3j_harm _143_qua__stir_fun_a[] = {{".2", u3we_stir_fun}, {}}; - static u3j_core _143_qua__stir_d[] = - { { "fun", _143_qua__stir_fun_a }, + static u3j_harm _141_qua__stir_fun_a[] = {{".2", u3we_stir_fun}, {}}; + static u3j_core _141_qua__stir_d[] = + { { "fun", _141_qua__stir_fun_a }, {} }; - static u3j_harm _143_qua_pfix_a[] = {{".2", u3we_pfix}, {}}; - static u3j_harm _143_qua_plug_a[] = {{".2", u3we_plug}, {}}; - static u3j_harm _143_qua_pose_a[] = {{".2", u3we_pose}, {}}; - static u3j_harm _143_qua_sfix_a[] = {{".2", u3we_sfix}, {}}; + static u3j_harm _141_qua_pfix_a[] = {{".2", u3we_pfix}, {}}; + static u3j_harm _141_qua_plug_a[] = {{".2", u3we_plug}, {}}; + static u3j_harm _141_qua_pose_a[] = {{".2", u3we_pose}, {}}; + static u3j_harm _141_qua_sfix_a[] = {{".2", u3we_sfix}, {}}; - static u3j_harm _143_qua_mink_a[] = {{".2", u3we_mink}, {}}; - static u3j_harm _143_qua_mule_a[] = {{".2", u3we_mule}, {}}; + static u3j_harm _141_qua_mink_a[] = {{".2", u3we_mink}, {}}; + static u3j_harm _141_qua_mule_a[] = {{".2", u3we_mule}, {}}; -static u3j_core _143_qua_d[] = - { { "pen", 0, _143_pen_d }, +static u3j_core _141_qua_d[] = + { { "pen", 0, _141_pen_d }, - { "po", 0, _143_qua__po_d }, + { "po", 0, _141_qua__po_d }, - { "trip", _143_qua_trip_a }, + { "trip", _141_qua_trip_a }, - { "bend", 0, _143_qua__bend_d }, - { "cold", 0, _143_qua__cold_d }, - { "comp", 0, _143_qua__comp_d }, - { "cook", 0, _143_qua__cook_d }, - { "easy", 0, _143_qua__easy_d }, - { "glue", 0, _143_qua__glue_d }, - { "here", 0, _143_qua__here_d }, - { "just", 0, _143_qua__just_d }, - { "mask", 0, _143_qua__mask_d }, - { "shim", 0, _143_qua__shim_d }, - { "stag", 0, _143_qua__stag_d }, - { "stew", 0, _143_qua__stew_d }, - { "stir", 0, _143_qua__stir_d }, + { "bend", 0, _141_qua__bend_d }, + { "cold", 0, _141_qua__cold_d }, + { "comp", 0, _141_qua__comp_d }, + { "cook", 0, _141_qua__cook_d }, + { "easy", 0, _141_qua__easy_d }, + { "glue", 0, _141_qua__glue_d }, + { "here", 0, _141_qua__here_d }, + { "just", 0, _141_qua__just_d }, + { "mask", 0, _141_qua__mask_d }, + { "shim", 0, _141_qua__shim_d }, + { "stag", 0, _141_qua__stag_d }, + { "stew", 0, _141_qua__stew_d }, + { "stir", 0, _141_qua__stir_d }, - { "pfix", _143_qua_pfix_a }, - { "plug", _143_qua_plug_a }, - { "pose", _143_qua_pose_a }, - { "sfix", _143_qua_sfix_a }, + { "pfix", _141_qua_pfix_a }, + { "plug", _141_qua_plug_a }, + { "pose", _141_qua_pose_a }, + { "sfix", _141_qua_sfix_a }, - { "mink", _143_qua_mink_a }, - { "mule", _143_qua_mule_a }, + { "mink", _141_qua_mink_a }, + { "mule", _141_qua_mule_a }, {} }; /* layer three */ - static u3j_harm _143_tri__cofl__drg_a[] = {{".2", u3wef_drg}, {}}; - static u3j_harm _143_tri__cofl__lug_a[] = {{".2", u3wef_lug}, {}}; - static u3j_core _143_tri__cofl_d[] = - { { "drg", _143_tri__cofl__drg_a }, - { "lug", _143_tri__cofl__lug_a }, + static u3j_harm _141_tri__cofl__drg_a[] = {{".2", u3wef_drg}, {}}; + static u3j_harm _141_tri__cofl__lug_a[] = {{".2", u3wef_lug}, {}}; + static u3j_core _141_tri__cofl_d[] = + { { "drg", _141_tri__cofl__drg_a }, + { "lug", _141_tri__cofl__lug_a }, {} }; - static u3j_harm _143_tri__rd_add_a[] = {{".2", u3wer_add}, {}}; - static u3j_harm _143_tri__rd_sub_a[] = {{".2", u3wer_sub}, {}}; - static u3j_harm _143_tri__rd_mul_a[] = {{".2", u3wer_mul}, {}}; - static u3j_harm _143_tri__rd_div_a[] = {{".2", u3wer_div}, {}}; - static u3j_harm _143_tri__rd_sqt_a[] = {{".2", u3wer_sqt}, {}}; - static u3j_harm _143_tri__rd_fma_a[] = {{".2", u3wer_fma}, {}}; - static u3j_harm _143_tri__rd_lth_a[] = {{".2", u3wer_lth}, {}}; - static u3j_harm _143_tri__rd_lte_a[] = {{".2", u3wer_lte}, {}}; - static u3j_harm _143_tri__rd_equ_a[] = {{".2", u3wer_equ}, {}}; - static u3j_harm _143_tri__rd_gte_a[] = {{".2", u3wer_gte}, {}}; - static u3j_harm _143_tri__rd_gth_a[] = {{".2", u3wer_gth}, {}}; - static u3j_core _143_tri__rd_d[] = - { { "add", _143_tri__rd_add_a }, - { "sub", _143_tri__rd_sub_a }, - { "mul", _143_tri__rd_mul_a }, - { "div", _143_tri__rd_div_a }, - { "sqt", _143_tri__rd_sqt_a }, - { "fma", _143_tri__rd_fma_a }, - { "lth", _143_tri__rd_lth_a }, - { "lte", _143_tri__rd_lte_a }, - { "equ", _143_tri__rd_equ_a }, - { "gte", _143_tri__rd_gte_a }, - { "gth", _143_tri__rd_gth_a }, + static u3j_harm _141_tri__rd_add_a[] = {{".2", u3wer_add}, {}}; + static u3j_harm _141_tri__rd_sub_a[] = {{".2", u3wer_sub}, {}}; + static u3j_harm _141_tri__rd_mul_a[] = {{".2", u3wer_mul}, {}}; + static u3j_harm _141_tri__rd_div_a[] = {{".2", u3wer_div}, {}}; + static u3j_harm _141_tri__rd_sqt_a[] = {{".2", u3wer_sqt}, {}}; + static u3j_harm _141_tri__rd_fma_a[] = {{".2", u3wer_fma}, {}}; + static u3j_harm _141_tri__rd_lth_a[] = {{".2", u3wer_lth}, {}}; + static u3j_harm _141_tri__rd_lte_a[] = {{".2", u3wer_lte}, {}}; + static u3j_harm _141_tri__rd_equ_a[] = {{".2", u3wer_equ}, {}}; + static u3j_harm _141_tri__rd_gte_a[] = {{".2", u3wer_gte}, {}}; + static u3j_harm _141_tri__rd_gth_a[] = {{".2", u3wer_gth}, {}}; + static u3j_core _141_tri__rd_d[] = + { { "add", _141_tri__rd_add_a }, + { "sub", _141_tri__rd_sub_a }, + { "mul", _141_tri__rd_mul_a }, + { "div", _141_tri__rd_div_a }, + { "sqt", _141_tri__rd_sqt_a }, + { "fma", _141_tri__rd_fma_a }, + { "lth", _141_tri__rd_lth_a }, + { "lte", _141_tri__rd_lte_a }, + { "equ", _141_tri__rd_equ_a }, + { "gte", _141_tri__rd_gte_a }, + { "gth", _141_tri__rd_gth_a }, {} }; - static u3j_harm _143_tri__rs_add_a[] = {{".2", u3wet_add}, {}}; - static u3j_harm _143_tri__rs_sub_a[] = {{".2", u3wet_sub}, {}}; - static u3j_harm _143_tri__rs_mul_a[] = {{".2", u3wet_mul}, {}}; - static u3j_harm _143_tri__rs_div_a[] = {{".2", u3wet_div}, {}}; - static u3j_harm _143_tri__rs_sqt_a[] = {{".2", u3wet_sqt}, {}}; - static u3j_harm _143_tri__rs_fma_a[] = {{".2", u3wet_fma}, {}}; - static u3j_harm _143_tri__rs_lth_a[] = {{".2", u3wet_lth}, {}}; - static u3j_harm _143_tri__rs_lte_a[] = {{".2", u3wet_lte}, {}}; - static u3j_harm _143_tri__rs_equ_a[] = {{".2", u3wet_equ}, {}}; - static u3j_harm _143_tri__rs_gte_a[] = {{".2", u3wet_gte}, {}}; - static u3j_harm _143_tri__rs_gth_a[] = {{".2", u3wet_gth}, {}}; - static u3j_core _143_tri__rs_d[] = - { { "add", _143_tri__rs_add_a }, - { "sub", _143_tri__rs_sub_a }, - { "mul", _143_tri__rs_mul_a }, - { "div", _143_tri__rs_div_a }, - { "sqt", _143_tri__rs_sqt_a }, - { "fma", _143_tri__rs_fma_a }, - { "lth", _143_tri__rs_lth_a }, - { "lte", _143_tri__rs_lte_a }, - { "equ", _143_tri__rs_equ_a }, - { "gte", _143_tri__rs_gte_a }, - { "gth", _143_tri__rs_gth_a }, + static u3j_harm _141_tri__rs_add_a[] = {{".2", u3wet_add}, {}}; + static u3j_harm _141_tri__rs_sub_a[] = {{".2", u3wet_sub}, {}}; + static u3j_harm _141_tri__rs_mul_a[] = {{".2", u3wet_mul}, {}}; + static u3j_harm _141_tri__rs_div_a[] = {{".2", u3wet_div}, {}}; + static u3j_harm _141_tri__rs_sqt_a[] = {{".2", u3wet_sqt}, {}}; + static u3j_harm _141_tri__rs_fma_a[] = {{".2", u3wet_fma}, {}}; + static u3j_harm _141_tri__rs_lth_a[] = {{".2", u3wet_lth}, {}}; + static u3j_harm _141_tri__rs_lte_a[] = {{".2", u3wet_lte}, {}}; + static u3j_harm _141_tri__rs_equ_a[] = {{".2", u3wet_equ}, {}}; + static u3j_harm _141_tri__rs_gte_a[] = {{".2", u3wet_gte}, {}}; + static u3j_harm _141_tri__rs_gth_a[] = {{".2", u3wet_gth}, {}}; + static u3j_core _141_tri__rs_d[] = + { { "add", _141_tri__rs_add_a }, + { "sub", _141_tri__rs_sub_a }, + { "mul", _141_tri__rs_mul_a }, + { "div", _141_tri__rs_div_a }, + { "sqt", _141_tri__rs_sqt_a }, + { "fma", _141_tri__rs_fma_a }, + { "lth", _141_tri__rs_lth_a }, + { "lte", _141_tri__rs_lte_a }, + { "equ", _141_tri__rs_equ_a }, + { "gte", _141_tri__rs_gte_a }, + { "gth", _141_tri__rs_gth_a }, {} }; - static u3j_harm _143_tri__rq_add_a[] = {{".2", u3weq_add}, {}}; - static u3j_harm _143_tri__rq_sub_a[] = {{".2", u3weq_sub}, {}}; - static u3j_harm _143_tri__rq_mul_a[] = {{".2", u3weq_mul}, {}}; - static u3j_harm _143_tri__rq_div_a[] = {{".2", u3weq_div}, {}}; - static u3j_harm _143_tri__rq_sqt_a[] = {{".2", u3weq_sqt}, {}}; - static u3j_harm _143_tri__rq_fma_a[] = {{".2", u3weq_fma}, {}}; - static u3j_harm _143_tri__rq_lth_a[] = {{".2", u3weq_lth}, {}}; - static u3j_harm _143_tri__rq_lte_a[] = {{".2", u3weq_lte}, {}}; - static u3j_harm _143_tri__rq_equ_a[] = {{".2", u3weq_equ}, {}}; - static u3j_harm _143_tri__rq_gte_a[] = {{".2", u3weq_gte}, {}}; - static u3j_harm _143_tri__rq_gth_a[] = {{".2", u3weq_gth}, {}}; - static u3j_core _143_tri__rq_d[] = - { { "add", _143_tri__rq_add_a }, - { "sub", _143_tri__rq_sub_a }, - { "mul", _143_tri__rq_mul_a }, - { "div", _143_tri__rq_div_a }, - { "sqt", _143_tri__rq_sqt_a }, - { "fma", _143_tri__rq_fma_a }, - { "lth", _143_tri__rq_lth_a }, - { "lte", _143_tri__rq_lte_a }, - { "equ", _143_tri__rq_equ_a }, - { "gte", _143_tri__rq_gte_a }, - { "gth", _143_tri__rq_gth_a }, + static u3j_harm _141_tri__rq_add_a[] = {{".2", u3weq_add}, {}}; + static u3j_harm _141_tri__rq_sub_a[] = {{".2", u3weq_sub}, {}}; + static u3j_harm _141_tri__rq_mul_a[] = {{".2", u3weq_mul}, {}}; + static u3j_harm _141_tri__rq_div_a[] = {{".2", u3weq_div}, {}}; + static u3j_harm _141_tri__rq_sqt_a[] = {{".2", u3weq_sqt}, {}}; + static u3j_harm _141_tri__rq_fma_a[] = {{".2", u3weq_fma}, {}}; + static u3j_harm _141_tri__rq_lth_a[] = {{".2", u3weq_lth}, {}}; + static u3j_harm _141_tri__rq_lte_a[] = {{".2", u3weq_lte}, {}}; + static u3j_harm _141_tri__rq_equ_a[] = {{".2", u3weq_equ}, {}}; + static u3j_harm _141_tri__rq_gte_a[] = {{".2", u3weq_gte}, {}}; + static u3j_harm _141_tri__rq_gth_a[] = {{".2", u3weq_gth}, {}}; + static u3j_core _141_tri__rq_d[] = + { { "add", _141_tri__rq_add_a }, + { "sub", _141_tri__rq_sub_a }, + { "mul", _141_tri__rq_mul_a }, + { "div", _141_tri__rq_div_a }, + { "sqt", _141_tri__rq_sqt_a }, + { "fma", _141_tri__rq_fma_a }, + { "lth", _141_tri__rq_lth_a }, + { "lte", _141_tri__rq_lte_a }, + { "equ", _141_tri__rq_equ_a }, + { "gte", _141_tri__rq_gte_a }, + { "gth", _141_tri__rq_gth_a }, {} }; - static u3j_harm _143_tri__rh_add_a[] = {{".2", u3wes_add}, {}}; - static u3j_harm _143_tri__rh_sub_a[] = {{".2", u3wes_sub}, {}}; - static u3j_harm _143_tri__rh_mul_a[] = {{".2", u3wes_mul}, {}}; - static u3j_harm _143_tri__rh_div_a[] = {{".2", u3wes_div}, {}}; - static u3j_harm _143_tri__rh_sqt_a[] = {{".2", u3wes_sqt}, {}}; - static u3j_harm _143_tri__rh_fma_a[] = {{".2", u3wes_fma}, {}}; - static u3j_harm _143_tri__rh_lth_a[] = {{".2", u3wes_lth}, {}}; - static u3j_harm _143_tri__rh_lte_a[] = {{".2", u3wes_lte}, {}}; - static u3j_harm _143_tri__rh_equ_a[] = {{".2", u3wes_equ}, {}}; - static u3j_harm _143_tri__rh_gte_a[] = {{".2", u3wes_gte}, {}}; - static u3j_harm _143_tri__rh_gth_a[] = {{".2", u3wes_gth}, {}}; - static u3j_core _143_tri__rh_d[] = - { { "add", _143_tri__rh_add_a }, - { "sub", _143_tri__rh_sub_a }, - { "mul", _143_tri__rh_mul_a }, - { "div", _143_tri__rh_div_a }, - { "sqt", _143_tri__rh_sqt_a }, - { "fma", _143_tri__rh_fma_a }, - { "lth", _143_tri__rh_lth_a }, - { "lte", _143_tri__rh_lte_a }, - { "equ", _143_tri__rh_equ_a }, - { "gte", _143_tri__rh_gte_a }, - { "gth", _143_tri__rh_gth_a }, + static u3j_harm _141_tri__rh_add_a[] = {{".2", u3wes_add}, {}}; + static u3j_harm _141_tri__rh_sub_a[] = {{".2", u3wes_sub}, {}}; + static u3j_harm _141_tri__rh_mul_a[] = {{".2", u3wes_mul}, {}}; + static u3j_harm _141_tri__rh_div_a[] = {{".2", u3wes_div}, {}}; + static u3j_harm _141_tri__rh_sqt_a[] = {{".2", u3wes_sqt}, {}}; + static u3j_harm _141_tri__rh_fma_a[] = {{".2", u3wes_fma}, {}}; + static u3j_harm _141_tri__rh_lth_a[] = {{".2", u3wes_lth}, {}}; + static u3j_harm _141_tri__rh_lte_a[] = {{".2", u3wes_lte}, {}}; + static u3j_harm _141_tri__rh_equ_a[] = {{".2", u3wes_equ}, {}}; + static u3j_harm _141_tri__rh_gte_a[] = {{".2", u3wes_gte}, {}}; + static u3j_harm _141_tri__rh_gth_a[] = {{".2", u3wes_gth}, {}}; + static u3j_core _141_tri__rh_d[] = + { { "add", _141_tri__rh_add_a }, + { "sub", _141_tri__rh_sub_a }, + { "mul", _141_tri__rh_mul_a }, + { "div", _141_tri__rh_div_a }, + { "sqt", _141_tri__rh_sqt_a }, + { "fma", _141_tri__rh_fma_a }, + { "lth", _141_tri__rh_lth_a }, + { "lte", _141_tri__rh_lte_a }, + { "equ", _141_tri__rh_equ_a }, + { "gte", _141_tri__rh_gte_a }, + { "gth", _141_tri__rh_gth_a }, {} }; - static u3j_harm _143_tri__og_raw_a[] = {{".2", u3weo_raw}, {}}; - static u3j_core _143_tri__og_d[] = - { { "raw", _143_tri__og_raw_a }, + static u3j_harm _141_tri__og_raw_a[] = {{".2", u3weo_raw}, {}}; + static u3j_core _141_tri__og_d[] = + { { "raw", _141_tri__og_raw_a }, {} }; - static u3j_harm _143_tri_shax_a[] = {{".2", u3we_shax}, {}}; - static u3j_harm _143_tri_shay_a[] = {{".2", u3we_shay}, {}}; - static u3j_harm _143_tri_shas_a[] = {{".2", u3we_shas}, {}}; - static u3j_harm _143_tri_shal_a[] = {{".2", u3we_shal}, {}}; + static u3j_harm _141_tri_shax_a[] = {{".2", u3we_shax}, {}}; + static u3j_harm _141_tri_shay_a[] = {{".2", u3we_shay}, {}}; + static u3j_harm _141_tri_shas_a[] = {{".2", u3we_shas}, {}}; + static u3j_harm _141_tri_shal_a[] = {{".2", u3we_shal}, {}}; -static u3j_core _143_tri_d[] = - { { "qua", 0, _143_qua_d }, +static u3j_core _141_tri_d[] = + { { "qua", 0, _141_qua_d }, - { "cofl", 0, _143_tri__cofl_d }, - { "rd", 0, _143_tri__rd_d }, - { "rs", 0, _143_tri__rs_d }, - { "rq", 0, _143_tri__rq_d }, - { "rh", 0, _143_tri__rh_d }, - { "og", 0, _143_tri__og_d }, - { "shax", _143_tri_shax_a }, - { "shay", _143_tri_shay_a }, - { "shas", _143_tri_shas_a }, - { "shal", _143_tri_shal_a }, + { "cofl", 0, _141_tri__cofl_d }, + { "rd", 0, _141_tri__rd_d }, + { "rs", 0, _141_tri__rs_d }, + { "rq", 0, _141_tri__rq_d }, + { "rh", 0, _141_tri__rh_d }, + { "og", 0, _141_tri__og_d }, + { "shax", _141_tri_shax_a }, + { "shay", _141_tri_shay_a }, + { "shas", _141_tri_shas_a }, + { "shal", _141_tri_shal_a }, {} }; /* layer two */ - static u3j_harm _143_two_flop_a[] = {{".2", u3wb_flop, c3y}, {}}; - static u3j_harm _143_two_lent_a[] = {{".2", u3wb_lent, c3y}, {}}; - static u3j_harm _143_two_levy_a[] = {{".2", u3wb_levy, c3y}, {}}; - static u3j_harm _143_two_lien_a[] = {{".2", u3wb_lien, c3y}, {}}; - static u3j_harm _143_two_murn_a[] = {{".2", u3wb_murn, c3y}, {}}; - static u3j_harm _143_two_need_a[] = {{".2", u3wb_need, c3y}, {}}; - static u3j_harm _143_two_reap_a[] = {{".2", u3wb_reap, c3y}, {}}; - static u3j_harm _143_two_reel_a[] = {{".2", u3wb_reel, c3y}, {}}; - static u3j_harm _143_two_roll_a[] = {{".2", u3wb_roll, c3y}, {}}; - static u3j_harm _143_two_skid_a[] = {{".2", u3wb_skid, c3y}, {}}; - static u3j_harm _143_two_skim_a[] = {{".2", u3wb_skim, c3y}, {}}; - static u3j_harm _143_two_skip_a[] = {{".2", u3wb_skip, c3y}, {}}; - static u3j_harm _143_two_scag_a[] = {{".2", u3wb_scag, c3y}, {}}; - static u3j_harm _143_two_slag_a[] = {{".2", u3wb_slag, c3y}, {}}; - static u3j_harm _143_two_snag_a[] = {{".2", u3wb_snag, c3y}, {}}; - // static u3j_harm _143_two_sort_a[] = {{".2", u3wb_sort, c3y}, {}}; - static u3j_harm _143_two_turn_a[] = {{".2", u3wb_turn, c3y}, {}}; - static u3j_harm _143_two_weld_a[] = {{".2", u3wb_weld, c3y}, {}}; + static u3j_harm _141_two_flop_a[] = {{".2", u3wb_flop, c3y}, {}}; + static u3j_harm _141_two_lent_a[] = {{".2", u3wb_lent, c3y}, {}}; + static u3j_harm _141_two_levy_a[] = {{".2", u3wb_levy, c3y}, {}}; + static u3j_harm _141_two_lien_a[] = {{".2", u3wb_lien, c3y}, {}}; + static u3j_harm _141_two_murn_a[] = {{".2", u3wb_murn, c3y}, {}}; + static u3j_harm _141_two_need_a[] = {{".2", u3wb_need, c3y}, {}}; + static u3j_harm _141_two_reap_a[] = {{".2", u3wb_reap, c3y}, {}}; + static u3j_harm _141_two_reel_a[] = {{".2", u3wb_reel, c3y}, {}}; + static u3j_harm _141_two_roll_a[] = {{".2", u3wb_roll, c3y}, {}}; + static u3j_harm _141_two_skid_a[] = {{".2", u3wb_skid, c3y}, {}}; + static u3j_harm _141_two_skim_a[] = {{".2", u3wb_skim, c3y}, {}}; + static u3j_harm _141_two_skip_a[] = {{".2", u3wb_skip, c3y}, {}}; + static u3j_harm _141_two_scag_a[] = {{".2", u3wb_scag, c3y}, {}}; + static u3j_harm _141_two_slag_a[] = {{".2", u3wb_slag, c3y}, {}}; + static u3j_harm _141_two_snag_a[] = {{".2", u3wb_snag, c3y}, {}}; + // static u3j_harm _141_two_sort_a[] = {{".2", u3wb_sort, c3y}, {}}; + static u3j_harm _141_two_turn_a[] = {{".2", u3wb_turn, c3y}, {}}; + static u3j_harm _141_two_weld_a[] = {{".2", u3wb_weld, c3y}, {}}; - static u3j_harm _143_two_bex_a[] = {{".2", u3wc_bex, c3y}, {}}; - static u3j_harm _143_two_can_a[] = {{".2", u3wc_can, c3y}, {}}; - static u3j_harm _143_two_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; - static u3j_harm _143_two_cat_a[] = {{".2", u3wc_cat, c3y}, {}}; - static u3j_harm _143_two_con_a[] = {{".2", u3wc_con, c3y}, {}}; - static u3j_harm _143_two_cut_a[] = {{".2", u3wc_cut, c3y}, {}}; - static u3j_harm _143_two_dis_a[] = {{".2", u3wc_dis, c3y}, {}}; - static u3j_harm _143_two_dor_a[] = {{".2", u3wc_dor, c3y}, {}}; - static u3j_harm _143_two_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; - static u3j_harm _143_two_end_a[] = {{".2", u3wc_end, c3y}, {}}; - static u3j_harm _143_two_gor_a[] = {{".2", u3wc_gor, c3y}, {}}; - static u3j_harm _143_two_hor_a[] = {{".2", u3wc_hor, c3y}, {}}; - static u3j_harm _143_two_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}}; - static u3j_harm _143_two_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; - static u3j_harm _143_two_met_a[] = {{".2", u3wc_met, c3y}, {}}; - static u3j_harm _143_two_mix_a[] = {{".2", u3wc_mix, c3y}, {}}; - static u3j_harm _143_two_mug_a[] = {{".2", u3wc_mug, c3y}, {}}; - static u3j_harm _143_two_muk_a[] = {{".2", u3wc_muk, c3y}, {}}; - static u3j_harm _143_two_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; - static u3j_harm _143_two_pow_a[] = {{".2", u3wc_pow, c3y}, {}}; - static u3j_harm _143_two_rap_a[] = {{".2", u3wc_rap, c3y}, {}}; - static u3j_harm _143_two_rep_a[] = {{".2", u3wc_rep, c3y}, {}}; - static u3j_harm _143_two_rip_a[] = {{".2", u3wc_rip, c3y}, {}}; - static u3j_harm _143_two_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}}; - static u3j_harm _143_two_sqt_a[] = {{".2", u3wc_sqt, c3y}, {}}; - static u3j_harm _143_two_vor_a[] = {{".2", u3wc_vor, c3y}, {}}; - static u3j_harm _143_two_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}}; + static u3j_harm _141_two_bex_a[] = {{".2", u3wc_bex, c3y}, {}}; + static u3j_harm _141_two_can_a[] = {{".2", u3wc_can, c3y}, {}}; + static u3j_harm _141_two_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; + static u3j_harm _141_two_cat_a[] = {{".2", u3wc_cat, c3y}, {}}; + static u3j_harm _141_two_con_a[] = {{".2", u3wc_con, c3y}, {}}; + static u3j_harm _141_two_cut_a[] = {{".2", u3wc_cut, c3y}, {}}; + static u3j_harm _141_two_dis_a[] = {{".2", u3wc_dis, c3y}, {}}; + static u3j_harm _141_two_dor_a[] = {{".2", u3wc_dor, c3y}, {}}; + static u3j_harm _141_two_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; + static u3j_harm _141_two_end_a[] = {{".2", u3wc_end, c3y}, {}}; + static u3j_harm _141_two_gor_a[] = {{".2", u3wc_gor, c3y}, {}}; + static u3j_harm _141_two_hor_a[] = {{".2", u3wc_hor, c3y}, {}}; + static u3j_harm _141_two_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}}; + static u3j_harm _141_two_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; + static u3j_harm _141_two_met_a[] = {{".2", u3wc_met, c3y}, {}}; + static u3j_harm _141_two_mix_a[] = {{".2", u3wc_mix, c3y}, {}}; + static u3j_harm _141_two_mug_a[] = {{".2", u3wc_mug, c3y}, {}}; + static u3j_harm _141_two_muk_a[] = {{".2", u3wc_muk, c3y}, {}}; + static u3j_harm _141_two_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; + static u3j_harm _141_two_pow_a[] = {{".2", u3wc_pow, c3y}, {}}; + static u3j_harm _141_two_rap_a[] = {{".2", u3wc_rap, c3y}, {}}; + static u3j_harm _141_two_rep_a[] = {{".2", u3wc_rep, c3y}, {}}; + static u3j_harm _141_two_rip_a[] = {{".2", u3wc_rip, c3y}, {}}; + static u3j_harm _141_two_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}}; + static u3j_harm _141_two_sqt_a[] = {{".2", u3wc_sqt, c3y}, {}}; + static u3j_harm _141_two_vor_a[] = {{".2", u3wc_vor, c3y}, {}}; + static u3j_harm _141_two_xeb_a[] = {{".2", u3wc_xeb, c3y}, {}}; - static u3j_harm _143_two__in_bif_a[] = {{".2", u3wdi_bif}, {}}; - static u3j_harm _143_two__in_dif_a[] = {{".2", u3wdi_dif}, {}}; - static u3j_harm _143_two__in_gas_a[] = {{".2", u3wdi_gas}, {}}; - static u3j_harm _143_two__in_has_a[] = {{".2", u3wdi_has}, {}}; - static u3j_harm _143_two__in_mer_a[] = {{".2", u3wdi_mer}, {}}; - // static u3j_harm _143_two__in_int_a[] = {{".2", u3wdi_int}, {}}; - static u3j_harm _143_two__in_put_a[] = {{".2", u3wdi_put}, {}}; - static u3j_harm _143_two__in_tap_a[] = {{".2", u3wdi_tap}, {}}; - static u3j_harm _143_two__in_wyt_a[] = {{".2", u3wdi_wyt}, {}}; - static u3j_harm _143_two__in_uni_a[] = {{".2", u3wdi_uni}, {}}; - static u3j_core _143_two__in_d[] = - { { "bif", _143_two__in_bif_a }, - { "dif", _143_two__in_dif_a }, - { "gas", _143_two__in_gas_a }, - { "has", _143_two__in_has_a }, - { "mer", _143_two__in_mer_a }, - // { "int", _143_two__in_int_a }, - { "put", _143_two__in_put_a }, - { "tap", _143_two__in_tap_a }, - { "wyt", _143_two__in_wyt_a }, - { "uni", _143_two__in_uni_a }, + static u3j_harm _141_two__in_bif_a[] = {{".2", u3wdi_bif}, {}}; + static u3j_harm _141_two__in_dif_a[] = {{".2", u3wdi_dif}, {}}; + static u3j_harm _141_two__in_gas_a[] = {{".2", u3wdi_gas}, {}}; + static u3j_harm _141_two__in_has_a[] = {{".2", u3wdi_has}, {}}; + static u3j_harm _141_two__in_mer_a[] = {{".2", u3wdi_mer}, {}}; + // static u3j_harm _141_two__in_int_a[] = {{".2", u3wdi_int}, {}}; + static u3j_harm _141_two__in_put_a[] = {{".2", u3wdi_put}, {}}; + static u3j_harm _141_two__in_tap_a[] = {{".2", u3wdi_tap}, {}}; + static u3j_harm _141_two__in_wyt_a[] = {{".2", u3wdi_wyt}, {}}; + static u3j_harm _141_two__in_uni_a[] = {{".2", u3wdi_uni}, {}}; + static u3j_core _141_two__in_d[] = + { { "bif", _141_two__in_bif_a }, + { "dif", _141_two__in_dif_a }, + { "gas", _141_two__in_gas_a }, + { "has", _141_two__in_has_a }, + { "mer", _141_two__in_mer_a }, + // { "int", _141_two__in_int_a }, + { "put", _141_two__in_put_a }, + { "tap", _141_two__in_tap_a }, + { "wyt", _141_two__in_wyt_a }, + { "uni", _141_two__in_uni_a }, {} }; - static u3j_harm _143_two__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}}; - static u3j_harm _143_two__by_dif_a[] = {{".2", u3wdb_dif, c3y}, {}}; - static u3j_harm _143_two__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}}; - static u3j_harm _143_two__by_get_a[] = {{".2", u3wdb_get, c3y}, {}}; - static u3j_harm _143_two__by_has_a[] = {{".2", u3wdb_has, c3y}, {}}; - // static u3j_harm _143_two__by_int_a[] = {{".2", u3wdb_int, c3y}, {}}; - static u3j_harm _143_two__by_put_a[] = {{".2", u3wdb_put, c3y}, {}}; - static u3j_harm _143_two__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}}; - // static u3j_harm _143_two__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}}; - static u3j_core _143_two__by_d[] = - { { "bif", _143_two__by_bif_a }, - { "dif", _143_two__by_dif_a }, - { "gas", _143_two__by_gas_a }, - { "get", _143_two__by_get_a }, - { "has", _143_two__by_has_a }, - // { "int", _143_two__by_int_a }, - { "put", _143_two__by_put_a }, - { "tap", _143_two__by_tap_a }, - // { "uni", _143_two__by_uni_a }, + static u3j_harm _141_two__by_bif_a[] = {{".2", u3wdb_bif, c3y}, {}}; + static u3j_harm _141_two__by_dif_a[] = {{".2", u3wdb_dif, c3y}, {}}; + static u3j_harm _141_two__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}}; + static u3j_harm _141_two__by_get_a[] = {{".2", u3wdb_get, c3y}, {}}; + static u3j_harm _141_two__by_has_a[] = {{".2", u3wdb_has, c3y}, {}}; + // static u3j_harm _141_two__by_int_a[] = {{".2", u3wdb_int, c3y}, {}}; + static u3j_harm _141_two__by_put_a[] = {{".2", u3wdb_put, c3y}, {}}; + static u3j_harm _141_two__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}}; + // static u3j_harm _141_two__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}}; + static u3j_core _141_two__by_d[] = + { { "bif", _141_two__by_bif_a }, + { "dif", _141_two__by_dif_a }, + { "gas", _141_two__by_gas_a }, + { "get", _141_two__by_get_a }, + { "has", _141_two__by_has_a }, + // { "int", _141_two__by_int_a }, + { "put", _141_two__by_put_a }, + { "tap", _141_two__by_tap_a }, + // { "uni", _141_two__by_uni_a }, {} }; - static u3j_harm _143_two_cue_a[] = {{".2", u3we_cue}, {}}; - static u3j_harm _143_two_jam_a[] = {{".2", u3we_jam}, {}}; - static u3j_harm _143_two_mat_a[] = {{".2", u3we_mat}, {}}; - static u3j_harm _143_two_rub_a[] = {{".2", u3we_rub}, {}}; + static u3j_harm _141_two_cue_a[] = {{".2", u3we_cue}, {}}; + static u3j_harm _141_two_jam_a[] = {{".2", u3we_jam}, {}}; + static u3j_harm _141_two_mat_a[] = {{".2", u3we_mat}, {}}; + static u3j_harm _141_two_rub_a[] = {{".2", u3we_rub}, {}}; -static u3j_core _143_two_d[] = - { { "tri", 0, _143_tri_d }, - { "flop", _143_two_flop_a }, - { "lent", _143_two_lent_a }, - { "levy", _143_two_levy_a }, - { "lien", _143_two_lien_a }, - { "murn", _143_two_murn_a }, - { "need", _143_two_need_a }, - { "reap", _143_two_reap_a }, - { "reel", _143_two_reel_a }, - { "roll", _143_two_roll_a }, - { "skid", _143_two_skid_a }, - { "skim", _143_two_skim_a }, - { "skip", _143_two_skip_a }, - { "scag", _143_two_scag_a }, - { "slag", _143_two_slag_a }, - { "snag", _143_two_snag_a }, -// { "sort", _143_two_sort_a }, - { "turn", _143_two_turn_a }, - { "weld", _143_two_weld_a }, +static u3j_core _141_two_d[] = + { { "tri", 0, _141_tri_d }, + { "flop", _141_two_flop_a }, + { "lent", _141_two_lent_a }, + { "levy", _141_two_levy_a }, + { "lien", _141_two_lien_a }, + { "murn", _141_two_murn_a }, + { "need", _141_two_need_a }, + { "reap", _141_two_reap_a }, + { "reel", _141_two_reel_a }, + { "roll", _141_two_roll_a }, + { "skid", _141_two_skid_a }, + { "skim", _141_two_skim_a }, + { "skip", _141_two_skip_a }, + { "scag", _141_two_scag_a }, + { "slag", _141_two_slag_a }, + { "snag", _141_two_snag_a }, +// { "sort", _141_two_sort_a }, + { "turn", _141_two_turn_a }, + { "weld", _141_two_weld_a }, - { "bex", _143_two_bex_a }, - { "cat", _143_two_cat_a }, - { "can", _143_two_can_a }, - { "cap", _143_two_cap_a }, - { "con", _143_two_con_a }, - { "cue", _143_two_cue_a }, - { "cut", _143_two_cut_a }, - { "dis", _143_two_dis_a }, - { "dor", _143_two_dor_a }, - { "dvr", _143_two_dvr_a }, - { "end", _143_two_end_a }, - { "gor", _143_two_gor_a }, - { "hor", _143_two_hor_a }, - { "jam", _143_two_jam_a }, - { "lsh", _143_two_lsh_a }, - { "mas", _143_two_mas_a }, - { "mat", _143_two_mat_a }, - { "met", _143_two_met_a }, - { "mix", _143_two_mix_a }, - { "mug", _143_two_mug_a }, - { "muk", _143_two_muk_a }, - { "rap", _143_two_rap_a }, - { "rep", _143_two_rep_a }, - { "rip", _143_two_rip_a }, - { "rsh", _143_two_rsh_a }, - { "rub", _143_two_rub_a }, - { "peg", _143_two_peg_a }, - { "pow", _143_two_pow_a }, - { "sqt", _143_two_sqt_a }, - { "vor", _143_two_vor_a }, - { "xeb", _143_two_xeb_a }, + { "bex", _141_two_bex_a }, + { "cat", _141_two_cat_a }, + { "can", _141_two_can_a }, + { "cap", _141_two_cap_a }, + { "con", _141_two_con_a }, + { "cue", _141_two_cue_a }, + { "cut", _141_two_cut_a }, + { "dis", _141_two_dis_a }, + { "dor", _141_two_dor_a }, + { "dvr", _141_two_dvr_a }, + { "end", _141_two_end_a }, + { "gor", _141_two_gor_a }, + { "hor", _141_two_hor_a }, + { "jam", _141_two_jam_a }, + { "lsh", _141_two_lsh_a }, + { "mas", _141_two_mas_a }, + { "mat", _141_two_mat_a }, + { "met", _141_two_met_a }, + { "mix", _141_two_mix_a }, + { "mug", _141_two_mug_a }, + { "muk", _141_two_muk_a }, + { "rap", _141_two_rap_a }, + { "rep", _141_two_rep_a }, + { "rip", _141_two_rip_a }, + { "rsh", _141_two_rsh_a }, + { "rub", _141_two_rub_a }, + { "peg", _141_two_peg_a }, + { "pow", _141_two_pow_a }, + { "sqt", _141_two_sqt_a }, + { "vor", _141_two_vor_a }, + { "xeb", _141_two_xeb_a }, - { "by", 0, _143_two__by_d }, - { "in", 0, _143_two__in_d }, + { "by", 0, _141_two__by_d }, + { "in", 0, _141_two__in_d }, }; /* layer one */ - static u3j_harm _143_one_add_a[] = {{".2", u3wa_add, c3y}, {}}; - static u3j_harm _143_one_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; - static u3j_harm _143_one_div_a[] = {{".2", u3wa_div, c3y}, {}}; - static u3j_harm _143_one_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; - static u3j_harm _143_one_gte_a[] = {{".2", u3wa_gte, c3y}, {}}; - static u3j_harm _143_one_gth_a[] = {{".2", u3wa_gth, c3y}, {}}; - static u3j_harm _143_one_lte_a[] = {{".2", u3wa_lte, c3y}, {}}; - static u3j_harm _143_one_lth_a[] = {{".2", u3wa_lth, c3y}, {}}; - static u3j_harm _143_one_mod_a[] = {{".2", u3wa_mod, c3y}, {}}; - static u3j_harm _143_one_mul_a[] = {{".2", u3wa_mul, c3y}, {}}; - static u3j_harm _143_one_sub_a[] = {{".2", u3wa_sub, c3y}, {}}; + static u3j_harm _141_one_add_a[] = {{".2", u3wa_add, c3y}, {}}; + static u3j_harm _141_one_dec_a[] = {{".2", u3wa_dec, c3y}, {}}; + static u3j_harm _141_one_div_a[] = {{".2", u3wa_div, c3y}, {}}; + static u3j_harm _141_one_dvr_a[] = {{".2", u3wc_dvr, c3y}, {}}; + static u3j_harm _141_one_gte_a[] = {{".2", u3wa_gte, c3y}, {}}; + static u3j_harm _141_one_gth_a[] = {{".2", u3wa_gth, c3y}, {}}; + static u3j_harm _141_one_lte_a[] = {{".2", u3wa_lte, c3y}, {}}; + static u3j_harm _141_one_lth_a[] = {{".2", u3wa_lth, c3y}, {}}; + static u3j_harm _141_one_mod_a[] = {{".2", u3wa_mod, c3y}, {}}; + static u3j_harm _141_one_mul_a[] = {{".2", u3wa_mul, c3y}, {}}; + static u3j_harm _141_one_sub_a[] = {{".2", u3wa_sub, c3y}, {}}; - static u3j_harm _143_one_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; - static u3j_harm _143_one_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; - static u3j_harm _143_one_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; + static u3j_harm _141_one_cap_a[] = {{".2", u3wc_cap, c3y}, {}}; + static u3j_harm _141_one_peg_a[] = {{".2", u3wc_peg, c3y}, {}}; + static u3j_harm _141_one_mas_a[] = {{".2", u3wc_mas, c3y}, {}}; -static u3j_core _143_one_d[] = - { { "two", 0, _143_two_d }, - { "add", _143_one_add_a }, - { "dec", _143_one_dec_a }, - { "div", _143_one_div_a }, - { "dvr", _143_one_dvr_a }, - { "gte", _143_one_gte_a }, - { "gth", _143_one_gth_a }, - { "lte", _143_one_lte_a }, - { "lth", _143_one_lth_a }, - { "mod", _143_one_mod_a }, - { "mul", _143_one_mul_a }, - { "sub", _143_one_sub_a }, +static u3j_core _141_one_d[] = + { { "two", 0, _141_two_d }, + { "add", _141_one_add_a }, + { "dec", _141_one_dec_a }, + { "div", _141_one_div_a }, + { "dvr", _141_one_dvr_a }, + { "gte", _141_one_gte_a }, + { "gth", _141_one_gth_a }, + { "lte", _141_one_lte_a }, + { "lth", _141_one_lth_a }, + { "mod", _141_one_mod_a }, + { "mul", _141_one_mul_a }, + { "sub", _141_one_sub_a }, - { "cap", _143_one_cap_a }, - { "mas", _143_one_mas_a }, - { "peg", _143_one_peg_a }, + { "cap", _141_one_cap_a }, + { "mas", _141_one_mas_a }, + { "peg", _141_one_peg_a }, {} }; -u3j_core _k143_d[] = - { { "one", 0, _143_one_d }, +u3j_core _k141_d[] = + { { "one", 0, _141_one_d }, {} }; @@ -1317,8 +1317,8 @@ u3j_core _k142_d[] = }; static u3j_core _d[] = { + { "k141", 0, _k141_d}, { "k142", 0, _k142_d}, - { "k143", 0, _k143_d}, {} };