Merge branch 'funbreach'

Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-01-06 12:46:49 -08:00
commit 73ff3bb203
133 changed files with 1749 additions and 631 deletions

289
Makefile
View File

@ -194,6 +194,7 @@ J191_6_OFILES=\
J191_6_OFILES_UT=\
gen191/6/ut_burn.o \
gen191/6/ut_busk.o \
gen191/6/ut_bust.o \
gen191/6/ut_conk.o \
gen191/6/ut_crop.o \
@ -217,6 +218,7 @@ J191_6_OFILES_UT=\
gen191/6/ut_repo.o \
gen191/6/ut_rest.o \
gen191/6/ut_seek.o \
gen191/6/ut_sift.o \
gen191/6/ut_swab.o \
gen191/6/ut_tack.o \
gen191/6/ut_tock.o \
@ -232,9 +234,294 @@ J191_OFILES=\
$(J191_6_OFILES_UT) \
gen191/watt.o
J190_1_OFILES=\
gen190/1/add.o \
gen190/1/dec.o \
gen190/1/div.o \
gen190/1/gte.o \
gen190/1/gth.o \
gen190/1/lte.o \
gen190/1/lth.o \
gen190/1/mod.o \
gen190/1/mul.o \
gen190/1/sub.o
J190_2_OFILES=\
gen190/2/bind.o \
gen190/2/clap.o \
gen190/2/drop.o \
gen190/2/flop.o \
gen190/2/lent.o \
gen190/2/levy.o \
gen190/2/lien.o \
gen190/2/need.o \
gen190/2/reel.o \
gen190/2/roll.o \
gen190/2/skim.o \
gen190/2/skip.o \
gen190/2/slag.o \
gen190/2/snag.o \
gen190/2/sort.o \
gen190/2/turn.o \
gen190/2/weld.o
J190_3_OFILES=\
gen190/3/bex.o \
gen190/3/can.o \
gen190/3/cap.o \
gen190/3/cat.o \
gen190/3/con.o \
gen190/3/cut.o \
gen190/3/dor.o \
gen190/3/dis.o \
gen190/3/end.o \
gen190/3/gor.o \
gen190/3/hor.o \
gen190/3/lsh.o \
gen190/3/mas.o \
gen190/3/met.o \
gen190/3/mix.o \
gen190/3/mug.o \
gen190/3/peg.o \
gen190/3/po.o \
gen190/3/rap.o \
gen190/3/rip.o \
gen190/3/rsh.o \
gen190/3/vor.o
J190_4_OFILES=\
gen190/4/in.o \
gen190/4/by.o \
gen190/4/in_has.o \
gen190/4/in_gas.o \
gen190/4/in_put.o \
gen190/4/in_tap.o \
gen190/4/by_gas.o \
gen190/4/by_get.o \
gen190/4/by_has.o \
gen190/4/by_put.o
J190_5_OFILES=\
gen190/5/cue.o \
gen190/5/jam.o \
gen190/5/mat.o \
gen190/5/mink.o \
gen190/5/parse.o \
gen190/5/rub.o \
gen190/5/shax.o \
gen190/5/lore.o \
gen190/5/loss.o \
gen190/5/tape.o \
gen190/5/trip.o
J190_6_OFILES=\
gen190/6/al.o \
gen190/6/ap.o \
gen190/6/bull.o \
gen190/6/cell.o \
gen190/6/comb.o \
gen190/6/cons.o \
gen190/6/core.o \
gen190/6/cube.o \
gen190/6/face.o \
gen190/6/fitz.o \
gen190/6/flan.o \
gen190/6/flay.o \
gen190/6/flip.o \
gen190/6/flor.o \
gen190/6/fork.o \
gen190/6/hike.o \
gen190/6/look.o \
gen190/6/ut.o
J190_6_OFILES_UT=\
gen190/6/ut_burn.o \
gen190/6/ut_busk.o \
gen190/6/ut_bust.o \
gen190/6/ut_conk.o \
gen190/6/ut_crop.o \
gen190/6/ut_cull.o \
gen190/6/ut_find.o \
gen190/6/ut_fink.o \
gen190/6/ut_fire.o \
gen190/6/ut_firm.o \
gen190/6/ut_fish.o \
gen190/6/ut_fuse.o \
gen190/6/ut_gain.o \
gen190/6/ut_heal.o \
gen190/6/ut_lose.o \
gen190/6/ut_mint.o \
gen190/6/ut_moot.o \
gen190/6/ut_mull.o \
gen190/6/ut_nest.o \
gen190/6/ut_park.o \
gen190/6/ut_peek.o \
gen190/6/ut_play.o \
gen190/6/ut_repo.o \
gen190/6/ut_rest.o \
gen190/6/ut_seek.o \
gen190/6/ut_sift.o \
gen190/6/ut_swab.o \
gen190/6/ut_tack.o \
gen190/6/ut_tock.o \
gen190/6/ut_wrap.o
J190_OFILES=\
$(J190_1_OFILES) \
$(J190_2_OFILES) \
$(J190_3_OFILES) \
$(J190_4_OFILES) \
$(J190_5_OFILES) \
$(J190_6_OFILES) \
$(J190_6_OFILES_UT) \
gen190/watt.o
J164_1_OFILES=\
gen164/1/add.o \
gen164/1/dec.o \
gen164/1/div.o \
gen164/1/gte.o \
gen164/1/gth.o \
gen164/1/lte.o \
gen164/1/lth.o \
gen164/1/mod.o \
gen164/1/mul.o \
gen164/1/sub.o
J164_2_OFILES=\
gen164/2/bind.o \
gen164/2/clap.o \
gen164/2/drop.o \
gen164/2/flop.o \
gen164/2/lent.o \
gen164/2/levy.o \
gen164/2/lien.o \
gen164/2/need.o \
gen164/2/reel.o \
gen164/2/roll.o \
gen164/2/skim.o \
gen164/2/skip.o \
gen164/2/slag.o \
gen164/2/snag.o \
gen164/2/sort.o \
gen164/2/turn.o \
gen164/2/weld.o
J164_3_OFILES=\
gen164/3/bex.o \
gen164/3/can.o \
gen164/3/cap.o \
gen164/3/cat.o \
gen164/3/con.o \
gen164/3/cut.o \
gen164/3/dor.o \
gen164/3/dis.o \
gen164/3/end.o \
gen164/3/gor.o \
gen164/3/hor.o \
gen164/3/lsh.o \
gen164/3/mas.o \
gen164/3/met.o \
gen164/3/mix.o \
gen164/3/mug.o \
gen164/3/peg.o \
gen164/3/po.o \
gen164/3/rap.o \
gen164/3/rip.o \
gen164/3/rsh.o \
gen164/3/vor.o
J164_4_OFILES=\
gen164/4/in.o \
gen164/4/by.o \
gen164/4/in_has.o \
gen164/4/in_gas.o \
gen164/4/in_put.o \
gen164/4/in_tap.o \
gen164/4/by_gas.o \
gen164/4/by_get.o \
gen164/4/by_has.o \
gen164/4/by_put.o
J164_5_OFILES=\
gen164/5/cue.o \
gen164/5/jam.o \
gen164/5/mat.o \
gen164/5/mink.o \
gen164/5/parse.o \
gen164/5/rub.o \
gen164/5/shax.o \
gen164/5/lore.o \
gen164/5/loss.o \
gen164/5/tape.o \
gen164/5/trip.o
J164_6_OFILES=\
gen164/6/al.o \
gen164/6/ap.o \
gen164/6/bull.o \
gen164/6/cell.o \
gen164/6/comb.o \
gen164/6/cons.o \
gen164/6/core.o \
gen164/6/cube.o \
gen164/6/face.o \
gen164/6/fitz.o \
gen164/6/flan.o \
gen164/6/flay.o \
gen164/6/flip.o \
gen164/6/flor.o \
gen164/6/fork.o \
gen164/6/hike.o \
gen164/6/look.o \
gen164/6/ut.o
J164_6_OFILES_UT=\
gen164/6/ut_burn.o \
gen164/6/ut_busk.o \
gen164/6/ut_bust.o \
gen164/6/ut_conk.o \
gen164/6/ut_crop.o \
gen164/6/ut_cull.o \
gen164/6/ut_find.o \
gen164/6/ut_fink.o \
gen164/6/ut_fire.o \
gen164/6/ut_firm.o \
gen164/6/ut_fish.o \
gen164/6/ut_fuse.o \
gen164/6/ut_gain.o \
gen164/6/ut_heal.o \
gen164/6/ut_lose.o \
gen164/6/ut_mint.o \
gen164/6/ut_moot.o \
gen164/6/ut_mull.o \
gen164/6/ut_nest.o \
gen164/6/ut_park.o \
gen164/6/ut_peek.o \
gen164/6/ut_play.o \
gen164/6/ut_repo.o \
gen164/6/ut_rest.o \
gen164/6/ut_seek.o \
gen164/6/ut_sift.o \
gen164/6/ut_swab.o \
gen164/6/ut_tack.o \
gen164/6/ut_tock.o \
gen164/6/ut_wrap.o
J164_OFILES=\
$(J164_1_OFILES) \
$(J164_2_OFILES) \
$(J164_3_OFILES) \
$(J164_4_OFILES) \
$(J164_5_OFILES) \
$(J164_6_OFILES) \
$(J164_6_OFILES_UT) \
gen164/watt.o
BASE_OFILES=\
$(F_OFILES) \
$(J191_OFILES)
$(J164_OFILES)
OUT_OFILES=\
outside/jhttp/http_parser.o

View File

@ -8,17 +8,17 @@
#include <sys/stat.h>
#include <dirent.h>
#include "../gen191/pit.h"
#include "../gen164/pit.h"
/** Jet dependencies. Minimize these.
**/
# define Pt5Y k_191__mood__hoon
# define Pt5Y k_164__mood__hoon
/** Jet dependencies. Minimize these.
**/
# define Pt3Y k_191__mood__hoon
# define Pt4Y k_191__mood__hoon
# define Pt5Y k_191__mood__hoon
# define Pt3Y k_164__mood__hoon
# define Pt4Y k_164__mood__hoon
# define Pt5Y k_164__mood__hoon
u2_noun j2_mbc(Pt3Y, gor)(u2_wire, u2_noun a, u2_noun b);
u2_noun j2_mcc(Pt4Y, by, get)(u2_wire, u2_noun a, u2_noun b);

View File

@ -163,6 +163,16 @@ _nock_hint(u2_noun zep, // transfer
return pro;
}
case c3__germ: {
pro = pon ? _nock_mool(bus, nex, pon) : _nock_cool(bus, nex);
if ( u2_yes == u2_sing(pro, hod) ) {
u2z(pro); return hod;
} else {
u2z(hod); return pro;
}
}
case c3__fast: {
pro = pon ? _nock_mool(bus, nex, pon) : _nock_cool(bus, nex);

View File

@ -16,8 +16,8 @@
/** Jet dependencies. Minimize these.
**/
# define Pt3Y k_191__mood__hoon
# define Pt4Y k_191__mood__hoon
# define Pt3Y k_164__mood__hoon
# define Pt4Y k_164__mood__hoon
u2_noun
j2_mbc(Pt3Y, gor)(u2_wire, u2_noun a, u2_noun b);

View File

@ -50,3 +50,25 @@ j2_mcy(Pt6, al, bunt)(u2_wire wir_r,
return pro;
}
}
/* ~(whip al gen)
*/
u2_noun // transfer
j2_mcy(Pt6, al, whip)(u2_wire wir_r,
u2_noun van, // retain
u2_noun gen, // retain
u2_noun axe) //
{
u2_noun cor = _al_core(wir_r, van, gen);
u2_weak hoc = u2_ds_look(wir_r, cor, "whip");
if ( u2_none == hoc ) {
return u2_cm_bail(c3__fail);
} else {
u2_noun gat = u2_nk_soft(wir_r, cor, hoc);
u2_noun pro = u2_nk_mong(wir_r, gat, u2k(axe));
u2_rz(wir_r, hoc);
return pro;
}
}

View File

@ -91,7 +91,7 @@
return u2_bt
(wir_r, c3__tsgr,
u2_bc(wir_r, c3__brdt, u2_rx(wir_r, p_gen)),
u2_bc(wir_r, c3__cnbc, u2_blip));
u2_bc(wir_r, c3__cnzy, u2_blip));
}
_open_do_p(brdt) // |.
{
@ -111,7 +111,7 @@
_open_do_p(wtbr) // ?|
{
if ( (u2_nul == p_gen) ) {
return u2_bt(wir_r, c3__dtsg, 'f', u2_no);
return u2_bt(wir_r, c3__dtzz, 'f', u2_no);
}
else {
u2_noun ip_gen = u2_h(p_gen);
@ -120,7 +120,7 @@
return u2_bq
(wir_r, c3__wtcl,
u2_rx(wir_r, ip_gen),
u2_bt(wir_r, c3__dtsg, 'f', u2_yes),
u2_bt(wir_r, c3__dtzz, 'f', u2_yes),
_open_in_wtbr(wir_r, tp_gen));
}
}
@ -173,7 +173,7 @@
_open_do_p(wtpm) // ?&
{
if ( (u2_nul == p_gen) ) {
return u2_bt(wir_r, c3__dtsg, 'f', u2_yes);
return u2_bt(wir_r, c3__dtzz, 'f', u2_yes);
}
else {
u2_noun ip_gen = u2_h(p_gen);
@ -183,7 +183,7 @@
(wir_r, c3__wtcl,
u2_rx(wir_r, ip_gen),
_open_in_wtpm(wir_r, tp_gen),
u2_bt(wir_r, c3__dtsg, 'f', u2_no));
u2_bt(wir_r, c3__dtzz, 'f', u2_no));
}
}
#if 0
@ -205,8 +205,8 @@
return u2_bq
(wir_r, c3__wtcl,
u2_rx(wir_r, p_gen),
u2_bt(wir_r, c3__dtsg, 'f', u2_no),
u2_bt(wir_r, c3__dtsg, 'f', u2_yes));
u2_bt(wir_r, c3__dtzz, 'f', u2_no),
u2_bt(wir_r, c3__dtzz, 'f', u2_yes));
}
/***
****
@ -228,7 +228,7 @@
_open_do_p(clsg) // :~
{
if ( (u2_nul == p_gen) ) {
return u2_bt(wir_r, c3__dtsg, 'n', u2_nul);
return u2_bt(wir_r, c3__dtzz, 'n', u2_nul);
}
else {
u2_noun ip_gen = u2_h(p_gen);
@ -292,7 +292,7 @@
return u2_bt
(wir_r, c3__tsgr,
u2_rx(wir_r, p_gen),
u2_bc(wir_r, c3__cnbc, u2_blip));
u2_bc(wir_r, c3__cnzy, u2_blip));
} else {
return u2_bq(wir_r, c3__cncl,
u2_rx(wir_r, p_gen),
@ -336,7 +336,7 @@
u2_bc(wir_r,
c3__brcn,
j2_mcc(Pt4, by, put)(wir_r, q_gen, u2_blip, diz)),
u2_bc(wir_r, c3__cnbc, u2_blip));
u2_bc(wir_r, c3__cnzy, u2_blip));
u2_rz(wir_r, diz);
return ret;
@ -344,6 +344,7 @@
/***
****
***/
/*
_open_do_pq(sgts) // ~=
{
return u2_bt
@ -351,6 +352,7 @@
u2_bc(wir_r, c3__germ, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
_open_do_pq(sgbr) // ~|
{
return u2_bt
@ -362,7 +364,7 @@
{
return u2_bt
(wir_r, c3__sggr,
u2_bq(wir_r, c3__bank, c3__dtsg, u2_blip, u2_rx(wir_r, p_gen)),
u2_bq(wir_r, c3__bank, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
_open_do_pq(sggl) // ~>
@ -376,7 +378,7 @@
{
return u2_bt
(wir_r, c3__sggr,
u2_bq(wir_r, c3__sole, c3__dtsg, u2_blip, u2_rx(wir_r, p_gen)),
u2_bq(wir_r, c3__sole, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
_open_do_pq(sgdt) // ~.
@ -393,14 +395,14 @@
{
return u2_bt(wir_r, c3__sggr,
u2_bq(wir_r, c3__live,
c3__dtsg, u2_blip, u2_rx(wir_r, p_gen)),
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,
u2_bq(wir_r, c3__ping,
c3__dtsg, u2_blip, u2_rx(wir_r, p_gen)),
c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
static u2_noun
@ -420,7 +422,7 @@
return u2_bc
(wir_r, u2_bc
(wir_r,
u2_bt(wir_r, c3__dtsg, u2_blip, u2_rx(wir_r, pir_gen)),
u2_bt(wir_r, c3__dtzz, u2_blip, u2_rx(wir_r, pir_gen)),
u2_bc(wir_r, c3__zpts, u2_rx(wir_r, qir_gen))),
_sgcn_a(wir_r, tr_gen, nob));
}
@ -432,7 +434,7 @@
u2_bq
(wir_r, c3__fast,
c3__clls,
u2_bt(wir_r, c3__dtsg, u2_blip, u2_rx(wir_r, p_gen)),
u2_bt(wir_r, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_bt
(wir_r, u2_bc(wir_r, c3__zpts, u2_rx(wir_r, q_gen)),
c3__clsg,
@ -443,9 +445,10 @@
{
return u2_bt
(wir_r, c3__sggr,
u2_bq(wir_r, c3__memo, c3__dtsg, u2_blip, u2_rx(wir_r, p_gen)),
u2_bq(wir_r, c3__memo, c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen));
}
*/
/***
****
***/
@ -581,6 +584,7 @@
_open_pq (brkt);
/*
_open_pq (sgts);
_open_pq (sgbr);
_open_pq (sgcl);
@ -591,7 +595,7 @@
_open_pq (sghx);
_open_pqrs(sgcn);
_open_pq (sgls);
*/
_open_pq (smcl);
// _open_p (smdq);
// _open_pq (smsg);
@ -614,10 +618,10 @@
case u2_nul: return u2_bc(wir_r, u2_rx(wir_r, gen), u2_nul);
case c3__cnbc: {
case c3__cnzy: {
return u2_bc(wir_r, u2_rx(wir_r, u2_t(gen)), u2_nul);
}
case c3__cnhx: {
case c3__cnzz: {
return u2_rx(wir_r, u2_t(gen));
}
case c3__cnts: {

View File

@ -12,7 +12,9 @@
u2_noun bid, // retain
u2_noun der) // retain
{
if ( c3__void == der ) {
if ( (c3__void == der) ||
(c3__void == u2t(u2t(u2t(bid)))) )
{
return c3__void;
}
else return u2_bt

View File

@ -127,11 +127,13 @@
j2_mck(Pt6, ut, moot)(u2_wire wir_r,
u2_noun cor); // retain
extern u2_ho_jet j2_mcj(Pt6, ut, busk)[];
extern u2_ho_jet j2_mcj(Pt6, ut, bust)[];
extern u2_ho_jet j2_mcj(Pt6, ut, crop)[];
extern u2_ho_jet j2_mcj(Pt6, ut, cull)[];
extern u2_ho_jet j2_mcj(Pt6, ut, find)[];
extern u2_ho_jet j2_mcj(Pt6, ut, fink)[];
extern u2_ho_jet j2_mcj(Pt6, ut, fino)[];
extern u2_ho_jet j2_mcj(Pt6, ut, fire)[];
extern u2_ho_jet j2_mcj(Pt6, ut, firm)[];
extern u2_ho_jet j2_mcj(Pt6, ut, fish)[];
@ -147,6 +149,7 @@
extern u2_ho_jet j2_mcj(Pt6, ut, play)[];
extern u2_ho_jet j2_mcj(Pt6, ut, rest)[];
extern u2_ho_jet j2_mcj(Pt6, ut, seek)[];
extern u2_ho_jet j2_mcj(Pt6, ut, sift)[];
extern u2_ho_jet j2_mcj(Pt6, ut, tack)[];
extern u2_ho_jet j2_mcj(Pt6, ut, tock)[];
@ -154,11 +157,12 @@
*/
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 },
{ j2_sc(Pt6, ut, crop), j2_mcj(Pt6, ut, crop), 0, 0, u2_none },
{ j2_sc(Pt6, ut, cull), j2_mcj(Pt6, ut, cull), 0, 0, u2_none },
{ j2_sc(Pt6, ut, find), j2_mcj(Pt6, ut, find), 0, 0, u2_none },
{ j2_sc(Pt6, ut, fink), j2_mcj(Pt6, ut, fink), 0, 0, u2_none },
{ j2_sc(Pt6, ut, fino), j2_mcj(Pt6, ut, fino), 0, 0, u2_none },
{ j2_sc(Pt6, ut, fire), j2_mcj(Pt6, ut, fire), 0, 0, u2_none },
{ j2_sc(Pt6, ut, firm), j2_mcj(Pt6, ut, firm), 0, 0, u2_none },
{ j2_sc(Pt6, ut, fish), j2_mcj(Pt6, ut, fish), 0, 0, u2_none },
@ -174,6 +178,7 @@
{ j2_sc(Pt6, ut, play), j2_mcj(Pt6, ut, play), 0, 0, u2_none },
{ j2_sc(Pt6, ut, rest), j2_mcj(Pt6, ut, rest), 0, 0, u2_none },
{ j2_sc(Pt6, ut, seek), j2_mcj(Pt6, ut, seek), 0, 0, u2_none },
{ j2_sc(Pt6, ut, sift), j2_mcj(Pt6, ut, sift), 0, 0, u2_none },
{ j2_sc(Pt6, ut, tack), j2_mcj(Pt6, ut, tack), 0, 0, u2_none },
{ j2_sc(Pt6, ut, tock), j2_mcj(Pt6, ut, tock), 0, 0, u2_none },
{ }

View File

@ -29,7 +29,7 @@
case c3__atom: return _0;
case c3__bull: u2_bi_cell(wir_r, u2_t(sut), &p_sut, &q_sut);
{
return _burn_in(wir_r, van, q_sut, gil);
return u2_bl_error(wir_r, "burn-bull");
}
case c3__cell: u2_bi_cell(wir_r, u2_t(sut), &p_sut, &q_sut);
{

134
gen164/6/ut_busk.c Normal file
View File

@ -0,0 +1,134 @@
/* j/6/ut_busk.c
**
** This file is in the public domain.
*/
#include "all.h"
#include "../pit.h"
u2_ho_jet
j2_mcj(Pt6, ut, busk)[];
/* logic
*/
u2_noun // transfer
j2_mcx(Pt6, ut, busk)(u2_wire wir_r,
u2_noun van, // retain
u2_noun sut, // retain
u2_noun cog, // retain
u2_noun hyp) // retain
{
u2_noun sep = j2_mcy(Pt6, ut, seep)(wir_r, van, sut, c3__both, hyp);
u2_noun bid = u2_bt(wir_r, u2k(cog), u2k(hyp), sep);
u2_noun ret = j2_mby(Pt6, bull)(wir_r, bid, sut);
u2z(sep);
u2z(bid);
return ret;
}
/* boilerplate
*/
u2_noun // transfer
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,
0)) ||
(u2_no == u2_stud(cog)) ||
(u2_none == (sut = u2_frag(u2_cv_sam, van))) )
{
return u2_bl_bail(wir_r, c3__fail);
} else {
return j2_mcx(Pt6, ut, busk)(wir_r, van, sut, cog, hyp);
}
}
u2_weak // transfer
j2_mci(Pt6, ut, busk)(u2_wire wir_r,
u2_noun van, // retain
u2_noun sut, // retain
u2_noun cog, // retain
u2_noun hyp) // retain
{
u2_weak hoc = u2_ds_look(wir_r, van, "busk");
if ( u2_none == hoc ) {
c3_assert(!"register busk");
return u2_none;
} 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, cog,
u2_cv_sam_3, u2_rx(wir_r, hyp), 0);
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;
}
u2_rl_lose(wir_r, gat);
return cor;
}
}
u2_noun // transfer
j2_mcy(Pt6, ut, busk)(u2_wire wir_r,
u2_noun van, // retain
u2_noun sut, // retain
u2_noun cog, // retain
u2_noun hyp) // retain
{
u2_ho_jet *jet_j = &j2_mcj(Pt6, ut, busk)[0];
if ( (jet_j->sat_s & u2_jet_live) && !(jet_j->sat_s & u2_jet_test) ) {
return j2_mcx(Pt6, ut, busk)(wir_r, van, sut, cog, hyp);
}
else {
u2_noun cor, fol, pro;
cor = j2_mci(Pt6, ut, busk)(wir_r, van, sut, cog, hyp);
fol = u2_h(cor);
pro = u2_ho_use(wir_r, jet_j, cor, fol);
if ( u2_none == pro ) return u2_bl_bail(wir_r, c3__fail);
u2_rz(wir_r, cor);
u2_rz(wir_r, fol);
return pro;
}
}
u2_weak
j2_mck(Pt6, ut, busk)(u2_wire wir_r,
u2_noun cor)
{
u2_noun sut, hyp, van;
if ( (u2_no == u2_mean(cor, u2_cv_sam_3, &hyp, u2_cv_con, &van, &hyp, 0)) ||
(u2_none == (sut = u2_frag(u2_cv_sam, van))) )
{
return u2_none;
} else {
return u2_rc(wir_r, u2_rx(wir_r, sut), u2_rx(wir_r, hyp));
}
}
/* structures
*/
u2_ho_jet
j2_mcj(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,
},
{ }
};

View File

@ -19,7 +19,7 @@
u2_bc(wir_r, u2_rx(wir_r, u2_bi_h(wir_r, u2_bi_h(wir_r, yam))),
u2_rx(wir_r, dib)),
u2_rx(wir_r, u2_bi_t(wir_r, yam)));
u2_noun woo = u2_bc(wir_r, c3__cnbc, u2_blip);
u2_noun woo = u2_bc(wir_r, c3__cnzy, u2_blip);
u2_noun wox = j2_mcy(Pt6, ut, mint)(wir_r, van, sut, c3__noun, woo);
u2_noun ret = u2_nk_nock(wir_r, yib, u2_t(wox));

Some files were not shown because too many files have changed in this diff Show More