More calx adjustments.

This commit is contained in:
C. Guy Yarvin 2014-11-18 02:49:03 -08:00
parent 9a06716750
commit 7598994ba4
2 changed files with 21 additions and 17 deletions

View File

@ -10,9 +10,9 @@
++ bosh ,@uvH :: local battery hash
++ batt ,* :: battery
++ calf ::
$: jax=,@ud :: jet index
$: jax=,@ud :: hot core index
pax=,@ud :: parent axis or 0
hap=(map ,@ud ,@ud) :: axis/jet
hap=(map ,@ud ,@ud) :: axis/hot arm index
== ::
++ calx (trel calf cope club) :: cached by battery
++ clog (pair cope (map batt club)) :: identity record

8
n/j.c
View File

@ -726,10 +726,14 @@ _cj_hook_in(u3_noun cor,
{
u3_noun p_cax, q_cax, r_cax;
u3_noun jax, pax, mop, huc, hap;
u3_noun p_mop, q_mop, r_mop;
u3x_trel(cax, &p_cax, &q_cax, &r_cax);
u3x_trel(p_cax, &jax, &pax, &hap);
mop = q_cax;
u3x_trel(mop, &p_mop, &q_mop, &r_mop);
c3_assert(pax == q_mop);
huc = u3t(r_cax);
{
c3_l jax_l = jax;
@ -739,9 +743,9 @@ _cj_hook_in(u3_noun cor,
if ( u3_none == fol ) {
// The caller wants a deeper core.
//
if ( 0 == pax ) { return u3m_bail(c3__fail); }
if ( 0 == q_mop ) { return u3m_bail(c3__fail); }
else {
u3_noun inn = u3k(u3x_at(pax, cor));
u3_noun inn = u3k(u3x_at(q_mop, cor));
u3z(cax); u3z(cor);
return _cj_hook_in(inn, tam_c, jet_o);