urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 10:29:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ae7963' into cabclean

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-20 14:58:38 -08:00
commit dd7ef1a6a2
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jets/f/ut_seek.c
View File

@ -142,7 +142,7 @@
if ( c3y == u3du(i_hyp) ) {
yip = u3k(i_hyp);
} else {
yip = u3nt(2, 0, u3nc(u3_nul, u3k(i_hyp)));
yip = u3nt(c3n, 0, u3nc(u3_nul, u3k(i_hyp)));
}
zar = _cqfu_seek(van, sut, way, t_hyp);
@ -193,23 +193,6 @@
u3z(hud);
}
}
else if ( 2 == u3h(yip) ) {
u3_noun p_yip, q_yip, hud;
if ( c3n == u3r_cell(u3t(yip), &p_yip, &q_yip) ) {
return u3m_bail(c3__fail);
}
hud = u3qfu_fink(van, syp, p_yip, way, u3t(q_yip));
{
u3_noun p_hud, q_hud;
u3r_cell(hud, &p_hud, &q_hud);
ret = u3nc(u3qc_peg(p_zar, p_hud),
u3k(q_hud));
u3z(hud);
}
}
else {
u3_noun p_yip = u3t(yip);

9
jets/tree.c
View File

@ -406,6 +406,7 @@ static u3j_harm _mood__hoon__ut_a[] =
{}
};
#if 0
static u3j_harm _mood__hoon__ap_a[] =
{ // {"hack", u3wfp_open},
// {"late", u3wfp_open},
@ -413,7 +414,6 @@ static u3j_harm _mood__hoon__ap_a[] =
{"rake", u3wfp_rake},
{}
};
#if 0
static u3j_harm _mood__hoon__al_a[] =
{ {"bunt", u3wfl_bunt},
{"whip", u3wfl_whip},
@ -559,7 +559,7 @@ static u3j_core _mood__hoon_d[] =
{ "hike", _mood__hoon_hike_a },
{ "look", _mood__hoon_look_a },
{ "ap", _mood__hoon__ap_a },
// { "ap", _mood__hoon__ap_a },
// { "al", _mood__hoon__al_a },
{ "ut", _mood__hoon__ut_a, _mood__hoon__ut_d },
{ "arvo", 0, _arvo_d },
@ -572,6 +572,10 @@ static u3j_core _mood_d[] =
{}
};
static u3j_core _k161_d[] =
{ { "mood", 0, _mood_d },
{}
};
static u3j_core _k162_d[] =
{ { "mood", 0, _mood_d },
{}
@ -582,6 +586,7 @@ static u3j_core _k163_d[] =
};
static u3j_core _d[] = {
{ "k161", 0, _k161_d},
{ "k162", 0, _k162_d},
{ "k163", 0, _k163_d},
{}