ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-06 23:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix compile errors

Browse Source
This commit is contained in:
Paul Driver 2018-03-30 11:49:18 -07:00
parent 78d4d79959
commit a61ed7df17
5 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/noun/jets.h
View File

@ -96,10 +96,12 @@
u3j_soft(u3_noun cor,
const c3_c* tam_c);
/* u3j_find(): in warm state, return u3_none or calx. RETAINS.
/* u3j_spot():
**
** Identify `cor`s location. RETAIN.
*/
u3_weak
u3j_find(u3_noun bat);
u3j_spot(u3_noun cor);
/* u3j_kick(): try to kick by jet. If no kick, produce u3_none.
**
@ -129,4 +131,4 @@
/* u3j_reap(): promote jet state. RETAINS.
*/
void
u3j_reap(u3_noun das, u3p(u3h_root) har_p);
u3j_reap(u3p(u3h_root) cod_p, u3p(u3h_root) war_p);

34
noun/jets.c
View File

@ -182,19 +182,6 @@ _cj_je_fsck(u3_noun clu)
return u3nt(u3i_string(nam_c), axe_l, huk);
}
/* _cj_sham(): ++sham.
*/
static u3_atom
_cj_sham(u3_noun som) // XX wrong, does not match ++sham
{
u3_atom jam = u3ke_jam(som);
u3_noun sha = u3qe_shax(jam);
u3_noun haf = u3qc_end(7, 1, sha);
u3z(jam); u3z(sha);
return haf;
}
/* _cj_find_cold(): search cold state for `bat`s registry.
* RETAIN.
*/
@ -516,11 +503,12 @@ _cj_hook_in(u3_noun cor,
return u3m_bail(c3__fail);
}
tem = u3i_string(tam_c),
tem = u3i_string(tam_c);
while ( 1 ) {
u3x_trel(loc, &pat, &name, &huc);
u3x_trel(loc, &pat, &nam, &huc);
got = u3qdb_get(huc, tem);
if ( u3_nul != got ) {
c3_l axe_l;
u3_noun pro, fol;
u3j_core* cop_u;
@ -532,8 +520,8 @@ _cj_hook_in(u3_noun cor,
pro = u3n_nock_on(cor, fol);
}
else {
c3_l axe_l, inx_l;
u3_noun hap, act, pro, fol;
c3_l jax_l, inx_l;
u3_noun hap, act;
u3z(fol);
act = _cj_find_warm(loc);
@ -848,9 +836,6 @@ _cj_mine(u3_noun cey, u3_noun cor)
void
u3j_mine(u3_noun clu, u3_noun cor)
{
u3_noun bat = u3h(cor);
u3_noun cax;
u3t_on(glu_o);
if ( (c3n == u3du(cor)) || (c3y == _cj_scan(cor)) ) {
u3z(clu);
@ -874,7 +859,7 @@ _cj_warm_reap(u3_noun kev)
{
u3_noun loc = u3a_take(u3h(kev));
u3_noun act = u3a_take(u3t(kev));
u3h_put(u3R->jed.har_p, loc, act);
u3h_put(u3R->jed.war_p, loc, act);
u3z(loc);
}
@ -950,9 +935,8 @@ static void
_cj_ream(u3_noun all)
{
c3_l par_l, jax_l;
u3_noun i, j, k,
all, lop, rul, loc, bal, act, lop,
pol, rem, rec, bat, pel, nam, huc;
u3_noun i, j, k, rul, loc, bal, act, lop, kev, rut,
pat, reg, pol, rem, rec, bat, pel, nam, huc;
u3_weak pac;
for ( i = all, lop = u3_nul; i != u3_nul; i = u3t(i) ) {
@ -1030,8 +1014,6 @@ _cj_warm_tap(u3_noun kev)
void
u3j_ream(void)
{
u3_noun rut, bat, reg, kev, rem, lop, i;
u3_weak pel;
u3h_free(u3R->jed.war_p);
u3R->jed.war_p = u3h_new();
c3_assert(u3R == &(u3H->rod_u));

14
noun/manage.c
View File

@ -458,9 +458,9 @@ static void
_pave_parts(void)
{
u3R->cax.har_p = u3h_new();
u3R->jed.har_p = u3h_new();
u3R->jed.war_p = u3h_new();
u3R->jed.cod_p = u3h_new();
u3R->byc.har_p = u3h_new();
u3R->jed.das = u3_nul;
}
/* u3m_mark(): mark all nouns in the road.
@ -469,9 +469,9 @@ c3_w
u3m_mark(void)
{
c3_w tot_w = 0;
tot_w += u3h_mark(u3R->jed.har_p);
tot_w += u3h_mark(u3R->jed.war_p);
tot_w += u3h_mark(u3R->jed.cod_p);
tot_w += u3n_bark();
tot_w += u3a_mark_noun(u3R->jed.das);
tot_w += u3a_mark_noun(u3R->ski.gul);
tot_w += u3a_mark_noun(u3R->bug.tax);
tot_w += u3a_mark_noun(u3R->bug.mer);
@ -797,15 +797,15 @@ u3_noun
u3m_love(u3_noun pro)
{
{
u3_noun das = u3R->jed.das;
u3p(u3h_root) har_p = u3R->jed.har_p;
u3p(u3h_root) cod_p = u3R->jed.cod_p;
u3p(u3h_root) war_p = u3R->jed.war_p;
u3p(u3h_root) byc_p = u3R->byc.har_p;
u3m_fall();
pro = u3a_take(pro);
u3j_reap(das, har_p);
u3j_reap(cod_p, war_p);
u3n_beep(byc_p);
u3R->cap_p = u3R->ear_p;

2
noun/trace.c
View File

@ -241,7 +241,7 @@ u3t_samp(void)
c3_o
u3t_come(u3_noun lab)
{
if ( (u3_nul == u3R->pro.don) || !_(u3r_sing(bal, u3h(u3R->pro.don))) ) {
if ( (u3_nul == u3R->pro.don) || !_(u3r_sing(lab, u3h(u3R->pro.don))) ) {
u3R->pro.don = u3nc(u3k(lab), u3R->pro.don);
return c3y;
}

4
vere/raft.c
View File

@ -1880,11 +1880,11 @@ _raft_grab(u3_noun ova)
fprintf(stderr, "arvo stuff: ");
_raft_print_memory(utv_w);
har_w = u3h_mark(u3R->jed.har_p);
har_w = u3h_mark(u3R->jed.war_p);
fprintf(stderr, " warm jet state: ");
_raft_print_memory(har_w);
das_w = u3a_mark_noun(u3R->jed.das);
das_w = u3h_mark(u3R->jed.cod_p);
fprintf(stderr, " cold jet state: ");
_raft_print_memory(das_w);