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

Compatible with k.164.

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-09-08 19:35:25 -07:00
parent 7b4782053b
commit df6bbc8fc4
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/j/q.h
View File

@ -9,7 +9,6 @@
u3_noun u3_cqa_div(u3_atom, u3_atom); u3_noun u3_cqa_div(u3_atom, u3_atom);
u3_noun u3_cqa_gte(u3_atom, u3_atom); u3_noun u3_cqa_gte(u3_atom, u3_atom);
u3_noun u3_cqa_gth(u3_atom, u3_atom); u3_noun u3_cqa_gth(u3_atom, u3_atom);
u3_noun u3_cqa_inc(u3_atom);
u3_noun u3_cqa_lte(u3_atom, u3_atom); u3_noun u3_cqa_lte(u3_atom, u3_atom);
u3_noun u3_cqa_lth(u3_atom, u3_atom); u3_noun u3_cqa_lth(u3_atom, u3_atom);
u3_noun u3_cqa_mod(u3_atom, u3_atom); u3_noun u3_cqa_mod(u3_atom, u3_atom);
@ -86,7 +85,6 @@
u3_noun u3_cqe_loss(u3_noun, u3_noun); u3_noun u3_cqe_loss(u3_noun, u3_noun);
u3_noun u3_cqe_repg(u3_noun, u3_noun, u3_noun); u3_noun u3_cqe_repg(u3_noun, u3_noun, u3_noun);
u3_noun u3_cqe_rexp(u3_noun, u3_noun); u3_noun u3_cqe_rexp(u3_noun, u3_noun);
u3_noun u3_cqe_tape(u3_noun);
u3_noun u3_cqe_trip(u3_atom); u3_noun u3_cqe_trip(u3_atom);
u3_noun u3_cqea_de(u3_atom, u3_atom); u3_noun u3_cqea_de(u3_atom, u3_atom);

4
include/j/w.h
View File

@ -9,7 +9,6 @@
u3_noun u3_cwa_div(u3_noun); u3_noun u3_cwa_div(u3_noun);
u3_noun u3_cwa_gte(u3_noun); u3_noun u3_cwa_gte(u3_noun);
u3_noun u3_cwa_gth(u3_noun); u3_noun u3_cwa_gth(u3_noun);
u3_noun u3_cwa_inc(u3_noun);
u3_noun u3_cwa_lte(u3_noun); u3_noun u3_cwa_lte(u3_noun);
u3_noun u3_cwa_lth(u3_noun); u3_noun u3_cwa_lth(u3_noun);
u3_noun u3_cwa_mod(u3_noun); u3_noun u3_cwa_mod(u3_noun);
@ -92,7 +91,6 @@
u3_noun u3_cwe_mule(u3_noun); u3_noun u3_cwe_mule(u3_noun);
u3_noun u3_cwe_repg(u3_noun); u3_noun u3_cwe_repg(u3_noun);
u3_noun u3_cwe_rexp(u3_noun); u3_noun u3_cwe_rexp(u3_noun);
u3_noun u3_cwe_tape(u3_noun);
u3_noun u3_cwe_trip(u3_noun); u3_noun u3_cwe_trip(u3_noun);
u3_noun u3_cwe_pfix(u3_noun); u3_noun u3_cwe_pfix(u3_noun);
@ -156,8 +154,6 @@
u3_noun u3_cwf_fork(u3_noun); u3_noun u3_cwf_fork(u3_noun);
u3_noun u3_cwf_hike(u3_noun); u3_noun u3_cwf_hike(u3_noun);
u3_noun u3_cwf_look(u3_noun); u3_noun u3_cwf_look(u3_noun);
u3_noun u3_cwf_slot(u3_noun);
u3_noun u3_cwf_type(u3_noun);
u3_noun u3_cwfl_bunt(u3_noun); u3_noun u3_cwfl_bunt(u3_noun);
u3_noun u3_cwfl_whip(u3_noun); u3_noun u3_cwfl_whip(u3_noun);

38
n/j.c
View File

@ -342,6 +342,33 @@ _cj_activate(u3_cs_core* cop_u, u3_cs_hood* hud_u)
} }
} }
/* _cj_chum(): decode chum as string.
*/
static c3_c*
_cj_chum(u3_noun chu)
{
if ( u3_so(u3ud(chu)) ) {
return u3_cr_string(chu);
}
else {
u3_noun h_chu = u3h(chu);
u3_noun t_chu = u3t(chu);
if ( u3_ne(u3_co_is_cat(t_chu)) ) {
return 0;
} else {
c3_c* h_chu_c = u3_cr_string(h_chu);
c3_c buf[33];
memset(buf, 0, 33);
snprintf(buf, 32, "%s%d", h_chu_c, t_chu);
free(h_chu_c);
return strdup(buf);
}
}
}
/* u3_cj_mine(): register core for jets. /* u3_cj_mine(): register core for jets.
*/ */
u3_noun u3_noun
@ -356,15 +383,14 @@ u3_cj_mine(u3_noun clu,
u3_noun p_clu, q_clu, r_clu; u3_noun p_clu, q_clu, r_clu;
u3_cs_hook* huk_u; u3_cs_hook* huk_u;
u3_cs_hood* hud_u; u3_cs_hood* hud_u;
c3_c* nam_c;
c3_l axe_l, par_l; c3_l axe_l, par_l;
u3_noun nam;
u3_noun pab; u3_noun pab;
if ( u3_no == u3_cr_trel(clu, &p_clu, &q_clu, &r_clu) ) if ( u3_no == u3_cr_trel(clu, &p_clu, &q_clu, &r_clu) )
{ printf("mine: bad z\r\n"); u3z(clu); return cor; } { printf("mine: bad z\r\n"); u3z(clu); return cor; }
if ( u3_ne(u3ud(nam = p_clu)) ) if ( 0 == (nam_c = _cj_chum(p_clu)) )
{ printf("mine: bad a\r\n"); u3z(clu); return cor; } { printf("mine: bad a\r\n"); u3z(clu); return cor; }
if ( u3_ne(u3du(q_clu)) ) if ( u3_ne(u3du(q_clu)) )
{ printf("mine: bad b\r\n"); u3z(clu); return cor; } { printf("mine: bad b\r\n"); u3z(clu); return cor; }
@ -428,10 +454,12 @@ u3_cj_mine(u3_noun clu,
u3_cs_core* cop_u = &dev_u[i_l]; u3_cs_core* cop_u = &dev_u[i_l];
if ( 0 == cop_u->cos_c ) { break; } if ( 0 == cop_u->cos_c ) { break; }
if ( u3_so(u3_cr_sing_c(cop_u->cos_c, nam)) ) { if ( !strcmp(cop_u->cos_c, nam_c) ) {
printf("mine: bound jet %s, %d\n", cop_u->cos_c, cop_u->jax_l); printf("mine: bound jet %s, %d\n", cop_u->cos_c, cop_u->jax_l);
jax_l = cop_u->jax_l; jax_l = cop_u->jax_l;
c3_assert(0 != jax_l); c3_assert(0 != jax_l);
free(nam_c);
break; break;
} }
i_l++; i_l++;
@ -441,7 +469,7 @@ u3_cj_mine(u3_noun clu,
u3_cs_core fak_u; u3_cs_core fak_u;
memset(&fak_u, 0, sizeof(u3_cs_core)); memset(&fak_u, 0, sizeof(u3_cs_core));
fak_u.cos_c = u3_cr_string(nam); fak_u.cos_c = nam_c;
printf("mine: dummy jet %s\n", fak_u.cos_c); printf("mine: dummy jet %s\n", fak_u.cos_c);
fak_u.par_u = par_u; fak_u.par_u = par_u;