urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-03 01:54:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Vanquish a find jet bug, hopefully the last.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-01-23 19:11:42 -08:00
parent fdcd587768
commit c51553dfa7
4 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jets/f/ut_find.c
View File

@ -41,6 +41,7 @@
0));
}
#if 0
static u3_noun
u3qfu_funk(u3_noun van,
u3_noun fid)
@ -68,6 +69,7 @@
foj = u3qfu_funk(van, fid);
u3_lo_tank(1, foj);
}
#endif
static u3_noun
u3qfu_perk(u3_noun van,
@ -589,8 +591,6 @@
u3_noun lon,
u3_noun gil)
{
fprintf(stderr, "fond %x\r\n", u3r_mug(sut));
if ( c3n == u3du(sut) ) switch ( sut ) {
default: return u3m_bail(c3__fail);
@ -635,7 +635,7 @@
{
// fprintf(stderr, "hold\r\n");
if ( (c3y == u3qdi_has(gil, sut)) ) {
return u3nt(c3n, c3y, u3k(p_heg));
return u3_nul;
}
else {
u3_noun zoc = u3qdi_put(gil, sut);
@ -780,8 +780,8 @@
fprintf(stderr, "old mug %x, new mug %x\r\n",
u3r_mug(old), u3r_mug(new));
u3qfu_dump(van, "sut", sut);
_funk_dump(van, "old", old);
_funk_dump(van, "new", new);
// _funk_dump(van, "old", old);
// _funk_dump(van, "new", new);
}
static u3_noun

4
jets/tree.c
View File

@ -348,7 +348,7 @@ static u3j_harm _mood__hoon__ut_burn_a[] = {{".2", u3wfu_burn}, {}};
static u3j_harm _mood__hoon__ut_conk_a[] = {{".2", u3wfu_conk}, {}};
static u3j_harm _mood__hoon__ut_crop_a[] = {{".2", u3wfu_crop}, {}};
// static u3j_harm _mood__hoon__ut_fire_a[] = {{".2", u3wfu_fire}, {}};
// static u3j_harm _mood__hoon__ut_fond_a[] = {{".2", u3wfu_fond}, {}};
static u3j_harm _mood__hoon__ut_fond_a[] = {{".2", u3wfu_fond}, {}};
static u3j_harm _mood__hoon__ut_fish_a[] = {{".2", u3wfu_fish}, {}};
static u3j_harm _mood__hoon__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}};
static u3j_harm _mood__hoon__ut_mint_a[] = {{".2", u3wfu_mint}, {}};
@ -366,7 +366,7 @@ static u3j_core _mood__hoon__ut_d[] =
{ "burn", _mood__hoon__ut_burn_a },
{ "conk", _mood__hoon__ut_conk_a },
{ "crop", _mood__hoon__ut_crop_a },
// { "fond", _mood__hoon__ut_fond_a },
{ "fond", _mood__hoon__ut_fond_a },
// { "fire", _mood__hoon__ut_fire_a },
{ "fish", _mood__hoon__ut_fish_a },
{ "fuse", _mood__hoon__ut_fuse_a },

1
noun/jets.c
View File

@ -408,7 +408,6 @@ _cj_kick_z(u3_noun cor, u3j_core* cop_u, u3j_harm* ham_u, u3_atom axe)
u3r_mug(ame),
u3r_mug(pro));
ham_u->liv = c3n;
find_error(cor, ame, pro);
c3_assert(0);
return u3m_bail(c3__fail);

40
noun/nock.c
View File

@ -5,6 +5,24 @@
static u3_noun _n_nock_on(u3_noun bus, u3_noun fol);
/* u3_term_io_hija(): hijack console for cooked print.
*/
FILE*
u3_term_io_hija(void);
/* u3_term_io_loja(): release console from cooked print.
*/
void
u3_term_io_loja(int x);
/* uL, uH: wrap hijack/lojack around fprintf.
**
** uL(fprintf(uH, ...));
*/
# define uH u3_term_io_hija()
# define uL(x) u3_term_io_loja(x)
/* _n_hint(): process hint.
*/
static u3_noun
@ -31,12 +49,22 @@ _n_hint(u3_noun zep,
u3t_push(tac);
#if 0
if ( c3__spot == zep ) {
printf("spot %d/%d : %d/%d\r\n",
u3h(u3h(u3t(hod))),
u3t(u3h(u3t(hod))),
u3h(u3t(u3t(hod))),
u3t(u3t(u3t(hod))));
{
static int low_i;
if ( !low_i ) {
low_i = 1;
if ( 0 == (u3R->pro.nox_d % 65536ULL) ) {
if ( c3__spot == zep ) {
uL(fprintf(uH, "spot %d/%d : %d/%d\r\n",
u3h(u3h(u3t(hod))),
u3t(u3h(u3t(hod))),
u3h(u3t(u3t(hod))),
u3t(u3t(u3t(hod)))));
}
}
low_i = 0;
}
}
#endif
pro = _n_nock_on(bus, nex);