Adapt jet layer 3 to new noun system.

This commit is contained in:
C. Guy Yarvin 2014-08-19 21:39:48 -04:00
parent f347b84db5
commit adc95b417a
24 changed files with 371 additions and 389 deletions

View File

@ -330,7 +330,10 @@ $(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(BPT_O)
meme: $(BIN)/meme meme: $(BIN)/meme
$(BIN)/meme: f/meme.o $(J164_1_OFILES) $(J164_2_OFILES) $(BIN)/meme: f/meme.o \
$(J164_1_OFILES) \
$(J164_2_OFILES) \
$(J164_3_OFILES)
$(CC) -g $< -lgmp -o $@ $(CC) -g $< -lgmp -o $@
tags: tags:

View File

@ -2587,7 +2587,7 @@ u2_cr_bytes(c3_w a_w,
c3_assert(u2_none != d); c3_assert(u2_none != d);
/* Efficiency: don't call u2_cr_word(). /* Efficiency: don't call u2_cr_byte().
*/ */
for ( i_w = 0; i_w < b_w; i_w++ ) { for ( i_w = 0; i_w < b_w; i_w++ ) {
c_y[i_w] = u2_cr_byte((a_w + i_w), d); c_y[i_w] = u2_cr_byte((a_w + i_w), d);

View File

@ -8,33 +8,32 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, bex)(u2_wire wir_r, j2_mbc(Pt3, bex)(u2_atom a) // retain
u2_atom a) // retain
{ {
mpz_t a_mp; mpz_t a_mp;
if ( !u2_fly_is_cat(a) ) { if ( u2_ne(u2_co_is_cat(a)) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
mpz_init_set_ui(a_mp, 1); mpz_init_set_ui(a_mp, 1);
mpz_mul_2exp(a_mp, a_mp, a); mpz_mul_2exp(a_mp, a_mp, a);
return u2_rl_mp(wir_r, a_mp); return u2_ci_mp(a_mp);
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, bex)(u2_wire wir_r, j2_mb(Pt3, bex)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a; u2_noun a;
if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) || if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ||
(u2_no == u2_stud(a)) ) (u2_no == u2ud(a)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, bex)(wir_r, a); return j2_mbc(Pt3, bex)(a);
} }
} }

View File

@ -8,17 +8,16 @@
/* functions /* functions
*/ */
u2_noun // transfer u2_noun // transfer
j2_mbc(Pt3, can)(u2_wire wir_r, j2_mbc(Pt3, can)(u2_atom a, // retain
u2_atom a, // retain
u2_noun b) // retain u2_noun b) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
c3_g a_g = a; c3_g a_g = a;
c3_w tot_w = 0; c3_w tot_w = 0;
u2_ray sal_r; c3_w* sal_w;
/* Measure and validate the slab required. /* Measure and validate the slab required.
*/ */
@ -28,27 +27,27 @@
while ( 1 ) { while ( 1 ) {
u2_noun i_cab, pi_cab, qi_cab; u2_noun i_cab, pi_cab, qi_cab;
if ( _0 == cab ) { if ( 0 == cab ) {
break; break;
} }
if ( (u2_no == u2_dust(cab)) || if ( (u2_no == u2du(cab)) ||
(u2_no == u2_dust(i_cab = u2_h(cab))) || (u2_no == u2du(i_cab = u2h(cab))) ||
!(u2_fly_is_cat(pi_cab = u2_h(i_cab))) || u2_ne(u2_co_is_cat(pi_cab = u2h(i_cab))) ||
u2_no == u2_stud(qi_cab = u2_t(i_cab)) ) u2_no == u2ud(qi_cab = u2t(i_cab)) )
{ {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else if ( (tot_w + pi_cab) < tot_w ) { else if ( (tot_w + pi_cab) < tot_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
tot_w += pi_cab; tot_w += pi_cab;
cab = u2_t(cab); cab = u2t(cab);
} }
if ( 0 == tot_w ) { if ( 0 == tot_w ) {
return _0; return 0;
} }
if ( 0 == (sal_r = u2_rl_slaq(wir_r, a_g, tot_w)) ) { if ( 0 == (sal_w = u2_ca_slaq(a_g, tot_w)) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
} }
@ -58,31 +57,30 @@
u2_noun cab = b; u2_noun cab = b;
c3_w pos_w = 0; c3_w pos_w = 0;
while ( _0 != cab ) { while ( 0 != cab ) {
u2_noun i_cab = u2_h(cab); u2_noun i_cab = u2h(cab);
u2_atom pi_cab = u2_h(i_cab); u2_atom pi_cab = u2h(i_cab);
u2_atom qi_cab = u2_t(i_cab); u2_atom qi_cab = u2t(i_cab);
u2_chop(a_g, 0, pi_cab, pos_w, sal_r, qi_cab); u2_cr_chop(a_g, 0, pi_cab, pos_w, sal_w, qi_cab);
pos_w += pi_cab; pos_w += pi_cab;
cab = u2_t(cab); cab = u2t(cab);
} }
} }
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, can)(u2_wire wir_r, j2_mb(Pt3, can)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
(u2_no == u2_stud(a)) ) (u2_no == u2ud(a)) )
{ {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} else { } else {
return j2_mbc(Pt3, can)(wir_r, a, b); return j2_mbc(Pt3, can)(a, b);
} }
} }

View File

@ -8,32 +8,32 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, cap)(u2_wire wir_r, j2_mbc(Pt3, cap)(
u2_atom a) // retain u2_atom a) // retain
{ {
c3_w met_w = u2_met(0, a); c3_w met_w = u2_cr_met(0, a);
if ( met_w < 2 ) { if ( met_w < 2 ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} }
else if ( (1 == u2_bit((met_w - 2), a)) ) { else if ( (1 == u2_cr_bit((met_w - 2), a)) ) {
return _3; return 3;
} else { } else {
return _2; return 2;
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, cap)(u2_wire wir_r, j2_mb(Pt3, cap)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a; u2_noun a;
if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) || if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ||
(u2_no == u2_stud(a)) ) (u2_no == u2ud(a)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, cap)(wir_r, a); return j2_mbc(Pt3, cap)(a);
} }
} }

View File

@ -8,54 +8,52 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, cat)(u2_wire wir_r, j2_mbc(Pt3, cat)(u2_atom a, // retain
u2_atom a, // retain
u2_atom b, // retain u2_atom b, // retain
u2_atom c) // retain u2_atom c) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
c3_g a_g = a; c3_g a_g = a;
c3_w lew_w = u2_met(a_g, b); c3_w lew_w = u2_cr_met(a_g, b);
c3_w ler_w = u2_met(a_g, c); c3_w ler_w = u2_cr_met(a_g, c);
c3_w all_w = (lew_w + ler_w); c3_w all_w = (lew_w + ler_w);
if ( 0 == all_w ) { if ( 0 == all_w ) {
return 0; return 0;
} else { } else {
u2_ray sal_r = u2_rl_slaq(wir_r, a_g, all_w); c3_w* sal_w = u2_ca_slaq(a_g, all_w);
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
u2_chop(a_g, 0, lew_w, 0, sal_r, b); u2_cr_chop(a_g, 0, lew_w, 0, sal_w, b);
u2_chop(a_g, 0, ler_w, lew_w, sal_r, c); u2_cr_chop(a_g, 0, ler_w, lew_w, sal_w, c);
} }
// return u2_rl_moot(wir_r, sal_r); // return u2_ca_moot(sal_w);
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, cat)(u2_wire wir_r, j2_mb(Pt3, cat)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b, c; u2_noun a, b, c;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
u2_cv_sam_6, &b, u2_cv_sam_6, &b,
u2_cv_sam_7, &c, 0)) || u2_cv_sam_7, &c, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) || (u2_no == u2ud(b)) ||
(u2_no == u2_stud(c)) ) (u2_no == u2ud(c)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, cat)(wir_r, a, b, c); return j2_mbc(Pt3, cat)(a, b, c);
} }
} }

View File

@ -8,48 +8,46 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, con)(u2_wire wir_r, j2_mbc(Pt3, con)(u2_atom a, // retain
u2_atom a, // retain
u2_atom b) // retain u2_atom b) // retain
{ {
c3_w lna_w = u2_met(5, a); c3_w lna_w = u2_cr_met(5, a);
c3_w lnb_w = u2_met(5, b); c3_w lnb_w = u2_cr_met(5, b);
if ( (lna_w == 0) && (lnb_w == 0) ) { if ( (lna_w == 0) && (lnb_w == 0) ) {
return _0; return 0;
} else { } else {
c3_w len_w = c3_max(lna_w, lnb_w); c3_w len_w = c3_max(lna_w, lnb_w);
u2_ray sal_r = u2_rl_slab(wir_r, len_w); c3_w* sal_w = u2_ca_slab(len_w);
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
c3_w i_w; c3_w i_w;
u2_chop(5, 0, lna_w, 0, sal_r, a); u2_cr_chop(5, 0, lna_w, 0, sal_w, a);
for ( i_w = 0; i_w < lnb_w; i_w++ ) { for ( i_w = 0; i_w < lnb_w; i_w++ ) {
*u2_at_ray(sal_r + i_w) |= u2_atom_word(b, i_w); sal_w[i_w] |= u2_cr_word(i_w, b);
} }
// return u2_rl_moot(wir_r, sal_r); // return u2_ca_moot(sal_w);
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, con)(u2_wire wir_r, j2_mb(Pt3, con)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) ) (u2_no == u2ud(b)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, con)(wir_r, a, b); return j2_mbc(Pt3, con)(a, b);
} }
} }

View File

@ -8,19 +8,19 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, cut)(u2_wire wir_r, j2_mbc(Pt3, cut)(
u2_atom a, // retain u2_atom a, // retain
u2_atom b, // retain u2_atom b, // retain
u2_atom c, // retain u2_atom c, // retain
u2_atom d) // retain u2_atom d) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
if ( !u2_fly_is_cat(b) ) { if ( u2_ne(u2_co_is_cat(b)) ) {
return _0; return 0;
} }
if ( !u2_fly_is_cat(c) ) { if ( u2_ne(u2_co_is_cat(c)) ) {
c = 0x7fffffff; c = 0x7fffffff;
} }
@ -28,47 +28,47 @@
c3_g a_g = a; c3_g a_g = a;
c3_w b_w = b; c3_w b_w = b;
c3_w c_w = c; c3_w c_w = c;
c3_w len_w = u2_met(a_g, d); c3_w len_w = u2_cr_met(a_g, d);
if ( (_0 == c_w) || (b_w >= len_w) ) { if ( (0 == c_w) || (b_w >= len_w) ) {
return _0; return 0;
} }
if ( b_w + c_w > len_w ) { if ( b_w + c_w > len_w ) {
c_w = (len_w - b_w); c_w = (len_w - b_w);
} }
if ( (b_w == 0) && (c_w == len_w) ) { if ( (b_w == 0) && (c_w == len_w) ) {
return u2_rx(wir_r, d); return u2k(d);
} }
else { else {
u2_ray sal_r = u2_rl_slaq(wir_r, a_g, c_w); c3_w* sal_w = u2_ca_slaq(a_g, c_w);
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
u2_chop(a_g, b_w, c_w, 0, sal_r, d); u2_cr_chop(a_g, b_w, c_w, 0, sal_w, d);
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, cut)(u2_wire wir_r, j2_mb(Pt3, cut)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a, b, c, d; u2_noun a, b, c, d;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
u2_cv_sam_12, &b, u2_cv_sam_12, &b,
u2_cv_sam_13, &c, u2_cv_sam_13, &c,
u2_cv_sam_7, &d, 0)) || u2_cv_sam_7, &d, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) || (u2_no == u2ud(b)) ||
(u2_no == u2_stud(c)) || (u2_no == u2ud(c)) ||
(u2_no == u2_stud(d)) ) (u2_no == u2ud(d)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, cut)(wir_r, a, b, c, d); return j2_mbc(Pt3, cut)(a, b, c, d);
} }
} }

View File

@ -8,47 +8,45 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, dis)(u2_wire wir_r, j2_mbc(Pt3, dis)(u2_atom a, // retain
u2_atom a, // retain
u2_atom b) // retain u2_atom b) // retain
{ {
c3_w lna_w = u2_met(5, a); c3_w lna_w = u2_cr_met(5, a);
c3_w lnb_w = u2_met(5, b); c3_w lnb_w = u2_cr_met(5, b);
if ( (lna_w == 0) && (lnb_w == 0) ) { if ( (lna_w == 0) && (lnb_w == 0) ) {
return _0; return 0;
} else { } else {
c3_w len_w = c3_max(lna_w, lnb_w); c3_w len_w = c3_max(lna_w, lnb_w);
u2_ray sal_r = u2_rl_slab(wir_r, len_w); c3_w* sal_w = u2_ca_slab(len_w);
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
c3_w i_w; c3_w i_w;
u2_chop(5, 0, lna_w, 0, sal_r, a); u2_cr_chop(5, 0, lna_w, 0, sal_w, a);
for ( i_w = 0; i_w < len_w; i_w++ ) { for ( i_w = 0; i_w < len_w; i_w++ ) {
*u2_at_ray(sal_r + i_w) &= (i_w >= lnb_w) ? 0 : u2_atom_word(b, i_w); sal_w[i_w] &= (i_w >= lnb_w) ? 0 : u2_cr_word(i_w, b);
} }
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, dis)(u2_wire wir_r, j2_mb(Pt3, dis)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) ) (u2_no == u2ud(b)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, dis)(wir_r, a, b); return j2_mbc(Pt3, dis)(a, b);
} }
} }

View File

@ -8,45 +8,45 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, dor)(u2_wire wir_r, j2_mbc(Pt3, dor)(
u2_atom a, // retain u2_atom a, // retain
u2_atom b) // retain u2_atom b) // retain
{ {
if ( u2_yes == u2_sing(a, b) ) { if ( u2_yes == u2_cr_sing(a, b) ) {
return u2_yes; return u2_yes;
} }
else { else {
if ( u2_yes == u2_stud(a) ) { if ( u2_yes == u2ud(a) ) {
if ( u2_yes == u2_stud(b) ) { if ( u2_yes == u2ud(b) ) {
return j2_mbc(Pt1, lth)(wir_r, a, b); return j2_mbc(Pt1, lth)(a, b);
} }
else { else {
return u2_yes; return u2_yes;
} }
} }
else { else {
if ( u2_yes == u2_stud(b) ) { if ( u2_yes == u2ud(b) ) {
return u2_no; return u2_no;
} }
else { else {
if ( u2_yes == u2_sing(u2_h(a), u2_h(b)) ) { if ( u2_yes == u2_cr_sing(u2h(a), u2h(b)) ) {
return j2_mbc(Pt3, dor)(wir_r, u2_t(a), u2_t(b)); return j2_mbc(Pt3, dor)(u2t(a), u2t(b));
} }
else return j2_mbc(Pt3, dor)(wir_r, u2_h(a), u2_h(b)); else return j2_mbc(Pt3, dor)(u2h(a), u2h(b));
} }
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, dor)(u2_wire wir_r, j2_mb(Pt3, dor)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) ) { if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, dor)(wir_r, a, b); return j2_mbc(Pt3, dor)(a, b);
} }
} }

View File

@ -8,56 +8,56 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, end)(u2_wire wir_r, j2_mbc(Pt3, end)(
u2_atom a, // retain u2_atom a, // retain
u2_atom b, // retain u2_atom b, // retain
u2_atom c) // retain u2_atom c) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else if ( !u2_fly_is_cat(b) ) { else if ( u2_ne(u2_co_is_cat(b)) ) {
return u2_rx(wir_r, c); return u2k(c);
} }
else { else {
c3_g a_g = a; c3_g a_g = a;
c3_w b_w = b; c3_w b_w = b;
c3_w len_w = u2_met(a_g, c); c3_w len_w = u2_cr_met(a_g, c);
if ( _0 == b_w ) { if ( 0 == b_w ) {
return _0; return 0;
} }
else if ( b_w >= len_w ) { else if ( b_w >= len_w ) {
return u2_rx(wir_r, c); return u2k(c);
} }
else { else {
u2_ray sal_r = u2_rl_slaq(wir_r, a_g, b_w); c3_w* sal_w = u2_ca_slaq(a_g, b_w);
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
u2_chop(a_g, 0, b_w, 0, sal_r, c); u2_cr_chop(a_g, 0, b_w, 0, sal_w, c);
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, end)(u2_wire wir_r, j2_mb(Pt3, end)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a, b, c; u2_noun a, b, c;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
u2_cv_sam_6, &b, u2_cv_sam_6, &b,
u2_cv_sam_7, &c, 0)) || u2_cv_sam_7, &c, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) || (u2_no == u2ud(b)) ||
(u2_no == u2_stud(c)) ) (u2_no == u2ud(c)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, end)(wir_r, a, b, c); return j2_mbc(Pt3, end)(a, b, c);
} }
} }

View File

@ -8,28 +8,26 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, gor)(u2_wire wir_r, j2_mbc(Pt3, gor)(u2_noun a, // retain
u2_noun a, // retain
u2_noun b) // retain u2_noun b) // retain
{ {
c3_w c_w = u2_mug(a); c3_w c_w = u2_cr_mug(a);
c3_w d_w = u2_mug(b); c3_w d_w = u2_cr_mug(b);
if ( c_w == d_w ) { if ( c_w == d_w ) {
return j2_mbc(Pt3, dor)(wir_r, a, b); return j2_mbc(Pt3, dor)(a, b);
} }
else return (c_w < d_w) ? u2_yes : u2_no; else return (c_w < d_w) ? u2_yes : u2_no;
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, gor)(u2_wire wir_r, j2_mb(Pt3, gor)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) { if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, gor)(wir_r, a, b); return j2_mbc(Pt3, gor)(a, b);
} }
} }

View File

@ -8,42 +8,40 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, hor)(u2_wire wir_r, j2_mbc(Pt3, hor)(u2_noun a, // retain
u2_noun a, // retain
u2_noun b) // retain u2_noun b) // retain
{ {
if ( u2_yes == u2_stud(a) ) { if ( u2_yes == u2ud(a) ) {
if ( u2_yes == u2_stud(b) ) { if ( u2_yes == u2ud(b) ) {
return j2_mbc(Pt3, gor)(wir_r, a, b); return j2_mbc(Pt3, gor)(a, b);
} else { } else {
return u2_yes; return u2_yes;
} }
} else { } else {
if ( u2_yes == u2_stud(b) ) { if ( u2_yes == u2ud(b) ) {
return u2_no; return u2_no;
} }
else { else {
u2_noun h_a = u2_h(a); u2_noun h_a = u2h(a);
u2_noun h_b = u2_h(b); u2_noun h_b = u2h(b);
if ( u2_yes == u2_sing(h_a, h_b) ) { if ( u2_yes == u2_cr_sing(h_a, h_b) ) {
return j2_mbc(Pt3, gor)(wir_r, u2_t(a), u2_t(b)); return j2_mbc(Pt3, gor)(u2t(a), u2t(b));
} else { } else {
return j2_mbc(Pt3, gor)(wir_r, h_a, h_b); return j2_mbc(Pt3, gor)(h_a, h_b);
} }
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, hor)(u2_wire wir_r, j2_mb(Pt3, hor)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) { if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, hor)(wir_r, a, b); return j2_mbc(Pt3, hor)(a, b);
} }
} }

View File

@ -8,57 +8,57 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, lsh)(u2_wire wir_r, j2_mbc(Pt3, lsh)(
u2_atom a, // retain u2_atom a, // retain
u2_atom b, // retain u2_atom b, // retain
u2_atom c) // retain u2_atom c) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else if ( !u2_fly_is_cat(b) ) { else if ( u2_ne(u2_co_is_cat(b)) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
c3_g a_g = a; c3_g a_g = a;
c3_w b_w = b; c3_w b_w = b;
c3_w len_w = u2_met(a_g, c); c3_w len_w = u2_cr_met(a_g, c);
if ( _0 == len_w ) { if ( 0 == len_w ) {
return _0; return 0;
} }
else if ( (b_w + len_w) < len_w ) { else if ( (b_w + len_w) < len_w ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} }
else { else {
u2_ray sal_r = u2_rl_slaq(wir_r, a_g, (b_w + len_w)); c3_w* sal_w = u2_ca_slaq(a_g, (b_w + len_w));
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
u2_chop(a_g, 0, len_w, b_w, sal_r, c); u2_cr_chop(a_g, 0, len_w, b_w, sal_w, c);
// return u2_rl_moot(wir_r, sal_r); // return u2_ca_moot(sal_w);
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, lsh)(u2_wire wir_r, j2_mb(Pt3, lsh)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a, b, c; u2_noun a, b, c;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
u2_cv_sam_6, &b, u2_cv_sam_6, &b,
u2_cv_sam_7, &c, 0)) || u2_cv_sam_7, &c, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) || (u2_no == u2ud(b)) ||
(u2_no == u2_stud(c)) ) (u2_no == u2ud(c)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, lsh)(wir_r, a, b, c); return j2_mbc(Pt3, lsh)(a, b, c);
} }
} }

View File

@ -8,41 +8,41 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, mas)(u2_wire wir_r, j2_mbc(Pt3, mas)(
u2_atom a) // retain u2_atom a) // retain
{ {
c3_w b_w; c3_w b_w;
u2_atom c, d, e, f; u2_atom c, d, e, f;
b_w = u2_met(0, a); b_w = u2_cr_met(0, a);
if ( b_w < 2 ) { if ( b_w < 2 ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} }
else { else {
c = j2_mbc(Pt3, bex)(wir_r, (b_w - 1)); c = j2_mbc(Pt3, bex)((b_w - 1));
d = j2_mbc(Pt3, bex)(wir_r, (b_w - 2)); d = j2_mbc(Pt3, bex)((b_w - 2));
e = j2_mbc(Pt1, sub)(wir_r, a, c); e = j2_mbc(Pt1, sub)(a, c);
f = j2_mbc(Pt3, con)(wir_r, e, d); f = j2_mbc(Pt3, con)(e, d);
u2_rl_lose(wir_r, c); u2z(c);
u2_rl_lose(wir_r, d); u2z(d);
u2_rl_lose(wir_r, e); u2z(e);
return f; return f;
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, mas)(u2_wire wir_r, j2_mb(Pt3, mas)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a; u2_noun a;
if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) || if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ||
(u2_no == u2_stud(a)) ) (u2_no == u2ud(a)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, mas)(wir_r, a); return j2_mbc(Pt3, mas)(a);
} }
} }

View File

@ -8,37 +8,37 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, met)(u2_wire wir_r, j2_mbc(Pt3, met)(
u2_atom a, // retain u2_atom a, // retain
u2_atom b) // retain u2_atom b) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
if ( _0 == b ) { if ( 0 == b ) {
return _0; return 0;
} else return _1; } else return 1;
} }
else { else {
c3_w met_w = u2_met(a, b); c3_w met_w = u2_cr_met(a, b);
if ( !u2_fly_is_cat(met_w) ) { if ( u2_ne(u2_co_is_cat(met_w)) ) {
return u2_rl_words(wir_r, 1, &met_w); return u2_ci_words(1, &met_w);
} }
else return u2_met(a, b); else return u2_cr_met(a, b);
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, met)(u2_wire wir_r, j2_mb(Pt3, met)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) ) (u2_no == u2ud(b)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, met)(wir_r, a, b); return j2_mbc(Pt3, met)(a, b);
} }
} }

View File

@ -8,47 +8,45 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, mix)(u2_wire wir_r, j2_mbc(Pt3, mix)(u2_atom a, // retain
u2_atom a, // retain
u2_atom b) // retain u2_atom b) // retain
{ {
c3_w lna_w = u2_met(5, a); c3_w lna_w = u2_cr_met(5, a);
c3_w lnb_w = u2_met(5, b); c3_w lnb_w = u2_cr_met(5, b);
if ( (lna_w == 0) && (lnb_w == 0) ) { if ( (lna_w == 0) && (lnb_w == 0) ) {
return _0; return 0;
} else { } else {
c3_w len_w = c3_max(lna_w, lnb_w); c3_w len_w = c3_max(lna_w, lnb_w);
u2_ray sal_r = u2_rl_slab(wir_r, len_w); c3_w* sal_w = u2_ca_slab(len_w);
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
c3_w i_w; c3_w i_w;
u2_chop(5, 0, lna_w, 0, sal_r, a); u2_cr_chop(5, 0, lna_w, 0, sal_w, a);
for ( i_w = 0; i_w < lnb_w; i_w++ ) { for ( i_w = 0; i_w < lnb_w; i_w++ ) {
*u2_at_ray(sal_r + i_w) ^= u2_atom_word(b, i_w); sal_w[i_w] ^= u2_cr_word(i_w, b);
} }
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, mix)(u2_wire wir_r, j2_mb(Pt3, mix)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) ) (u2_no == u2ud(b)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, mix)(wir_r, a, b); return j2_mbc(Pt3, mix)(a, b);
} }
} }

View File

@ -8,15 +8,15 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, mug)(u2_wire wir_r, j2_mb(Pt3, mug)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun sam; u2_noun sam;
if ( u2_none == (sam = u2_frag(u2_cv_sam, cor)) ) { if ( u2_none == (sam = u2_cr_at(u2_cv_sam, cor)) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return u2_mug(sam); return u2_cr_mug(sam);
} }
} }

View File

@ -8,42 +8,42 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, peg)(u2_wire wir_r, j2_mbc(Pt3, peg)(
u2_atom a, // retain u2_atom a, // retain
u2_atom b) // retain u2_atom b) // retain
{ {
u2_atom c, d, e, f, g, h; u2_atom c, d, e, f, g, h;
c = u2_met(0, b); c = u2_cr_met(0, b);
d = j2_mbc(Pt1, dec)(wir_r, c); d = j2_mbc(Pt1, dec)(c);
e = j2_mbc(Pt3, lsh)(wir_r, _0, d, 1); e = j2_mbc(Pt3, lsh)(0, d, 1);
f = j2_mbc(Pt1, sub)(wir_r, b, e); f = j2_mbc(Pt1, sub)(b, e);
g = j2_mbc(Pt3, lsh)(wir_r, _0, d, a); g = j2_mbc(Pt3, lsh)(0, d, a);
h = j2_mbc(Pt1, add)(wir_r, f, g); h = j2_mbc(Pt1, add)(f, g);
u2_rl_lose(wir_r, c); u2z(c);
u2_rl_lose(wir_r, d); u2z(d);
u2_rl_lose(wir_r, e); u2z(e);
u2_rl_lose(wir_r, f); u2z(f);
u2_rl_lose(wir_r, g); u2z(g);
return h; return h;
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, peg)(u2_wire wir_r, j2_mb(Pt3, peg)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) || (u2_no == u2ud(b)) ||
(0 == a) || (0 == a) ||
(0 == b) ) (0 == b) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, peg)(wir_r, a, b); return j2_mbc(Pt3, peg)(a, b);
} }
} }

View File

@ -10,7 +10,7 @@
static u2_noun static u2_noun
_po_find(u2_noun buf, u2_noun a) _po_find(u2_noun buf, u2_noun a)
{ {
if ( !u2_fly_is_cat(a) ) { if ( u2_ne(u2_co_is_cat(a)) ) {
return u2_nul; return u2_nul;
} }
else { else {
@ -33,51 +33,51 @@
} }
u2_weak // transfer u2_weak // transfer
j2_mc(Pt3, po, ins)(u2_wire wir_r, j2_mc(Pt3, po, ins)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun x, a, buf; u2_noun x, a, buf;
if ( (u2_no == u2_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
(u2_no == u2du(x)) || (u2_no == u2du(x)) ||
(u2_no == u2ud(buf = u2h(x))) || (u2_no == u2ud(buf = u2h(x))) ||
(u2_no == u2ud(a)) ) (u2_no == u2ud(a)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return _po_find(buf, a); return _po_find(buf, a);
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mc(Pt3, po, ind)(u2_wire wir_r, j2_mc(Pt3, po, ind)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun x, a, buf; u2_noun x, a, buf;
if ( (u2_no == u2_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
(u2_no == u2du(x)) || (u2_no == u2du(x)) ||
(u2_no == u2ud(buf = u2t(x))) || (u2_no == u2ud(buf = u2t(x))) ||
(u2_no == u2ud(a)) ) (u2_no == u2ud(a)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return _po_find(buf, a); return _po_find(buf, a);
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mc(Pt3, po, tos)(u2_wire wir_r, j2_mc(Pt3, po, tos)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun x, a, buf; u2_noun x, a, buf;
if ( (u2_no == u2_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
(u2_no == u2du(x)) || (u2_no == u2du(x)) ||
(u2_no == u2ud(buf = u2h(x))) || (u2_no == u2ud(buf = u2h(x))) ||
(u2_no == u2ud(a)) || (u2_no == u2ud(a)) ||
(a >= 256) ) (a >= 256) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} }
else { else {
c3_y byt_y[3]; c3_y byt_y[3];
@ -87,18 +87,18 @@
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mc(Pt3, po, tod)(u2_wire wir_r, j2_mc(Pt3, po, tod)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun x, a, buf; u2_noun x, a, buf;
if ( (u2_no == u2_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
(u2_no == u2du(x)) || (u2_no == u2du(x)) ||
(u2_no == u2ud(buf = u2t(x))) || (u2_no == u2ud(buf = u2t(x))) ||
(u2_no == u2ud(a)) || (u2_no == u2ud(a)) ||
(a >= 256) ) (a >= 256) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
c3_y byt_y[3]; c3_y byt_y[3];

View File

@ -8,17 +8,16 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, rap)(u2_wire wir_r, j2_mbc(Pt3, rap)(u2_atom a, // retain
u2_atom a, // retain
u2_noun b) // retain u2_noun b) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} }
else { else {
c3_g a_g = a; c3_g a_g = a;
c3_w tot_w = 0; c3_w tot_w = 0;
u2_ray sal_r; c3_w* sal_w;
/* Measure and validate the slab required. /* Measure and validate the slab required.
*/ */
@ -29,26 +28,26 @@
u2_noun h_cab; u2_noun h_cab;
c3_w len_w; c3_w len_w;
if ( _0 == cab ) { if ( 0 == cab ) {
break; break;
} }
else if ( u2_no == u2_dust(cab) ) { else if ( u2_no == u2du(cab) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} }
else if ( u2_no == u2_stud(h_cab = u2_h(cab)) ) { else if ( u2_no == u2ud(h_cab = u2h(cab)) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} }
else if ( (tot_w + (len_w = u2_met(a_g, h_cab))) < tot_w ) { else if ( (tot_w + (len_w = u2_cr_met(a_g, h_cab))) < tot_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
tot_w += len_w; tot_w += len_w;
cab = u2_t(cab); cab = u2t(cab);
} }
if ( 0 == tot_w ) { if ( 0 == tot_w ) {
return _0; return 0;
} }
if ( 0 == (sal_r = u2_rl_slaq(wir_r, a_g, tot_w)) ) { if ( 0 == (sal_w = u2_ca_slaq(a_g, tot_w)) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
} }
@ -58,31 +57,30 @@
u2_noun cab = b; u2_noun cab = b;
c3_w pos_w = 0; c3_w pos_w = 0;
while ( _0 != cab ) { while ( 0 != cab ) {
u2_noun h_cab = u2_h(cab); u2_noun h_cab = u2h(cab);
c3_w len_w = u2_met(a_g, h_cab); c3_w len_w = u2_cr_met(a_g, h_cab);
u2_chop(a_g, 0, len_w, pos_w, sal_r, h_cab); u2_cr_chop(a_g, 0, len_w, pos_w, sal_w, h_cab);
pos_w += len_w; pos_w += len_w;
cab = u2_t(cab); cab = u2t(cab);
} }
} }
// return u2_rl_moot(wir_r, sal_r); // return u2_ca_moot(sal_w);
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, rap)(u2_wire wir_r, j2_mb(Pt3, rap)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
(u2_no == u2_stud(a)) ) (u2_no == u2ud(a)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, rap)(wir_r, a, b); return j2_mbc(Pt3, rap)(a, b);
} }
} }

View File

@ -8,12 +8,11 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, rip)(u2_wire wir_r, j2_mbc(Pt3, rip)(u2_atom a, // retain
u2_atom a, // retain
u2_atom b) // retain u2_atom b) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else { else {
u2_noun pir = u2_nul; u2_noun pir = u2_nul;
@ -21,7 +20,7 @@
c3_w i_w; c3_w i_w;
if ( a_g < 5 ) { if ( a_g < 5 ) {
c3_w met_w = u2_met(a_g, b); c3_w met_w = u2_cr_met(a_g, b);
c3_w mek_w = ((1 << (1 << a_g)) - 1); c3_w mek_w = ((1 << (1 << a_g)) - 1);
for ( i_w = 0; i_w < met_w; i_w++ ) { for ( i_w = 0; i_w < met_w; i_w++ ) {
@ -29,16 +28,16 @@
c3_w bit_w = (pat_w << a_g); c3_w bit_w = (pat_w << a_g);
c3_w wor_w = (bit_w >> 5); c3_w wor_w = (bit_w >> 5);
c3_w sif_w = (bit_w & 31); c3_w sif_w = (bit_w & 31);
c3_w src_w = u2_atom_word(b, wor_w); c3_w src_w = u2_cr_word(wor_w, b);
c3_w rip_w = ((src_w >> sif_w) & mek_w); c3_w rip_w = ((src_w >> sif_w) & mek_w);
pir = u2_rc(wir_r, rip_w, pir); pir = u2nc(rip_w, pir);
} }
return pir; return pir;
} }
else { else {
c3_w met_w = u2_met(a_g, b); c3_w met_w = u2_cr_met(a_g, b);
c3_w len_w = u2_met(5, b); c3_w len_w = u2_cr_met(5, b);
c3_g san_g = (a_g - 5); c3_g san_g = (a_g - 5);
c3_w san_w = 1 << san_g; c3_w san_w = 1 << san_g;
c3_w dif_w = (met_w << san_g) - len_w; c3_w dif_w = (met_w << san_g) - len_w;
@ -48,20 +47,20 @@
c3_w pat_w = (met_w - (i_w + 1)); c3_w pat_w = (met_w - (i_w + 1));
c3_w wut_w = (pat_w << san_g); c3_w wut_w = (pat_w << san_g);
c3_w sap_w = ((0 == i_w) ? tub_w : san_w); c3_w sap_w = ((0 == i_w) ? tub_w : san_w);
u2_ray sal_r = u2_rl_slab(wir_r, sap_w); c3_w* sal_w = u2_ca_slab(sap_w);
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} else { } else {
c3_w j_w; c3_w j_w;
u2_atom rip; u2_atom rip;
for ( j_w = 0; j_w < sap_w; j_w++ ) { for ( j_w = 0; j_w < sap_w; j_w++ ) {
*u2_at_ray(sal_r + j_w) = u2_atom_word(b, wut_w + j_w); sal_w[j_w] = u2_cr_word(wut_w + j_w, b);
} }
rip = u2_rl_malt(wir_r, sal_r); rip = u2_ca_malt(sal_w);
pir = u2_rc(wir_r, rip, pir); pir = u2nc(rip, pir);
} }
len_w -= san_w; len_w -= san_w;
} }
@ -70,18 +69,17 @@
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, rip)(u2_wire wir_r, j2_mb(Pt3, rip)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) || if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) ) (u2_no == u2ud(b)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, rip)(wir_r, a, b); return j2_mbc(Pt3, rip)(a, b);
} }
} }

View File

@ -8,54 +8,54 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, rsh)(u2_wire wir_r, j2_mbc(Pt3, rsh)(
u2_atom a, // retain u2_atom a, // retain
u2_atom b, // retain u2_atom b, // retain
u2_atom c) // retain u2_atom c) // retain
{ {
if ( !u2_fly_is_cat(a) || (a >= 32) ) { if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
else if ( !u2_fly_is_cat(b) ) { else if ( u2_ne(u2_co_is_cat(b)) ) {
return _0; return 0;
} }
else { else {
c3_g a_g = a; c3_g a_g = a;
c3_w b_w = b; c3_w b_w = b;
c3_w len_w = u2_met(a_g, c); c3_w len_w = u2_cr_met(a_g, c);
if ( b_w >= len_w ) { if ( b_w >= len_w ) {
return _0; return 0;
} }
else { else {
u2_ray sal_r = u2_rl_slaq(wir_r, a_g, (len_w - b_w)); c3_w* sal_w = u2_ca_slaq(a_g, (len_w - b_w));
if ( 0 == sal_r ) { if ( 0 == sal_w ) {
return u2_bl_bail(wir_r, c3__fail); return u2_cm_bail(c3__fail);
} }
u2_chop(a_g, b_w, (len_w - b_w), 0, sal_r, c); u2_cr_chop(a_g, b_w, (len_w - b_w), 0, sal_w, c);
// return u2_rl_moot(wir_r, sal_r); // return u2_ca_moot(sal_w);
return u2_rl_malt(wir_r, sal_r); return u2_ca_malt(sal_w);
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, rsh)(u2_wire wir_r, j2_mb(Pt3, rsh)(
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a, b, c; u2_noun a, b, c;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
u2_cv_sam_6, &b, u2_cv_sam_6, &b,
u2_cv_sam_7, &c, 0)) || u2_cv_sam_7, &c, 0)) ||
(u2_no == u2_stud(a)) || (u2_no == u2ud(a)) ||
(u2_no == u2_stud(b)) || (u2_no == u2ud(b)) ||
(u2_no == u2_stud(c)) ) (u2_no == u2ud(c)) )
{ {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, rsh)(wir_r, a, b, c); return j2_mbc(Pt3, rsh)(a, b, c);
} }
} }

View File

@ -8,28 +8,26 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mbc(Pt3, vor)(u2_wire wir_r, j2_mbc(Pt3, vor)(u2_atom a, // retain
u2_atom a, // retain
u2_atom b) // retain u2_atom b) // retain
{ {
c3_w c_w = u2_mug(u2_mug(a)); c3_w c_w = u2_cr_mug(u2_cr_mug(a));
c3_w d_w = u2_mug(u2_mug(b)); c3_w d_w = u2_cr_mug(u2_cr_mug(b));
if ( c_w == d_w ) { if ( c_w == d_w ) {
return j2_mbc(Pt3, dor)(wir_r, a, b); return j2_mbc(Pt3, dor)(a, b);
} }
else return (c_w < d_w) ? u2_yes : u2_no; else return (c_w < d_w) ? u2_yes : u2_no;
} }
u2_weak // transfer u2_weak // transfer
j2_mb(Pt3, vor)(u2_wire wir_r, j2_mb(Pt3, vor)(u2_noun cor) // retain
u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) { if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_cm_bail(c3__exit);
} else { } else {
return j2_mbc(Pt3, vor)(wir_r, a, b); return j2_mbc(Pt3, vor)(a, b);
} }
} }