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

Move loobeans from u3 to c3.

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-11-04 17:18:47 -08:00
parent ceb35b892c
commit dbe046620a
162 changed files with 1860 additions and 1860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
g/a.c
View File

@ -124,7 +124,7 @@ _me_road_all_hat(c3_w len_w)
u3_cm_bail(c3__meme); return 0; u3_cm_bail(c3__meme); return 0;
} }
if ( u3_yes == u3_ca_is_north(u3R) ) { if ( c3y == u3_ca_is_north(u3R) ) {
u3_post all_p; u3_post all_p;
all_p = u3R->hat_p; all_p = u3R->hat_p;
@ -148,7 +148,7 @@ _me_road_all_cap(c3_w len_w)
u3_cm_bail(c3__meme); return 0; u3_cm_bail(c3__meme); return 0;
} }
if ( u3_yes == u3_ca_is_north(u3R) ) { if ( c3y == u3_ca_is_north(u3R) ) {
u3R->cap_p -= len_w; u3R->cap_p -= len_w;
return u3_ca_into(u3R->cap_p); return u3_ca_into(u3R->cap_p);
} }
@ -371,7 +371,7 @@ u3_ca_free(void* tox_v)
} }
#endif #endif
if ( u3_yes == u3_ca_is_north(u3R) ) { if ( c3y == u3_ca_is_north(u3R) ) {
/* Try to coalesce with the block below. /* Try to coalesce with the block below.
*/ */
if ( box_w != u3_ca_into(u3R->rut_p) ) { if ( box_w != u3_ca_into(u3R->rut_p) ) {
@ -440,23 +440,23 @@ static void _me_wash_north(u3_noun dog);
static void static void
_me_wash_north_in(u3_noun som) _me_wash_north_in(u3_noun som)
{ {
if ( u3_so(u3_ca_is_cat(som)) ) return; if ( _(u3_ca_is_cat(som)) ) return;
if ( u3_ne(u3_ca_north_is_junior(u3R, som)) ) return; if ( !_(u3_ca_north_is_junior(u3R, som)) ) return;
_me_wash_north(som); _me_wash_north(som);
} }
static void static void
_me_wash_north(u3_noun dog) _me_wash_north(u3_noun dog)
{ {
c3_assert(u3_yes == u3_ca_is_dog(dog)); c3_assert(c3y == u3_ca_is_dog(dog));
// c3_assert(u3_yes == u3_ca_north_is_junior(u3R, dog)); // c3_assert(c3y == u3_ca_north_is_junior(u3R, dog));
{ {
u3_cs_noun* dog_u = u3_ca_to_ptr(dog); u3_cs_noun* dog_u = u3_ca_to_ptr(dog);
if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash
// if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; }
if ( u3_so(u3_ca_is_pom(dog)) ) { if ( _(u3_ca_is_pom(dog)) ) {
u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u; u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u;
_me_wash_north_in(god_u->hed); _me_wash_north_in(god_u->hed);
@ -471,23 +471,23 @@ static void _me_wash_south(u3_noun dog);
static void static void
_me_wash_south_in(u3_noun som) _me_wash_south_in(u3_noun som)
{ {
if ( u3_so(u3_ca_is_cat(som)) ) return; if ( _(u3_ca_is_cat(som)) ) return;
if ( u3_ne(u3_ca_south_is_junior(u3R, som)) ) return; if ( !_(u3_ca_south_is_junior(u3R, som)) ) return;
_me_wash_south(som); _me_wash_south(som);
} }
static void static void
_me_wash_south(u3_noun dog) _me_wash_south(u3_noun dog)
{ {
c3_assert(u3_yes == u3_ca_is_dog(dog)); c3_assert(c3y == u3_ca_is_dog(dog));
// c3_assert(u3_yes == u3_ca_south_is_junior(u3R, dog)); // c3_assert(c3y == u3_ca_south_is_junior(u3R, dog));
{ {
u3_cs_noun* dog_u = u3_ca_to_ptr(dog); u3_cs_noun* dog_u = u3_ca_to_ptr(dog);
if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash if ( dog_u->mug_w == 0 ) return; dog_u->mug_w = 0; // power wash
// if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; } // if ( dog_u->mug_w >> 31 ) { dog_u->mug_w = 0; }
if ( u3_so(u3_ca_is_pom(dog)) ) { if ( _(u3_ca_is_pom(dog)) ) {
u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u; u3_cs_cell* god_u = (u3_cs_cell *)(void *)dog_u;
_me_wash_south_in(god_u->hed); _me_wash_south_in(god_u->hed);
@ -501,16 +501,16 @@ _me_wash_south(u3_noun dog)
void void
u3_ca_wash(u3_noun som) u3_ca_wash(u3_noun som)
{ {
if ( u3_so(u3_ca_is_cat(som)) ) { if ( _(u3_ca_is_cat(som)) ) {
return; return;
} }
if ( u3_so(u3_ca_is_north(u3R)) ) { if ( _(u3_ca_is_north(u3R)) ) {
if ( u3_so(u3_ca_north_is_junior(u3R, som)) ) { if ( _(u3_ca_north_is_junior(u3R, som)) ) {
_me_wash_north(som); _me_wash_north(som);
} }
} }
else { else {
if ( u3_so(u3_ca_south_is_junior(u3R, som)) ) { if ( _(u3_ca_south_is_junior(u3R, som)) ) {
_me_wash_south(som); _me_wash_south(som);
} }
} }
@ -584,17 +584,17 @@ static u3_noun _me_copy_north(u3_noun);
static u3_noun static u3_noun
_me_copy_north_in(u3_noun som) _me_copy_north_in(u3_noun som)
{ {
c3_assert(u3_none != som); c3_assert(c3nne != som);
if ( u3_so(u3_ca_is_cat(som)) ) { if ( _(u3_ca_is_cat(som)) ) {
return som; return som;
} }
else { else {
u3_noun dog = som; u3_noun dog = som;
if ( u3_so(u3_ca_north_is_senior(u3R, dog)) ) { if ( _(u3_ca_north_is_senior(u3R, dog)) ) {
return dog; return dog;
} }
else if ( u3_so(u3_ca_north_is_junior(u3R, dog)) ) { else if ( _(u3_ca_north_is_junior(u3R, dog)) ) {
return _me_copy_north(dog); return _me_copy_north(dog);
} }
else { else {
@ -608,10 +608,10 @@ _me_copy_north_in(u3_noun som)
static u3_noun static u3_noun
_me_copy_north(u3_noun dog) _me_copy_north(u3_noun dog)
{ {
c3_assert(u3_yes == u3_ca_north_is_junior(u3R, dog)); c3_assert(c3y == u3_ca_north_is_junior(u3R, dog));
if ( u3_ne(u3_ca_north_is_junior(u3R, dog)) ) { if ( !_(u3_ca_north_is_junior(u3R, dog)) ) {
if ( u3_ne(u3_ca_north_is_senior(u3R, dog)) ) { if ( !_(u3_ca_north_is_senior(u3R, dog)) ) {
_me_gain_use(dog); _me_gain_use(dog);
} }
return dog; return dog;
@ -624,13 +624,13 @@ _me_copy_north(u3_noun dog)
if ( dog_u->mug_w >> 31 ) { if ( dog_u->mug_w >> 31 ) {
u3_noun nov = (u3_noun) dog_u->mug_w; u3_noun nov = (u3_noun) dog_u->mug_w;
c3_assert(u3_so(u3_ca_north_is_normal(u3R, nov))); c3_assert(_(u3_ca_north_is_normal(u3R, nov)));
_me_gain_use(nov); _me_gain_use(nov);
return nov; return nov;
} }
else { else {
if ( u3_yes == u3_ca_is_pom(dog) ) { if ( c3y == u3_ca_is_pom(dog) ) {
u3_cs_cell* old_u = u3_ca_to_ptr(dog); u3_cs_cell* old_u = u3_ca_to_ptr(dog);
c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell));
u3_noun new = u3_ca_de_twin(dog, new_w); u3_noun new = u3_ca_de_twin(dog, new_w);
@ -676,17 +676,17 @@ static u3_noun _me_copy_south(u3_noun);
static u3_noun static u3_noun
_me_copy_south_in(u3_noun som) _me_copy_south_in(u3_noun som)
{ {
c3_assert(u3_none != som); c3_assert(c3nne != som);
if ( u3_so(u3_ca_is_cat(som)) ) { if ( _(u3_ca_is_cat(som)) ) {
return som; return som;
} }
else { else {
u3_noun dog = som; u3_noun dog = som;
if ( u3_so(u3_ca_south_is_senior(u3R, dog)) ) { if ( _(u3_ca_south_is_senior(u3R, dog)) ) {
return dog; return dog;
} }
else if ( u3_so(u3_ca_south_is_junior(u3R, dog)) ) { else if ( _(u3_ca_south_is_junior(u3R, dog)) ) {
return _me_copy_south(dog); return _me_copy_south(dog);
} }
else { else {
@ -700,10 +700,10 @@ _me_copy_south_in(u3_noun som)
static u3_noun static u3_noun
_me_copy_south(u3_noun dog) _me_copy_south(u3_noun dog)
{ {
c3_assert(u3_yes == u3_ca_south_is_junior(u3R, dog)); c3_assert(c3y == u3_ca_south_is_junior(u3R, dog));
if ( u3_ne(u3_ca_south_is_junior(u3R, dog)) ) { if ( !_(u3_ca_south_is_junior(u3R, dog)) ) {
if ( u3_ne(u3_ca_south_is_senior(u3R, dog)) ) { if ( !_(u3_ca_south_is_senior(u3R, dog)) ) {
_me_gain_use(dog); _me_gain_use(dog);
} }
return dog; return dog;
@ -718,13 +718,13 @@ _me_copy_south(u3_noun dog)
// printf("south: %p is already %p\r\n", dog_u, u3_ca_to_ptr(nov)); // printf("south: %p is already %p\r\n", dog_u, u3_ca_to_ptr(nov));
c3_assert(u3_so(u3_ca_south_is_normal(u3R, nov))); c3_assert(_(u3_ca_south_is_normal(u3R, nov)));
_me_gain_use(nov); _me_gain_use(nov);
return nov; return nov;
} }
else { else {
if ( u3_yes == u3_ca_is_pom(dog) ) { if ( c3y == u3_ca_is_pom(dog) ) {
u3_cs_cell* old_u = u3_ca_to_ptr(dog); u3_cs_cell* old_u = u3_ca_to_ptr(dog);
c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); c3_w* new_w = u3_ca_walloc(c3_wiseof(u3_cs_cell));
u3_noun new = u3_ca_de_twin(dog, new_w); u3_noun new = u3_ca_de_twin(dog, new_w);
@ -775,12 +775,12 @@ _me_copy_south(u3_noun dog)
static u3_noun static u3_noun
_me_take_north(u3_noun dog) _me_take_north(u3_noun dog)
{ {
if ( u3_yes == u3_ca_north_is_senior(u3R, dog) ) { if ( c3y == u3_ca_north_is_senior(u3R, dog) ) {
/* senior pointers are not refcounted /* senior pointers are not refcounted
*/ */
return dog; return dog;
} }
else if ( u3_yes == u3_ca_north_is_junior(u3R, dog) ) { else if ( c3y == u3_ca_north_is_junior(u3R, dog) ) {
/* junior pointers are copied /* junior pointers are copied
*/ */
u3_noun mos = _me_copy_north(dog); u3_noun mos = _me_copy_north(dog);
@ -801,12 +801,12 @@ _me_take_north(u3_noun dog)
static u3_noun static u3_noun
_me_take_south(u3_noun dog) _me_take_south(u3_noun dog)
{ {
if ( u3_yes == u3_ca_south_is_senior(u3R, dog) ) { if ( c3y == u3_ca_south_is_senior(u3R, dog) ) {
/* senior pointers are not refcounted /* senior pointers are not refcounted
*/ */
return dog; return dog;
} }
else if ( u3_yes == u3_ca_south_is_junior(u3R, dog) ) { else if ( c3y == u3_ca_south_is_junior(u3R, dog) ) {
/* junior pointers are copied /* junior pointers are copied
*/ */
u3_noun mos = _me_copy_south(dog); u3_noun mos = _me_copy_south(dog);
@ -827,13 +827,13 @@ _me_take_south(u3_noun dog)
u3_noun u3_noun
u3_ca_take(u3_noun som) u3_ca_take(u3_noun som)
{ {
c3_assert(u3_none != som); c3_assert(c3nne != som);
if ( u3_so(u3_ca_is_cat(som)) ) { if ( _(u3_ca_is_cat(som)) ) {
return som; return som;
} }
else { else {
return u3_so(u3_ca_is_north(u3R)) return _(u3_ca_is_north(u3R))
? _me_take_north(som) ? _me_take_north(som)
: _me_take_south(som); : _me_take_south(som);
} }
@ -844,15 +844,15 @@ u3_ca_take(u3_noun som)
c3_o c3_o
u3_ca_left(u3_noun som) u3_ca_left(u3_noun som)
{ {
if ( u3_so(u3_ca_is_cat(som)) || if ( _(u3_ca_is_cat(som)) ||
u3_ne(u3_ca_is_junior(u3R, som)) ) !_(u3_ca_is_junior(u3R, som)) )
{ {
return u3_yes; return c3y;
} }
else { else {
u3_cs_noun* dog_u = u3_ca_to_ptr(som); u3_cs_noun* dog_u = u3_ca_to_ptr(som);
return u3_say(0 != (dog_u->mug_w >> 31)); return __(0 != (dog_u->mug_w >> 31));
} }
} }
@ -861,7 +861,7 @@ u3_ca_left(u3_noun som)
static u3_noun static u3_noun
_me_gain_north(u3_noun dog) _me_gain_north(u3_noun dog)
{ {
if ( u3_yes == u3_ca_north_is_senior(u3R, dog) ) { if ( c3y == u3_ca_north_is_senior(u3R, dog) ) {
/* senior pointers are not refcounted /* senior pointers are not refcounted
*/ */
return dog; return dog;
@ -869,7 +869,7 @@ _me_gain_north(u3_noun dog)
else { else {
/* junior nouns are disallowed /* junior nouns are disallowed
*/ */
c3_assert(u3_ne(u3_ca_north_is_junior(u3R, dog))); c3_assert(!_(u3_ca_north_is_junior(u3R, dog)));
/* normal pointers are refcounted /* normal pointers are refcounted
*/ */
@ -883,7 +883,7 @@ _me_gain_north(u3_noun dog)
static u3_noun static u3_noun
_me_gain_south(u3_noun dog) _me_gain_south(u3_noun dog)
{ {
if ( u3_yes == u3_ca_south_is_senior(u3R, dog) ) { if ( c3y == u3_ca_south_is_senior(u3R, dog) ) {
/* senior pointers are not refcounted /* senior pointers are not refcounted
*/ */
return dog; return dog;
@ -891,7 +891,7 @@ _me_gain_south(u3_noun dog)
else { else {
/* junior nouns are disallowed /* junior nouns are disallowed
*/ */
c3_assert(u3_ne(u3_ca_south_is_junior(u3R, dog))); c3_assert(!_(u3_ca_south_is_junior(u3R, dog)));
/* normal nouns are refcounted /* normal nouns are refcounted
*/ */
@ -906,7 +906,7 @@ static void
_me_lose_north(u3_noun dog) _me_lose_north(u3_noun dog)
{ {
top: top:
if ( u3_yes == u3_ca_north_is_normal(u3R, dog) ) { if ( c3y == u3_ca_north_is_normal(u3R, dog) ) {
c3_w* dog_w = u3_ca_to_ptr(dog); c3_w* dog_w = u3_ca_to_ptr(dog);
u3_cs_box* box_u = u3_ca_botox(dog_w); u3_cs_box* box_u = u3_ca_botox(dog_w);
@ -918,16 +918,16 @@ top:
u3_cm_bail(c3__foul); u3_cm_bail(c3__foul);
} }
else { else {
if ( u3_so(u3_ca_is_pom(dog)) ) { if ( _(u3_ca_is_pom(dog)) ) {
u3_cs_cell* dog_u = (void *)dog_w; u3_cs_cell* dog_u = (void *)dog_w;
u3_noun h_dog = dog_u->hed; u3_noun h_dog = dog_u->hed;
u3_noun t_dog = dog_u->tel; u3_noun t_dog = dog_u->tel;
if ( u3_ne(u3_ca_is_cat(h_dog)) ) { if ( !_(u3_ca_is_cat(h_dog)) ) {
_me_lose_north(h_dog); _me_lose_north(h_dog);
} }
u3_ca_free(dog_w); u3_ca_free(dog_w);
if ( u3_ne(u3_ca_is_cat(t_dog)) ) { if ( !_(u3_ca_is_cat(t_dog)) ) {
dog = t_dog; dog = t_dog;
goto top; goto top;
} }
@ -946,7 +946,7 @@ static void
_me_lose_south(u3_noun dog) _me_lose_south(u3_noun dog)
{ {
top: top:
if ( u3_yes == u3_ca_south_is_normal(u3R, dog) ) { if ( c3y == u3_ca_south_is_normal(u3R, dog) ) {
c3_w* dog_w = u3_ca_to_ptr(dog); c3_w* dog_w = u3_ca_to_ptr(dog);
u3_cs_box* box_u = u3_ca_botox(dog_w); u3_cs_box* box_u = u3_ca_botox(dog_w);
@ -958,16 +958,16 @@ top:
u3_cm_bail(c3__foul); u3_cm_bail(c3__foul);
} }
else { else {
if ( u3_so(u3_ca_is_pom(dog)) ) { if ( _(u3_ca_is_pom(dog)) ) {
u3_cs_cell* dog_u = (void *)dog_w; u3_cs_cell* dog_u = (void *)dog_w;
u3_noun h_dog = dog_u->hed; u3_noun h_dog = dog_u->hed;
u3_noun t_dog = dog_u->tel; u3_noun t_dog = dog_u->tel;
if ( u3_ne(u3_ca_is_cat(h_dog)) ) { if ( !_(u3_ca_is_cat(h_dog)) ) {
_me_lose_south(h_dog); _me_lose_south(h_dog);
} }
u3_ca_free(dog_w); u3_ca_free(dog_w);
if ( u3_ne(u3_ca_is_cat(t_dog)) ) { if ( !_(u3_ca_is_cat(t_dog)) ) {
dog = t_dog; dog = t_dog;
goto top; goto top;
} }
@ -985,13 +985,13 @@ top:
u3_noun u3_noun
u3_ca_gain(u3_noun som) u3_ca_gain(u3_noun som)
{ {
c3_assert(u3_none != som); c3_assert(c3nne != som);
if ( u3_so(u3_ca_is_cat(som)) ) { if ( _(u3_ca_is_cat(som)) ) {
return som; return som;
} }
else { else {
return u3_so(u3_ca_is_north(u3R)) return _(u3_ca_is_north(u3R))
? _me_gain_north(som) ? _me_gain_north(som)
: _me_gain_south(som); : _me_gain_south(som);
} }
@ -1002,8 +1002,8 @@ u3_ca_gain(u3_noun som)
void void
u3_ca_lose(u3_noun som) u3_ca_lose(u3_noun som)
{ {
if ( u3_ne(u3_ca_is_cat(som)) ) { if ( !_(u3_ca_is_cat(som)) ) {
if ( u3_so(u3_ca_is_north(u3R)) ) { if ( _(u3_ca_is_north(u3R)) ) {
_me_lose_north(som); _me_lose_north(som);
} else { } else {
_me_lose_south(som); _me_lose_south(som);
@ -1016,7 +1016,7 @@ u3_ca_lose(u3_noun som)
c3_w c3_w
u3_ca_use(u3_noun som) u3_ca_use(u3_noun som)
{ {
if ( u3_so(u3_ca_is_cat(som)) ) { if ( _(u3_ca_is_cat(som)) ) {
return 1; return 1;
} }
else { else {
@ -1032,7 +1032,7 @@ u3_ca_use(u3_noun som)
c3_w c3_w
u3_ca_mark_ptr(void* ptr_v) u3_ca_mark_ptr(void* ptr_v)
{ {
if ( u3_so(u3_ca_is_north(u3R)) ) { if ( _(u3_ca_is_north(u3R)) ) {
if ( !((ptr_v >= u3_ca_into(u3R->rut_p)) && if ( !((ptr_v >= u3_ca_into(u3R->rut_p)) &&
(ptr_v < u3_ca_into(u3R->hat_p))) ) (ptr_v < u3_ca_into(u3R->hat_p))) )
{ {
@ -1091,7 +1091,7 @@ u3_ca_mark_noun(u3_noun som)
c3_w siz_w = 0; c3_w siz_w = 0;
while ( 1 ) { while ( 1 ) {
if ( u3_so(u3_ca_is_senior(u3R, som)) ) { if ( _(u3_ca_is_senior(u3R, som)) ) {
return siz_w; return siz_w;
} }
else { else {
@ -1103,7 +1103,7 @@ u3_ca_mark_noun(u3_noun som)
} }
else { else {
siz_w += new_w; siz_w += new_w;
if ( u3_so(u3du(som)) ) { if ( _(u3du(som)) ) {
siz_w += u3_ca_mark_noun(u3h(som)); siz_w += u3_ca_mark_noun(u3h(som));
som = u3t(som); som = u3t(som);
} }
@ -1155,7 +1155,7 @@ u3_ca_sweep(c3_c* cap_c)
c3_w fre_w = 0; c3_w fre_w = 0;
c3_w i_w; c3_w i_w;
end_w = u3_so(u3_ca_is_north(u3R)) end_w = _(u3_ca_is_north(u3R))
? (u3R->hat_p - u3R->rut_p) ? (u3R->hat_p - u3R->rut_p)
: (u3R->rut_p - u3R->hat_p); : (u3R->rut_p - u3R->hat_p);
@ -1176,8 +1176,8 @@ u3_ca_sweep(c3_c* cap_c)
*/ */
pos_w = leq_w = weq_w = 0; pos_w = leq_w = weq_w = 0;
{ {
u3_post box_p = u3_so(u3_ca_is_north(u3R)) ? u3R->rut_p : u3R->hat_p; u3_post box_p = _(u3_ca_is_north(u3R)) ? u3R->rut_p : u3R->hat_p;
u3_post end_p = u3_so(u3_ca_is_north(u3R)) ? u3R->hat_p : u3R->rut_p; u3_post end_p = _(u3_ca_is_north(u3R)) ? u3R->hat_p : u3R->rut_p;
c3_w* box_w = u3_ca_into(box_p); c3_w* box_w = u3_ca_into(box_p);
c3_w* end_w = u3_ca_into(end_p); c3_w* end_w = u3_ca_into(end_p);
@ -1239,10 +1239,10 @@ u3_ca_sweep(c3_c* cap_c)
} }
} }
tot_w = u3_so(u3_ca_is_north(u3R)) tot_w = _(u3_ca_is_north(u3R))
? u3R->mat_p - u3R->rut_p ? u3R->mat_p - u3R->rut_p
: u3R->rut_p - u3R->mat_p; : u3R->rut_p - u3R->mat_p;
caf_w = u3_so(u3_ca_is_north(u3R)) caf_w = _(u3_ca_is_north(u3R))
? u3R->mat_p - u3R->cap_p ? u3R->mat_p - u3R->cap_p
: u3R->cap_p - u3R->mat_p; : u3R->cap_p - u3R->mat_p;
@ -1319,7 +1319,7 @@ u3_ca_moot(c3_w* sal_w)
c3_assert(0 != las_w); c3_assert(0 != las_w);
if ( 1 == len_w ) { if ( 1 == len_w ) {
if ( u3_so(u3_ca_is_cat(las_w)) ) { if ( _(u3_ca_is_cat(las_w)) ) {
u3_ca_free(nov_w); u3_ca_free(nov_w);
return las_w; return las_w;
@ -1338,7 +1338,7 @@ _ca_detect(u3p(u3_ch_root) har_p, u3_noun fum, u3_noun som, c3_d axe_d)
if ( som == fum ) { if ( som == fum ) {
return axe_d; return axe_d;
} }
else if ( u3_ne(u3du(fum)) || (u3_none != u3_ch_get(har_p, fum)) ) { else if ( !_(u3du(fum)) || (c3nne != u3_ch_get(har_p, fum)) ) {
return 0; return 0;
} }
else { else {
@ -1347,7 +1347,7 @@ _ca_detect(u3p(u3_ch_root) har_p, u3_noun fum, u3_noun som, c3_d axe_d)
u3_ch_put(har_p, fum, 0); u3_ch_put(har_p, fum, 0);
if ( 0 != (eax_d = _ca_detect(har_p, u3h(fum), som, 2ULL * axe_d)) ) { if ( 0 != (eax_d = _ca_detect(har_p, u3h(fum), som, 2ULL * axe_d)) ) {
return u3_yes; return c3y;
} }
else { else {
fum = u3t(fum); fum = u3t(fum);
@ -1392,7 +1392,7 @@ u3_ca_mint(c3_w* sal_w, c3_w len_w)
else if ( len_w == 1 ) { else if ( len_w == 1 ) {
c3_w low_w = nov_u->buf_w[0]; c3_w low_w = nov_u->buf_w[0];
if ( u3_so(u3_ca_is_cat(low_w)) ) { if ( _(u3_ca_is_cat(low_w)) ) {
u3_ca_free(nov_w); u3_ca_free(nov_w);
return low_w; return low_w;

56
g/e.c
View File

@ -112,7 +112,7 @@ u3_ce_fault(void* adr_v, c3_i ser_i)
static c3_o static c3_o
_ce_image_open(u3_cs_image* img_u, c3_o nuu_o) _ce_image_open(u3_cs_image* img_u, c3_o nuu_o)
{ {
c3_i mod_i = u3_so(nuu_o) ? (O_RDWR | O_CREAT) : O_RDWR; c3_i mod_i = _(nuu_o) ? (O_RDWR | O_CREAT) : O_RDWR;
c3_c ful_c[8193]; c3_c ful_c[8193];
snprintf(ful_c, 8192, "%s", u3P.cpu_c); snprintf(ful_c, 8192, "%s", u3P.cpu_c);
@ -127,7 +127,7 @@ _ce_image_open(u3_cs_image* img_u, c3_o nuu_o)
snprintf(ful_c, 8192, "%s/.urb/chk/%s.bin", u3P.cpu_c, img_u->nam_c); snprintf(ful_c, 8192, "%s/.urb/chk/%s.bin", u3P.cpu_c, img_u->nam_c);
if ( -1 == (img_u->fid_i = open(ful_c, mod_i, 0666)) ) { if ( -1 == (img_u->fid_i = open(ful_c, mod_i, 0666)) ) {
perror(ful_c); perror(ful_c);
return u3_no; return c3n;
} }
else { else {
struct stat buf_u; struct stat buf_u;
@ -135,29 +135,29 @@ _ce_image_open(u3_cs_image* img_u, c3_o nuu_o)
if ( -1 == fstat(img_u->fid_i, &buf_u) ) { if ( -1 == fstat(img_u->fid_i, &buf_u) ) {
perror(ful_c); perror(ful_c);
c3_assert(0); c3_assert(0);
return u3_no; return c3n;
} }
else { else {
c3_d siz_d = buf_u.st_size; c3_d siz_d = buf_u.st_size;
c3_d pgs_d = (siz_d + (c3_d)((1 << (u3_cc_page + 2)) - 1)) >> c3_d pgs_d = (siz_d + (c3_d)((1 << (u3_cc_page + 2)) - 1)) >>
(c3_d)(u3_cc_page + 2); (c3_d)(u3_cc_page + 2);
if ( u3_yes == nuu_o ) { if ( c3y == nuu_o ) {
if ( siz_d ) { if ( siz_d ) {
c3_assert(0); c3_assert(0);
return u3_no; return c3n;
} }
return u3_yes; return c3y;
} }
else { else {
if ( siz_d != (pgs_d << (c3_d)(u3_cc_page + 2)) ) { if ( siz_d != (pgs_d << (c3_d)(u3_cc_page + 2)) ) {
fprintf(stderr, "%s: corrupt size %llx\r\n", ful_c, siz_d); fprintf(stderr, "%s: corrupt size %llx\r\n", ful_c, siz_d);
return u3_no; return c3n;
} }
img_u->pgs_w = (c3_w) pgs_d; img_u->pgs_w = (c3_w) pgs_d;
c3_assert(pgs_d == (c3_d)img_u->pgs_w); c3_assert(pgs_d == (c3_d)img_u->pgs_w);
return u3_yes; return c3y;
} }
} }
} }
@ -189,7 +189,7 @@ _ce_patch_read_control(u3_cs_patch* pat_u)
if ( -1 == fstat(pat_u->ctl_i, &buf_u) ) { if ( -1 == fstat(pat_u->ctl_i, &buf_u) ) {
c3_assert(0); c3_assert(0);
return u3_no; return c3n;
} }
len_w = (c3_w) buf_u.st_size; len_w = (c3_w) buf_u.st_size;
} }
@ -201,9 +201,9 @@ _ce_patch_read_control(u3_cs_patch* pat_u)
{ {
free(pat_u->con_u); free(pat_u->con_u);
pat_u->con_u = 0; pat_u->con_u = 0;
return u3_no; return c3n;
} }
return u3_yes; return c3y;
} }
/* _ce_patch_create(): create patch files. /* _ce_patch_create(): create patch files.
@ -259,12 +259,12 @@ _ce_patch_verify(u3_cs_patch* pat_u)
if ( -1 == lseek(pat_u->mem_i, (i_w << (u3_cc_page + 2)), SEEK_SET) ) { if ( -1 == lseek(pat_u->mem_i, (i_w << (u3_cc_page + 2)), SEEK_SET) ) {
perror("seek"); perror("seek");
c3_assert(0); c3_assert(0);
return u3_no; return c3n;
} }
if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_cc_page + 2))) ) { if ( -1 == read(pat_u->mem_i, mem_w, (1 << (u3_cc_page + 2))) ) {
perror("read"); perror("read");
c3_assert(0); c3_assert(0);
return u3_no; return c3n;
} }
{ {
c3_w nug_w = u3_cr_mug_words(mem_w, (1 << u3_cc_page)); c3_w nug_w = u3_cr_mug_words(mem_w, (1 << u3_cc_page));
@ -273,7 +273,7 @@ _ce_patch_verify(u3_cs_patch* pat_u)
printf("_ce_patch_verify: mug mismatch %d/%d; (%x, %x)\r\n", printf("_ce_patch_verify: mug mismatch %d/%d; (%x, %x)\r\n",
pag_w, i_w, mug_w, nug_w); pag_w, i_w, mug_w, nug_w);
c3_assert(0); c3_assert(0);
return u3_no; return c3n;
} }
#if 0 #if 0
else { else {
@ -282,7 +282,7 @@ _ce_patch_verify(u3_cs_patch* pat_u)
#endif #endif
} }
} }
return u3_yes; return c3y;
} }
/* _ce_patch_free(): free a patch. /* _ce_patch_free(): free a patch.
@ -328,7 +328,7 @@ _ce_patch_open(void)
pat_u->mem_i = mem_i; pat_u->mem_i = mem_i;
pat_u->con_u = 0; pat_u->con_u = 0;
if ( u3_no == _ce_patch_read_control(pat_u) ) { if ( c3n == _ce_patch_read_control(pat_u) ) {
close(pat_u->ctl_i); close(pat_u->ctl_i);
close(pat_u->mem_i); close(pat_u->mem_i);
free(pat_u); free(pat_u);
@ -336,7 +336,7 @@ _ce_patch_open(void)
_ce_patch_delete(); _ce_patch_delete();
return 0; return 0;
} }
if ( u3_no == _ce_patch_verify(pat_u) ) { if ( c3n == _ce_patch_verify(pat_u) ) {
_ce_patch_free(pat_u); _ce_patch_free(pat_u);
_ce_patch_delete(); _ce_patch_delete();
return 0; return 0;
@ -837,7 +837,7 @@ u3_ce_init(c3_o chk_o)
map_v = mmap((void *)u3_Loom, map_v = mmap((void *)u3_Loom,
len_w, len_w,
u3_so(chk_o) ? PROT_READ : (PROT_READ | PROT_WRITE), _(chk_o) ? PROT_READ : (PROT_READ | PROT_WRITE),
(MAP_ANON | MAP_FIXED | MAP_PRIVATE), (MAP_ANON | MAP_FIXED | MAP_PRIVATE),
-1, 0); -1, 0);
@ -862,7 +862,7 @@ u3_ce_init(c3_o chk_o)
/* u3_ce_grab(): garbage-collect the world, plus extra roots, then /* u3_ce_grab(): garbage-collect the world, plus extra roots, then
*/ */
void void
u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with u3_none u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with c3nne
{ {
// u3_ch_free(u3R->cax.har_p); // u3_ch_free(u3R->cax.har_p);
// u3R->cax.har_p = u3_ch_new(); // u3R->cax.har_p = u3_ch_new();
@ -875,10 +875,10 @@ u3_ce_grab(c3_c* cap_c, u3_noun som, ...) // terminate with u3_none
va_start(vap, som); va_start(vap, som);
if ( som != u3_none ) { if ( som != c3nne ) {
u3_ca_mark_noun(som); u3_ca_mark_noun(som);
while ( u3_none != (tur = va_arg(vap, u3_noun)) ) { while ( c3nne != (tur = va_arg(vap, u3_noun)) ) {
u3_ca_mark_noun(tur); u3_ca_mark_noun(tur);
} }
} }
@ -900,9 +900,9 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c)
/* Open and apply any patches. /* Open and apply any patches.
*/ */
if ( u3_so(nuu_o) ) { if ( _(nuu_o) ) {
if ( (u3_no == _ce_image_open(&u3P.nor_u, u3_yes)) || if ( (c3n == _ce_image_open(&u3P.nor_u, c3y)) ||
(u3_no == _ce_image_open(&u3P.sou_u, u3_yes)) ) (c3n == _ce_image_open(&u3P.sou_u, c3y)) )
{ {
printf("boot: image failed\r\n"); printf("boot: image failed\r\n");
exit(1); exit(1);
@ -914,8 +914,8 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c)
/* Open image files. /* Open image files.
*/ */
{ {
if ( (u3_no == _ce_image_open(&u3P.nor_u, u3_no)) || if ( (c3n == _ce_image_open(&u3P.nor_u, c3n)) ||
(u3_no == _ce_image_open(&u3P.sou_u, u3_no)) ) (c3n == _ce_image_open(&u3P.sou_u, c3n)) )
{ {
fprintf(stderr, "boot: no image\r\n"); fprintf(stderr, "boot: no image\r\n");
exit(1); exit(1);
@ -960,7 +960,7 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c)
*/ */
if ( (0 == u3P.nor_u.pgs_w) && (0 == u3P.sou_u.pgs_w) ) { if ( (0 == u3P.nor_u.pgs_w) && (0 == u3P.sou_u.pgs_w) ) {
printf("logical boot\r\n"); printf("logical boot\r\n");
nuu_o = u3_yes; nuu_o = c3y;
} }
} }
@ -974,7 +974,7 @@ u3_ce_boot(c3_o nuu_o, c3_o bug_o, c3_c* cpu_c)
/* Install the kernel. /* Install the kernel.
*/ */
if ( u3_so(nuu_o) ) { if ( _(nuu_o) ) {
c3_c pas_c[2049]; c3_c pas_c[2049];
struct stat buf_u; struct stat buf_u;

94
g/h.c
View File

@ -50,7 +50,7 @@ _ch_buck_add(u3_ch_buck* hab_u, u3_noun kev)
c3_w i_w; c3_w i_w;
for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) {
if ( u3_yes == u3_cr_sing(u3h(kev), u3h(hab_u->kev[i_w])) ) { if ( c3y == u3_cr_sing(u3h(kev), u3h(hab_u->kev[i_w])) ) {
u3_ca_lose(hab_u->kev[i_w]); u3_ca_lose(hab_u->kev[i_w]);
hab_u->kev[i_w] = kev; hab_u->kev[i_w] = kev;
@ -104,7 +104,7 @@ _ch_node_add(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun kev)
if ( map_w & (1 << bit_w) ) { if ( map_w & (1 << bit_w) ) {
c3_w sot_w = han_u->sot_w[inx_w]; c3_w sot_w = han_u->sot_w[inx_w];
if ( u3_so(u3_ch_slot_is_node(sot_w)) ) { if ( _(u3_ch_slot_is_node(sot_w)) ) {
void* hav_v = u3_ch_slot_to_node(sot_w); void* hav_v = u3_ch_slot_to_node(sot_w);
hav_v = _ch_some_add(hav_v, lef_w, rem_w, kev); hav_v = _ch_some_add(hav_v, lef_w, rem_w, kev);
@ -115,7 +115,7 @@ _ch_node_add(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun kev)
else { else {
u3_noun kov = u3_ch_slot_to_noun(sot_w); u3_noun kov = u3_ch_slot_to_noun(sot_w);
if ( u3_yes == u3_cr_sing(u3h(kev), u3h(kov)) ) { if ( c3y == u3_cr_sing(u3h(kev), u3h(kov)) ) {
u3_ca_lose(kov); u3_ca_lose(kov);
han_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev); han_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev);
return han_u; return han_u;
@ -193,13 +193,13 @@ u3_ch_put(u3p(u3_ch_root) har_p, u3_noun key, u3_noun val)
c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w rem_w = (mug_w & ((1 << 25) - 1));
c3_w sot_w = har_u->sot_w[inx_w]; c3_w sot_w = har_u->sot_w[inx_w];
if ( u3_so(u3_ch_slot_is_null(sot_w)) ) { if ( _(u3_ch_slot_is_null(sot_w)) ) {
har_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev); har_u->sot_w[inx_w] = u3_ch_noun_to_slot(kev);
} }
else { else {
u3_ch_node* han_u; u3_ch_node* han_u;
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kov = u3_ch_slot_to_noun(sot_w); u3_noun kov = u3_ch_slot_to_noun(sot_w);
c3_w rom_w = u3_cr_mug(u3h(kov)) & ((1 << 25) - 1); c3_w rom_w = u3_cr_mug(u3h(kov)) & ((1 << 25) - 1);
@ -223,10 +223,10 @@ _ch_buck_hum(u3_ch_buck* hab_u, c3_w mug_w)
for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) {
if ( mug_w == u3_cr_mug(u3h(hab_u->kev[i_w])) ) { if ( mug_w == u3_cr_mug(u3h(hab_u->kev[i_w])) ) {
return u3_yes; return c3y;
} }
} }
return u3_no; return c3n;
} }
/* _ch_node_hum(): read in node. /* _ch_node_hum(): read in node.
@ -242,20 +242,20 @@ _ch_node_hum(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, c3_w mug_w)
map_w = han_u->map_w; map_w = han_u->map_w;
if ( !(map_w & (1 << bit_w)) ) { if ( !(map_w & (1 << bit_w)) ) {
return u3_no; return c3n;
} }
else { else {
c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1));
c3_w sot_w = han_u->sot_w[inx_w]; c3_w sot_w = han_u->sot_w[inx_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
if ( mug_w == u3_cr_mug(u3h(kev)) ) { if ( mug_w == u3_cr_mug(u3h(kev)) ) {
return u3_yes; return c3y;
} }
else { else {
return u3_no; return c3n;
} }
} }
else { else {
@ -281,17 +281,17 @@ u3_ch_hum(u3p(u3_ch_root) har_p, c3_w mug_w)
c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w rem_w = (mug_w & ((1 << 25) - 1));
c3_w sot_w = har_u->sot_w[inx_w]; c3_w sot_w = har_u->sot_w[inx_w];
if ( u3_so(u3_ch_slot_is_null(sot_w)) ) { if ( _(u3_ch_slot_is_null(sot_w)) ) {
return u3_no; return c3n;
} }
else if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { else if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
if ( mug_w == u3_cr_mug(u3h(kev)) ) { if ( mug_w == u3_cr_mug(u3h(kev)) ) {
return u3_yes; return c3y;
} }
else { else {
return u3_no; return c3n;
} }
} }
else { else {
@ -309,11 +309,11 @@ _ch_buck_get(u3_ch_buck* hab_u, u3_noun key)
c3_w i_w; c3_w i_w;
for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) {
if ( u3_so(u3_cr_sing(key, u3h(hab_u->kev[i_w]))) ) { if ( _(u3_cr_sing(key, u3h(hab_u->kev[i_w]))) ) {
return u3_ca_gain(u3t(hab_u->kev[i_w])); return u3_ca_gain(u3t(hab_u->kev[i_w]));
} }
} }
return u3_none; return c3nne;
} }
/* _ch_node_get(): read in node. /* _ch_node_get(): read in node.
@ -329,20 +329,20 @@ _ch_node_get(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key)
map_w = han_u->map_w; map_w = han_u->map_w;
if ( !(map_w & (1 << bit_w)) ) { if ( !(map_w & (1 << bit_w)) ) {
return u3_none; return c3nne;
} }
else { else {
c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1));
c3_w sot_w = han_u->sot_w[inx_w]; c3_w sot_w = han_u->sot_w[inx_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
if ( u3_so(u3_cr_sing(key, u3h(kev))) ) { if ( _(u3_cr_sing(key, u3h(kev))) ) {
return u3_ca_gain(u3t(kev)); return u3_ca_gain(u3t(kev));
} }
else { else {
return u3_none; return c3nne;
} }
} }
else { else {
@ -369,18 +369,18 @@ u3_ch_get(u3p(u3_ch_root) har_p, u3_noun key)
c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w rem_w = (mug_w & ((1 << 25) - 1));
c3_w sot_w = har_u->sot_w[inx_w]; c3_w sot_w = har_u->sot_w[inx_w];
if ( u3_so(u3_ch_slot_is_null(sot_w)) ) { if ( _(u3_ch_slot_is_null(sot_w)) ) {
return u3_none; return c3nne;
} }
else if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { else if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
if ( u3_so(u3_cr_sing(key, u3h(kev))) ) { if ( _(u3_cr_sing(key, u3h(kev))) ) {
har_u->sot_w[inx_w] = u3_ch_noun_be_warm(sot_w); har_u->sot_w[inx_w] = u3_ch_noun_be_warm(sot_w);
return u3_ca_gain(u3t(kev)); return u3_ca_gain(u3t(kev));
} }
else { else {
return u3_none; return c3nne;
} }
} }
else { else {
@ -398,11 +398,11 @@ _ch_buck_gut(u3_ch_buck* hab_u, u3_noun key)
c3_w i_w; c3_w i_w;
for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) { for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) {
if ( u3_so(u3_cr_sung(key, u3h(hab_u->kev[i_w]))) ) { if ( _(u3_cr_sung(key, u3h(hab_u->kev[i_w]))) ) {
return u3_ca_gain(u3t(hab_u->kev[i_w])); return u3_ca_gain(u3t(hab_u->kev[i_w]));
} }
} }
return u3_none; return c3nne;
} }
/* _ch_node_gut(): read in node, unifying key nouns. /* _ch_node_gut(): read in node, unifying key nouns.
@ -418,20 +418,20 @@ _ch_node_gut(u3_ch_node* han_u, c3_w lef_w, c3_w rem_w, u3_noun key)
map_w = han_u->map_w; map_w = han_u->map_w;
if ( !(map_w & (1 << bit_w)) ) { if ( !(map_w & (1 << bit_w)) ) {
return u3_none; return c3nne;
} }
else { else {
c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1)); c3_w inx_w = _ch_popcount(map_w & ((1 << bit_w) - 1));
c3_w sot_w = han_u->sot_w[inx_w]; c3_w sot_w = han_u->sot_w[inx_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
if ( u3_so(u3_cr_sung(key, u3h(kev))) ) { if ( _(u3_cr_sung(key, u3h(kev))) ) {
return u3_ca_gain(u3t(kev)); return u3_ca_gain(u3t(kev));
} }
else { else {
return u3_none; return c3nne;
} }
} }
else { else {
@ -458,18 +458,18 @@ u3_ch_gut(u3p(u3_ch_root) har_p, u3_noun key)
c3_w rem_w = (mug_w & ((1 << 25) - 1)); c3_w rem_w = (mug_w & ((1 << 25) - 1));
c3_w sot_w = har_u->sot_w[inx_w]; c3_w sot_w = har_u->sot_w[inx_w];
if ( u3_so(u3_ch_slot_is_null(sot_w)) ) { if ( _(u3_ch_slot_is_null(sot_w)) ) {
return u3_none; return c3nne;
} }
else if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { else if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
if ( u3_so(u3_cr_sung(key, u3h(kev))) ) { if ( _(u3_cr_sung(key, u3h(kev))) ) {
har_u->sot_w[inx_w] = u3_ch_noun_be_warm(sot_w); har_u->sot_w[inx_w] = u3_ch_noun_be_warm(sot_w);
return u3_ca_gain(u3t(kev)); return u3_ca_gain(u3t(kev));
} }
else { else {
return u3_none; return c3nne;
} }
} }
else { else {
@ -505,7 +505,7 @@ _ch_free_node(u3_ch_node* han_u, c3_w lef_w)
for ( i_w = 0; i_w < len_w; i_w++ ) { for ( i_w = 0; i_w < len_w; i_w++ ) {
c3_w sot_w = han_u->sot_w[i_w]; c3_w sot_w = han_u->sot_w[i_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
u3_ca_lose(kev); u3_ca_lose(kev);
@ -534,12 +534,12 @@ u3_ch_free(u3p(u3_ch_root) har_p)
for ( i_w = 0; i_w < 64; i_w++ ) { for ( i_w = 0; i_w < 64; i_w++ ) {
c3_w sot_w = har_u->sot_w[i_w]; c3_w sot_w = har_u->sot_w[i_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
u3_ca_lose(kev); u3_ca_lose(kev);
} }
else if ( u3_so(u3_ch_slot_is_node(sot_w)) ) { else if ( _(u3_ch_slot_is_node(sot_w)) ) {
u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); u3_ch_node* han_u = u3_ch_slot_to_node(sot_w);
_ch_free_node(han_u, 25); _ch_free_node(han_u, 25);
@ -573,7 +573,7 @@ _ch_walk_node(u3_ch_node* han_u, c3_w lef_w, void (*fun_f)(u3_noun))
for ( i_w = 0; i_w < len_w; i_w++ ) { for ( i_w = 0; i_w < len_w; i_w++ ) {
c3_w sot_w = han_u->sot_w[i_w]; c3_w sot_w = han_u->sot_w[i_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
fun_f(kev); fun_f(kev);
@ -601,12 +601,12 @@ u3_ch_walk(u3p(u3_ch_root) har_p, void (*fun_f)(u3_noun))
for ( i_w = 0; i_w < 64; i_w++ ) { for ( i_w = 0; i_w < 64; i_w++ ) {
c3_w sot_w = har_u->sot_w[i_w]; c3_w sot_w = har_u->sot_w[i_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
fun_f(kev); fun_f(kev);
} }
else if ( u3_so(u3_ch_slot_is_node(sot_w)) ) { else if ( _(u3_ch_slot_is_node(sot_w)) ) {
u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); u3_ch_node* han_u = u3_ch_slot_to_node(sot_w);
_ch_walk_node(han_u, 25, fun_f); _ch_walk_node(han_u, 25, fun_f);
@ -641,7 +641,7 @@ _ch_mark_node(u3_ch_node* han_u, c3_w lef_w)
for ( i_w = 0; i_w < len_w; i_w++ ) { for ( i_w = 0; i_w < len_w; i_w++ ) {
c3_w sot_w = han_u->sot_w[i_w]; c3_w sot_w = han_u->sot_w[i_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
u3_ca_mark_noun(kev); u3_ca_mark_noun(kev);
@ -670,12 +670,12 @@ u3_ch_mark(u3p(u3_ch_root) har_p)
for ( i_w = 0; i_w < 64; i_w++ ) { for ( i_w = 0; i_w < 64; i_w++ ) {
c3_w sot_w = har_u->sot_w[i_w]; c3_w sot_w = har_u->sot_w[i_w];
if ( u3_so(u3_ch_slot_is_noun(sot_w)) ) { if ( _(u3_ch_slot_is_noun(sot_w)) ) {
u3_noun kev = u3_ch_slot_to_noun(sot_w); u3_noun kev = u3_ch_slot_to_noun(sot_w);
u3_ca_mark_noun(kev); u3_ca_mark_noun(kev);
} }
else if ( u3_so(u3_ch_slot_is_node(sot_w)) ) { else if ( _(u3_ch_slot_is_node(sot_w)) ) {
u3_ch_node* han_u = u3_ch_slot_to_node(sot_w); u3_ch_node* han_u = u3_ch_slot_to_node(sot_w);
_ch_mark_node(han_u, 25); _ch_mark_node(han_u, 25);

18
g/i.c
View File

@ -168,9 +168,9 @@ u3_ci_mp(mpz_t a_mp)
u3_noun u3_noun
u3_ci_vint(u3_noun a) u3_ci_vint(u3_noun a)
{ {
c3_assert(u3_none != a); c3_assert(c3nne != a);
if ( u3_so(u3_ca_is_cat(a)) ) { if ( _(u3_ca_is_cat(a)) ) {
c3_w vin_w = (a + 1); c3_w vin_w = (a + 1);
if ( a == 0x7fffffff ) { if ( a == 0x7fffffff ) {
@ -178,7 +178,7 @@ u3_ci_vint(u3_noun a)
} }
else return vin_w; else return vin_w;
} }
else if ( u3_so(u3_ca_is_cell(a)) ) { else if ( _(u3_ca_is_cell(a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -199,11 +199,11 @@ u3_ci_vint(u3_noun a)
u3_noun u3_noun
u3_ci_cell(u3_noun a, u3_noun b) u3_ci_cell(u3_noun a, u3_noun b)
{ {
c3_assert(u3_none != a); c3_assert(c3nne != a);
c3_assert(u3_none != b); c3_assert(c3nne != b);
c3_assert(u3_ne(u3_ca_is_junior(u3R, a))); c3_assert(!_(u3_ca_is_junior(u3R, a)));
c3_assert(u3_ne(u3_ca_is_junior(u3R, b))); c3_assert(!_(u3_ca_is_junior(u3R, b)));
{ {
c3_w* nov_w = u3_ca_walloc(c3_wiseof(u3_cs_cell)); c3_w* nov_w = u3_ca_walloc(c3_wiseof(u3_cs_cell));
@ -292,7 +292,7 @@ u3_ci_heximal(u3_noun a);
/* u3_ci_list(): /* u3_ci_list():
** **
** Generate a null-terminated list, with `u3_none` as terminator. ** Generate a null-terminated list, with `c3nne` as terminator.
*/ */
u3_noun u3_noun
u3_ci_list(u3_weak one, ...); u3_ci_list(u3_weak one, ...);
@ -342,7 +342,7 @@ u3_ci_list(u3_weak one, ...);
else { else {
c3_w cut_w = _molt_cut(len_w, pms_m); c3_w cut_w = _molt_cut(len_w, pms_m);
if ( u3_no == u3_ca_is_cell(som) ) { if ( c3n == u3_ca_is_cell(som) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {

148
g/j.c
View File

@ -49,13 +49,13 @@ _cj_axis(u3_noun fol)
{ {
u3_noun p_fol, q_fol, r_fol; u3_noun p_fol, q_fol, r_fol;
while ( u3_so(u3du(fol)) && (10 == u3h(fol)) ) while ( _(u3du(fol)) && (10 == u3h(fol)) )
{ fol = u3t(u3t(fol)); } { fol = u3t(u3t(fol)); }
if ( u3_ne(u3_cr_trel(fol, &p_fol, &q_fol, &r_fol)) ) { if ( !_(u3_cr_trel(fol, &p_fol, &q_fol, &r_fol)) ) {
if ( u3_ne(u3_cr_cell(fol, &p_fol, &q_fol)) || if ( !_(u3_cr_cell(fol, &p_fol, &q_fol)) ||
(0 != p_fol) || (0 != p_fol) ||
(u3_ne(u3_ca_is_cat(q_fol))) ) (!_(u3_ca_is_cat(q_fol))) )
{ {
fprintf(stderr, "axis: bad a\r\n"); fprintf(stderr, "axis: bad a\r\n");
return 0; return 0;
@ -65,9 +65,9 @@ _cj_axis(u3_noun fol)
else { else {
if ( 9 != p_fol ) if ( 9 != p_fol )
{ fprintf(stderr, "axis: bad b\r\n"); return 0; } { fprintf(stderr, "axis: bad b\r\n"); return 0; }
if ( u3_ne(u3_ca_is_cat(q_fol)) ) if ( !_(u3_ca_is_cat(q_fol)) )
{ fprintf(stderr, "axis: bad c\r\n"); return 0; } { fprintf(stderr, "axis: bad c\r\n"); return 0; }
if ( u3_ne(u3du(r_fol)) || (0 != u3h(r_fol)) || (1 != u3t(r_fol)) ) if ( !_(u3du(r_fol)) || (0 != u3h(r_fol)) || (1 != u3t(r_fol)) )
{ fprintf(stderr, "axis: bad d\r\n"); return 0; } { fprintf(stderr, "axis: bad d\r\n"); return 0; }
return q_fol; return q_fol;
@ -80,7 +80,7 @@ static u3_weak
_cj_by_gut(u3_noun a, u3_noun b) _cj_by_gut(u3_noun a, u3_noun b)
{ {
if ( u3_nul == a ) { if ( u3_nul == a ) {
return u3_none; return c3nne;
} }
else { else {
u3_noun l_a, n_a, r_a; u3_noun l_a, n_a, r_a;
@ -89,11 +89,11 @@ _cj_by_gut(u3_noun a, u3_noun b)
u3_cx_trel(a, &n_a, &l_a, &r_a); u3_cx_trel(a, &n_a, &l_a, &r_a);
u3_cx_cell(n_a, &pn_a, &qn_a); u3_cx_cell(n_a, &pn_a, &qn_a);
{ {
if ( (u3_yes == u3_cr_sing(b, pn_a)) ) { if ( (c3y == u3_cr_sing(b, pn_a)) ) {
return qn_a; return qn_a;
} }
else { else {
if ( u3_yes == u3_cqc_gor(b, pn_a) ) { if ( c3y == u3_cqc_gor(b, pn_a) ) {
return _cj_by_gut(l_a, b); return _cj_by_gut(l_a, b);
} }
else return _cj_by_gut(r_a, b); else return _cj_by_gut(r_a, b);
@ -107,14 +107,14 @@ _cj_by_gut(u3_noun a, u3_noun b)
static c3_c* static c3_c*
_cj_chum(u3_noun chu) _cj_chum(u3_noun chu)
{ {
if ( u3_so(u3ud(chu)) ) { if ( _(u3ud(chu)) ) {
return u3_cr_string(chu); return u3_cr_string(chu);
} }
else { else {
u3_noun h_chu = u3h(chu); u3_noun h_chu = u3h(chu);
u3_noun t_chu = u3t(chu); u3_noun t_chu = u3t(chu);
if ( u3_ne(u3_ca_is_cat(t_chu)) ) { if ( !_(u3_ca_is_cat(t_chu)) ) {
return 0; return 0;
} else { } else {
c3_c* h_chu_c = u3_cr_string(h_chu); c3_c* h_chu_c = u3_cr_string(h_chu);
@ -139,39 +139,39 @@ _cj_je_fsck(u3_noun clu)
c3_c* nam_c; c3_c* nam_c;
c3_l axe_l; c3_l axe_l;
if ( u3_no == u3_cr_trel(clu, &p_clu, &q_clu, &r_clu) ) { if ( c3n == u3_cr_trel(clu, &p_clu, &q_clu, &r_clu) ) {
u3z(clu); return u3_none; u3z(clu); return c3nne;
} }
if ( 0 == (nam_c = _cj_chum(p_clu)) ) { if ( 0 == (nam_c = _cj_chum(p_clu)) ) {
u3z(clu); return u3_none; u3z(clu); return c3nne;
} }
while ( u3_so(u3du(q_clu)) && (10 == u3h(q_clu)) ) { while ( _(u3du(q_clu)) && (10 == u3h(q_clu)) ) {
q_clu = u3t(u3t(q_clu)); q_clu = u3t(u3t(q_clu));
} }
if ( u3_ne(u3du(q_clu)) ) { if ( !_(u3du(q_clu)) ) {
u3z(clu); free(nam_c); return u3_none; u3z(clu); free(nam_c); return c3nne;
} }
if ( (1 == u3h(q_clu)) && (0 == u3t(q_clu)) ) { if ( (1 == u3h(q_clu)) && (0 == u3t(q_clu)) ) {
axe_l = 0; axe_l = 0;
} }
else { else {
if ( (0 != u3h(q_clu)) || u3_ne(u3_ca_is_cat(axe_l = u3t(q_clu))) ) { if ( (0 != u3h(q_clu)) || !_(u3_ca_is_cat(axe_l = u3t(q_clu))) ) {
u3z(clu); free(nam_c); return u3_none; u3z(clu); free(nam_c); return c3nne;
} }
} }
{ {
huk = 0; huk = 0;
while ( u3_so(u3du(r_clu)) ) { while ( _(u3du(r_clu)) ) {
u3_noun ir_clu, tr_clu, pir_clu, qir_clu; u3_noun ir_clu, tr_clu, pir_clu, qir_clu;
if ( (u3_no == u3_cr_cell(r_clu, &ir_clu, &tr_clu)) || if ( (c3n == u3_cr_cell(r_clu, &ir_clu, &tr_clu)) ||
(u3_no == u3_cr_cell(ir_clu, &pir_clu, &qir_clu)) || (c3n == u3_cr_cell(ir_clu, &pir_clu, &qir_clu)) ||
(u3_no == u3ud(pir_clu)) ) (c3n == u3ud(pir_clu)) )
{ {
u3z(huk); u3z(clu); free(nam_c); return u3_none; u3z(huk); u3z(clu); free(nam_c); return c3nne;
} }
huk = u3_ckdb_put(huk, u3k(pir_clu), u3k(qir_clu)); huk = u3_ckdb_put(huk, u3k(pir_clu), u3k(qir_clu));
r_clu = tr_clu; r_clu = tr_clu;
@ -204,14 +204,14 @@ _cj_cold_find_sys(u3_noun bat)
while ( 1 ) { while ( 1 ) {
u3_noun pro = _cj_by_gut(u3h(rod_u->jed.das), bat); u3_noun pro = _cj_by_gut(u3h(rod_u->jed.das), bat);
if ( pro != u3_none ) { if ( pro != c3nne ) {
return pro; return pro;
} }
if ( !rod_u->par_u ) break; if ( !rod_u->par_u ) break;
rod_u = rod_u->par_u; rod_u = rod_u->par_u;
} }
return u3_none; return c3nne;
} }
/* _cj_cold_mine(): in cold mode, declare a core. RETAINS. /* _cj_cold_mine(): in cold mode, declare a core. RETAINS.
@ -229,27 +229,27 @@ _cj_cold_mine(u3_noun cey, u3_noun cor)
u3_noun mop; u3_noun mop;
if ( 0 == q_cey ) { if ( 0 == q_cey ) {
mop = u3nq(u3k(p_cey), 3, u3_no, u3k(bat)); mop = u3nq(u3k(p_cey), 3, c3n, u3k(bat));
} }
else { else {
u3_weak rah = u3_cr_at(q_cey, cor); u3_weak rah = u3_cr_at(q_cey, cor);
if ( (u3_none == rah) || u3_ne(u3du(rah)) ) { if ( (c3nne == rah) || !_(u3du(rah)) ) {
fprintf(stderr, "fund: %s is bogus\r\n", u3_cr_string(p_cey)); fprintf(stderr, "fund: %s is bogus\r\n", u3_cr_string(p_cey));
return u3_none; return c3nne;
} }
else { else {
u3_noun soh = _cj_cold_find_sys(u3h(rah)); u3_noun soh = _cj_cold_find_sys(u3h(rah));
if ( u3_none == soh ) { if ( c3nne == soh ) {
fprintf(stderr, "fund: in %s, parent %x not found at %d\r\n", fprintf(stderr, "fund: in %s, parent %x not found at %d\r\n",
u3_cr_string(p_cey), u3_cr_string(p_cey),
u3_cr_mug(u3h(rah)), u3_cr_mug(u3h(rah)),
q_cey); q_cey);
return u3_none; return c3nne;
} }
else { else {
mop = u3nq(u3k(p_cey), u3k(q_cey), u3_yes, u3k(soh)); mop = u3nq(u3k(p_cey), u3k(q_cey), c3y, u3k(soh));
} }
} }
} }
@ -261,7 +261,7 @@ _cj_cold_mine(u3_noun cey, u3_noun cor)
u3_noun hoe = u3_ckdb_get(u3k(u3t(u3R->jed.das)), u3k(soh)); u3_noun hoe = u3_ckdb_get(u3k(u3t(u3R->jed.das)), u3k(soh));
u3_noun sab; u3_noun sab;
if ( u3_none == hoe ) { if ( c3nne == hoe ) {
sab = u3nt(u3nc(u3k(bat), u3k(r_cey)), u3_nul, u3_nul); sab = u3nt(u3nc(u3k(bat), u3k(r_cey)), u3_nul, u3_nul);
} }
else { else {
@ -286,7 +286,7 @@ _cj_cold_mine(u3_noun cey, u3_noun cor)
} }
} }
/* _cj_warm_fend(): in warm state, return u3_none or calx. RETAINS. /* _cj_warm_fend(): in warm state, return c3nne or calx. RETAINS.
*/ */
u3_weak u3_weak
_cj_warm_fend(u3_noun bat) _cj_warm_fend(u3_noun bat)
@ -296,14 +296,14 @@ _cj_warm_fend(u3_noun bat)
while ( 1 ) { while ( 1 ) {
u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat);
if ( u3_none != jaw ) { if ( c3nne != jaw ) {
return jaw; return jaw;
} }
if ( rod_u->par_u ) { if ( rod_u->par_u ) {
rod_u = rod_u->par_u; rod_u = rod_u->par_u;
} }
else return u3_none; else return c3nne;
} }
} }
@ -339,7 +339,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc)
u3_noun nam = u3_ci_string(jet_u->fcs_c); u3_noun nam = u3_ci_string(jet_u->fcs_c);
u3_noun fol = u3_ckdb_get(u3k(huc), nam); u3_noun fol = u3_ckdb_get(u3k(huc), nam);
if ( u3_none == fol ) { if ( c3nne == fol ) {
fprintf(stderr, "jets: activate: bad fcs %s\r\n", jet_u->fcs_c); fprintf(stderr, "jets: activate: bad fcs %s\r\n", jet_u->fcs_c);
} }
else { else {
@ -379,7 +379,7 @@ _cj_boil_mean(c3_l par_l, u3_noun mop, u3_noun bat)
u3_cs_core* cop_u; u3_cs_core* cop_u;
while ( (cop_u = &dev_u[i_l])->cos_c ) { while ( (cop_u = &dev_u[i_l])->cos_c ) {
if ( u3_so(u3_cr_sing_c(cop_u->cos_c, u3h(mop))) ) { if ( _(u3_cr_sing_c(cop_u->cos_c, u3h(mop))) ) {
#if 0 #if 0
fprintf(stderr, "boil: bound jet %d/%s/%s/%x\r\n", fprintf(stderr, "boil: bound jet %d/%s/%s/%x\r\n",
cop_u->jax_l, cop_u->jax_l,
@ -409,7 +409,7 @@ _cj_boil_mine(u3_noun mop, u3_noun cor)
// Calculate parent axis. // Calculate parent axis.
// //
if ( u3_yes == hr_mop ) { if ( c3y == hr_mop ) {
u3_noun cax = _cj_warm_fend(u3h(u3_cr_at(q_mop, cor))); u3_noun cax = _cj_warm_fend(u3h(u3_cr_at(q_mop, cor)));
par_l = u3h(cax); par_l = u3h(cax);
@ -468,7 +468,7 @@ _cj_warm_ream_un(u3_noun soh)
u3_noun cax; u3_noun cax;
c3_l jax_l; c3_l jax_l;
if ( u3_none != (cax = u3_ch_get(u3R->jed.har_p, u3h(u3h(sab)))) ) { if ( c3nne != (cax = u3_ch_get(u3R->jed.har_p, u3h(u3h(sab)))) ) {
jax_l = u3h(cax); jax_l = u3h(cax);
u3z(cax); u3z(cax);
} }
@ -493,7 +493,7 @@ _cj_warm_ream_at(u3_noun soh, u3_noun cag)
{ {
c3_l par_l, jax_l; c3_l par_l, jax_l;
if ( u3_yes == hr_mop ) { if ( c3y == hr_mop ) {
par_l = _cj_warm_ream_un(tr_mop); par_l = _cj_warm_ream_un(tr_mop);
} }
else par_l = 0; else par_l = 0;
@ -552,10 +552,10 @@ _cj_warm_mine(u3_noun clu, u3_noun cor)
u3_noun bat = u3h(cor); u3_noun bat = u3h(cor);
u3_noun cax; u3_noun cax;
if ( u3_ne(u3du(cor)) ) { if ( !_(u3du(cor)) ) {
u3z(clu); u3z(clu);
} }
else if ( u3_none != (cax = _cj_warm_fend(bat)) ) { else if ( c3nne != (cax = _cj_warm_fend(bat)) ) {
u3z(cax); u3z(clu); u3z(cax); u3z(clu);
} }
else { else {
@ -563,12 +563,12 @@ _cj_warm_mine(u3_noun clu, u3_noun cor)
// fprintf(stderr, "warm_mine %s\r\n", u3_cr_string(u3h(cey))); // fprintf(stderr, "warm_mine %s\r\n", u3_cr_string(u3h(cey)));
if ( u3_none != cey ) { if ( c3nne != cey ) {
u3_noun huc = u3t(u3t(cey)); u3_noun huc = u3t(u3t(cey));
u3_noun pax = u3h(u3t(cey)); u3_noun pax = u3h(u3t(cey));
u3_noun mop; u3_noun mop;
if ( u3_none != (mop = _cj_cold_mine(cey, cor)) ) { if ( c3nne != (mop = _cj_cold_mine(cey, cor)) ) {
c3_l jax_l = _cj_boil_mine(mop, cor); c3_l jax_l = _cj_boil_mine(mop, cor);
// fprintf(stderr, "warm: bat %x\r\n", u3_cr_mug(bat)); // fprintf(stderr, "warm: bat %x\r\n", u3_cr_mug(bat));
@ -613,7 +613,7 @@ _cj_find(u3_noun bat)
while ( 1 ) { while ( 1 ) {
u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat); u3_weak jaw = u3_ch_gut(rod_u->jed.har_p, bat);
if ( u3_none != jaw ) { if ( c3nne != jaw ) {
u3_assure(u3_ca_is_cat(u3h(jaw))); u3_assure(u3_ca_is_cat(u3h(jaw)));
#if 0 #if 0
@ -651,7 +651,7 @@ _cj_soft(u3_noun cor, u3_noun axe)
extern int SLAY; extern int SLAY;
/* _cj_kick_z(): try to kick by jet. If no kick, produce u3_none. /* _cj_kick_z(): try to kick by jet. If no kick, produce c3nne.
** **
** `cor` is RETAINED iff there is no kick, TRANSFERRED if one. ** `cor` is RETAINED iff there is no kick, TRANSFERRED if one.
** `axe` is RETAINED. ** `axe` is RETAINED.
@ -660,17 +660,17 @@ static u3_weak
_cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe) _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe)
{ {
if ( 0 == ham_u->fun_f ) { if ( 0 == ham_u->fun_f ) {
return u3_none; return c3nne;
} }
if ( u3_ne(ham_u->liv) ) { if ( !_(ham_u->liv) ) {
return u3_none; return c3nne;
} }
else { else {
if ( u3_so(ham_u->ice) ) { if ( _(ham_u->ice) ) {
u3_weak pro = ham_u->fun_f(cor); u3_weak pro = ham_u->fun_f(cor);
if ( u3_none != pro ) { if ( c3nne != pro ) {
u3z(cor); u3z(cor);
return pro; return pro;
} }
@ -678,19 +678,19 @@ _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe)
else { else {
u3_weak pro, ame; u3_weak pro, ame;
ham_u->ice = u3_yes; ham_u->ice = c3y;
pro = ham_u->fun_f(u3k(cor)); pro = ham_u->fun_f(u3k(cor));
ham_u->ice = u3_no; ham_u->ice = c3n;
if ( u3_none == pro ) { if ( c3nne == pro ) {
u3z(cor); u3z(cor);
return pro; return pro;
} }
ham_u->liv = u3_no; ham_u->liv = c3n;
ame = _cj_soft(cor, axe); ame = _cj_soft(cor, axe);
ham_u->liv = u3_yes; ham_u->liv = c3y;
if ( u3_no == u3_cr_sing(ame, pro) ) { if ( c3n == u3_cr_sing(ame, pro) ) {
fprintf(stderr, "test: %s %s: mismatch: good %x, bad %x\r\n", fprintf(stderr, "test: %s %s: mismatch: good %x, bad %x\r\n",
cop_u->cos_c, cop_u->cos_c,
(!strcmp(".2", ham_u->fcs_c)) ? "$" : ham_u->fcs_c, (!strcmp(".2", ham_u->fcs_c)) ? "$" : ham_u->fcs_c,
@ -708,7 +708,7 @@ _cj_kick_z(u3_noun cor, u3_cs_core* cop_u, u3_cs_harm* ham_u, u3_atom axe)
#endif #endif
} }
} }
return u3_none; return c3nne;
} }
} }
@ -721,11 +721,11 @@ _cj_hook_in(u3_noun cor,
{ {
u3_noun bat = u3h(cor); u3_noun bat = u3h(cor);
if ( u3_ne(u3du(cor)) ) { return u3_cm_bail(c3__fail); } if ( !_(u3du(cor)) ) { return u3_cm_bail(c3__fail); }
{ {
u3_weak cax = _cj_warm_fend(bat); u3_weak cax = _cj_warm_fend(bat);
if ( u3_none == cax ) { return u3_cm_bail(c3__fail); } if ( c3nne == cax ) { return u3_cm_bail(c3__fail); }
{ {
u3_noun jax, pax, huc, hap; u3_noun jax, pax, huc, hap;
@ -735,7 +735,7 @@ _cj_hook_in(u3_noun cor,
u3_cs_core* cop_u = &u3D.ray_u[jax_l]; u3_cs_core* cop_u = &u3D.ray_u[jax_l];
u3_noun fol = u3_ckdb_get(u3k(huc), u3_ci_string(tam_c)); u3_noun fol = u3_ckdb_get(u3k(huc), u3_ci_string(tam_c));
if ( u3_none == fol ) { if ( c3nne == fol ) {
// The caller wants a deeper core. // The caller wants a deeper core.
// //
if ( 0 == pax ) { return u3_cm_bail(c3__fail); } if ( 0 == pax ) { return u3_cm_bail(c3__fail); }
@ -752,9 +752,9 @@ _cj_hook_in(u3_noun cor,
c3_l inx_l; c3_l inx_l;
if ( (0 == axe_l) || if ( (0 == axe_l) ||
(u3_no == jet_o) || (c3n == jet_o) ||
(u3_none == (inx_l = u3_ckdb_get(u3k(hap), axe_l))) || (c3nne == (inx_l = u3_ckdb_get(u3k(hap), axe_l))) ||
(u3_none == (pro = _cj_kick_z(cor, (c3nne == (pro = _cj_kick_z(cor,
cop_u, cop_u,
&cop_u->arm_u[inx_l], &cop_u->arm_u[inx_l],
axe_l))) ) axe_l))) )
@ -788,7 +788,7 @@ u3_cj_soft(u3_noun cor,
{ {
u3_noun pro; u3_noun pro;
pro = _cj_hook_in(cor, tam_c, u3_no); pro = _cj_hook_in(cor, tam_c, c3n);
return pro; return pro;
} }
@ -800,7 +800,7 @@ u3_cj_hook(u3_noun cor,
{ {
u3_noun pro; u3_noun pro;
pro = _cj_hook_in(cor, tam_c, u3_yes); pro = _cj_hook_in(cor, tam_c, c3y);
return pro; return pro;
} }
@ -812,18 +812,18 @@ u3_cj_hook(u3_noun cor,
u3_weak u3_weak
u3_cj_kick(u3_noun cor, u3_noun axe) u3_cj_kick(u3_noun cor, u3_noun axe)
{ {
if ( u3_ne(u3du(cor)) ) { return u3_none; } if ( !_(u3du(cor)) ) { return c3nne; }
{ {
u3_noun bat = u3h(cor); u3_noun bat = u3h(cor);
u3_weak cax = _cj_warm_fend(bat); u3_weak cax = _cj_warm_fend(bat);
if ( u3_none == cax ) { return u3_none; } if ( c3nne == cax ) { return c3nne; }
{ {
u3_noun hap = u3h(u3t(u3t(cax))); u3_noun hap = u3h(u3t(u3t(cax)));
u3_noun inx = u3_ckdb_get(u3k(hap), u3k(axe)); u3_noun inx = u3_ckdb_get(u3k(hap), u3k(axe));
if ( u3_none == inx ) { if ( c3nne == inx ) {
u3z(cax); return u3_none; u3z(cax); return c3nne;
} }
else { else {
c3_l jax_l = u3h(cax); c3_l jax_l = u3h(cax);
@ -849,7 +849,7 @@ u3_cj_kink(u3_noun cor,
{ {
u3_weak pro = u3_cj_kick(cor, axe); u3_weak pro = u3_cj_kick(cor, axe);
if ( u3_none != pro ) { if ( c3nne != pro ) {
return pro; return pro;
} else { } else {
return u3_cn_nock_on(cor, u3nq(9, axe, 0, 1)); return u3_cn_nock_on(cor, u3nq(9, axe, 0, 1));
@ -907,7 +907,7 @@ _cj_cold_reap_to(u3_noun sab, u3_noun bas)
// If the battery is not junior, or if it has been // If the battery is not junior, or if it has been
// already collected for the product, promote it. // already collected for the product, promote it.
// //
if ( u3_so(u3_ca_left(pn_sab)) ) { if ( _(u3_ca_left(pn_sab)) ) {
u3_noun bat = u3_ca_take(pn_sab); u3_noun bat = u3_ca_take(pn_sab);
bas = u3_ckdb_put(bas, bat, u3_ca_take(qn_sab)); bas = u3_ckdb_put(bas, bat, u3_ca_take(qn_sab));
@ -965,7 +965,7 @@ _cj_warm_reap(u3_noun kev)
u3_noun bat = u3h(kev); u3_noun bat = u3h(kev);
u3_noun cax = u3t(kev); u3_noun cax = u3t(kev);
if ( u3_so(u3_ca_left(bat)) ) { if ( _(u3_ca_left(bat)) ) {
u3_noun tab = u3_ca_take(bat); u3_noun tab = u3_ca_take(bat);
u3_noun xac = u3_ca_take(cax); u3_noun xac = u3_ca_take(cax);
#if 0 #if 0

62
g/m.c
View File

@ -367,7 +367,7 @@ u3_cm_mark(void)
void void
u3_cm_boot(c3_o nuu_o, c3_o bug_o) u3_cm_boot(c3_o nuu_o, c3_o bug_o)
{ {
if ( u3_yes == nuu_o ) { if ( c3y == nuu_o ) {
u3H = (void *)_boot_north(u3_Loom + 1, u3H = (void *)_boot_north(u3_Loom + 1,
c3_wiseof(u3_cs_home), c3_wiseof(u3_cs_home),
u3_cc_words - 1); u3_cc_words - 1);
@ -382,7 +382,7 @@ u3_cm_boot(c3_o nuu_o, c3_o bug_o)
u3R = &u3H->rod_u; u3R = &u3H->rod_u;
} }
if ( u3_so(bug_o) ) { if ( _(bug_o) ) {
u3R->how.fag_w |= u3_cs_flag_debug; u3R->how.fag_w |= u3_cs_flag_debug;
} }
} }
@ -405,7 +405,7 @@ u3_cm_dump(void)
c3_w fre_w = 0; c3_w fre_w = 0;
c3_w i_w; c3_w i_w;
hat_w = u3_so(u3_ca_is_north(u3R)) ? u3R->hat_w - u3R->rut_w hat_w = _(u3_ca_is_north(u3R)) ? u3R->hat_w - u3R->rut_w
: u3R->rut_w - u3R->hat_w; : u3R->rut_w - u3R->hat_w;
for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) { for ( i_w = 0; i_w < u3_cc_fbox_no; i_w++ ) {
@ -420,10 +420,10 @@ u3_cm_dump(void)
hat_w, fre_w, (hat_w - fre_w)); hat_w, fre_w, (hat_w - fre_w));
if ( 0 != (hat_w - fre_w) ) { if ( 0 != (hat_w - fre_w) ) {
c3_w* box_w = u3_so(u3_ca_is_north(u3R)) ? u3R->rut_w : u3R->hat_w; c3_w* box_w = _(u3_ca_is_north(u3R)) ? u3R->rut_w : u3R->hat_w;
c3_w mem_w = 0; c3_w mem_w = 0;
while ( box_w < (u3_so(u3_ca_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) { while ( box_w < (_(u3_ca_is_north(u3R)) ? u3R->hat_w : u3R->rut_w) ) {
u3_cs_box* box_u = (void *)box_w; u3_cs_box* box_u = (void *)box_w;
if ( 0 != box_u->use_w ) { if ( 0 != box_u->use_w ) {
@ -478,7 +478,7 @@ u3_cm_bail(u3_noun how)
/* Printf some metadata. /* Printf some metadata.
*/ */
if ( c3__exit != how ) { if ( c3__exit != how ) {
if ( u3_so(u3ud(how)) ) { if ( _(u3ud(how)) ) {
c3_c str_c[5]; c3_c str_c[5];
str_c[0] = ((how >> 0) & 0xff); str_c[0] = ((how >> 0) & 0xff);
@ -489,7 +489,7 @@ u3_cm_bail(u3_noun how)
fprintf(stderr, "bail: %s\r\n", str_c); fprintf(stderr, "bail: %s\r\n", str_c);
} }
else { else {
c3_assert(u3_so(u3ud(u3h(how)))); c3_assert(_(u3ud(u3h(how))));
fprintf(stderr, "bail: %d\r\n", u3h(how)); fprintf(stderr, "bail: %d\r\n", u3h(how));
u3_cm_p("bail", u3t(how)); u3_cm_p("bail", u3t(how));
@ -505,14 +505,14 @@ u3_cm_bail(u3_noun how)
// choice but to use the signal process; and we require the flat // choice but to use the signal process; and we require the flat
// form of how. // form of how.
// //
c3_assert(u3_so(u3_ca_is_cat(how))); c3_assert(_(u3_ca_is_cat(how)));
u3_cm_signal(how); u3_cm_signal(how);
} }
/* Reconstruct a correct error ball. /* Reconstruct a correct error ball.
*/ */
{ {
if ( u3_so(u3ud(how)) ) { if ( _(u3ud(how)) ) {
switch ( how ) { switch ( how ) {
case c3__exit: { case c3__exit: {
how = u3nc(2, u3R->bug.tax); how = u3nc(2, u3R->bug.tax);
@ -574,7 +574,7 @@ u3_cm_leap(c3_w pad_w)
{ {
u3p(c3_w) bot_p; u3p(c3_w) bot_p;
if ( u3_yes == u3_ca_is_north(u3R) ) { if ( c3y == u3_ca_is_north(u3R) ) {
bot_p = (u3R->cap_p - len_w); bot_p = (u3R->cap_p - len_w);
u3R->cap_p -= len_w; u3R->cap_p -= len_w;
@ -628,9 +628,9 @@ u3_cm_fall()
#if 0 #if 0
fprintf(stderr, "fall: from %s %p, to %s %p (cap %p, was %p)\r\n", fprintf(stderr, "fall: from %s %p, to %s %p (cap %p, was %p)\r\n",
u3_so(u3_ca_is_north(u3R)) ? "north" : "south", _(u3_ca_is_north(u3R)) ? "north" : "south",
u3R, u3R,
u3_so(u3_ca_is_north(u3R)) ? "north" : "south", _(u3_ca_is_north(u3R)) ? "north" : "south",
u3R->par_u, u3R->par_u,
u3R->hat_w, u3R->hat_w,
u3R->rut_w); u3R->rut_w);
@ -682,7 +682,7 @@ u3_cm_love(u3_noun pro)
c3_w c3_w
u3_cm_golf(void) u3_cm_golf(void)
{ {
if ( u3_yes == u3_ca_is_north(u3R) ) { if ( c3y == u3_ca_is_north(u3R) ) {
return u3R->mat_p - u3R->cap_p; return u3R->mat_p - u3R->cap_p;
} }
else { else {
@ -697,7 +697,7 @@ u3_cm_flog(c3_w gof_w)
{ {
// Enable memsets in case of memory corruption. // Enable memsets in case of memory corruption.
// //
if ( u3_yes == u3_ca_is_north(u3R) ) { if ( c3y == u3_ca_is_north(u3R) ) {
u3_post bot_p = (u3R->mat_p - gof_w); u3_post bot_p = (u3R->mat_p - gof_w);
// c3_w len_w = (bot_w - u3R->cap_w); // c3_w len_w = (bot_w - u3R->cap_w);
@ -761,7 +761,7 @@ u3_cm_soft_top(c3_w sec_w, // timer seconds
/* Make sure the inner routine did not create garbage. /* Make sure the inner routine did not create garbage.
*/ */
if ( u3R->how.fag_w & u3_cs_flag_debug ) { if ( u3R->how.fag_w & u3_cs_flag_debug ) {
u3_ce_grab("top", pro, u3_none); u3_ce_grab("top", pro, c3nne);
} }
/* Revert to external signal regime. /* Revert to external signal regime.
@ -798,7 +798,7 @@ u3_cm_soft_sure(u3_funk fun_f, u3_noun arg)
{ {
u3_noun pro, pru = u3_cm_soft_top(0, 32768, fun_f, arg); u3_noun pro, pru = u3_cm_soft_top(0, 32768, fun_f, arg);
c3_assert(u3_so(u3du(pru))); c3_assert(_(u3du(pru)));
pro = u3k(u3t(pru)); pro = u3k(u3t(pru));
u3z(pru); u3z(pru);
@ -842,7 +842,7 @@ u3_cm_soft_run(u3_noun fly,
pro = fun_f(aga, agb); pro = fun_f(aga, agb);
if ( u3R->how.fag_w & u3_cs_flag_debug ) { if ( u3R->how.fag_w & u3_cs_flag_debug ) {
u3_ce_grab("top", pro, u3_none); u3_ce_grab("top", pro, c3nne);
} }
/* Produce success, on the old road. /* Produce success, on the old road.
@ -853,7 +853,7 @@ u3_cm_soft_run(u3_noun fly,
/* Produce - or fall again. /* Produce - or fall again.
*/ */
{ {
c3_assert(u3_so(u3du(why))); c3_assert(_(u3du(why)));
switch ( u3h(why) ) { switch ( u3h(why) ) {
default: c3_assert(0); return 0; default: c3_assert(0); return 0;
@ -1005,9 +1005,9 @@ _cm_is_tas(u3_atom som, c3_w len_w)
{ {
continue; continue;
} }
return u3_no; return c3n;
} }
return u3_yes; return c3y;
} }
/* _cm_is_ta(): yes iff som (RETAIN) is @ta. /* _cm_is_ta(): yes iff som (RETAIN) is @ta.
@ -1021,10 +1021,10 @@ _cm_is_ta(u3_noun som, c3_w len_w)
c3_c c_c = u3_cr_byte(i_w, som); c3_c c_c = u3_cr_byte(i_w, som);
if ( (c_c < 32) || (c_c > 127) ) { if ( (c_c < 32) || (c_c > 127) ) {
return u3_no; return c3n;
} }
} }
return u3_yes; return c3y;
} }
/* _cm_hex(): hex byte. /* _cm_hex(): hex byte.
@ -1041,24 +1041,24 @@ c3_y _cm_hex(c3_y c_y)
static c3_w static c3_w
_cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c) _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c)
{ {
if ( u3_so(u3du(som)) ) { if ( _(u3du(som)) ) {
c3_w sel_w, one_w, two_w; c3_w sel_w, one_w, two_w;
sel_w = 0; sel_w = 0;
if ( u3_so(sel_o) ) { if ( _(sel_o) ) {
if ( str_c ) { *(str_c++) = '['; } if ( str_c ) { *(str_c++) = '['; }
sel_w += 1; sel_w += 1;
} }
one_w = _cm_in_pretty(u3h(som), u3_yes, str_c); one_w = _cm_in_pretty(u3h(som), c3y, str_c);
if ( str_c ) { if ( str_c ) {
str_c += one_w; str_c += one_w;
*(str_c++) = ' '; *(str_c++) = ' ';
} }
two_w = _cm_in_pretty(u3t(som), u3_no, str_c); two_w = _cm_in_pretty(u3t(som), c3n, str_c);
if ( str_c ) { str_c += two_w; } if ( str_c ) { str_c += two_w; }
if ( u3_so(sel_o) ) { if ( _(sel_o) ) {
if ( str_c ) { *(str_c++) = ']'; } if ( str_c ) { *(str_c++) = ']'; }
sel_w += 1; sel_w += 1;
} }
@ -1078,7 +1078,7 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c)
else { else {
c3_w len_w = u3_cr_met(3, som); c3_w len_w = u3_cr_met(3, som);
if ( u3_so(_cm_is_tas(som, len_w)) ) { if ( _(_cm_is_tas(som, len_w)) ) {
c3_w len_w = u3_cr_met(3, som); c3_w len_w = u3_cr_met(3, som);
if ( str_c ) { if ( str_c ) {
@ -1088,7 +1088,7 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c)
} }
return len_w + 1; return len_w + 1;
} }
else if ( u3_so(_cm_is_ta(som, len_w)) ) { else if ( _(_cm_is_ta(som, len_w)) ) {
if ( str_c ) { if ( str_c ) {
*(str_c++) = '\''; *(str_c++) = '\'';
u3_cr_bytes(0, len_w, (c3_y *)str_c, som); u3_cr_bytes(0, len_w, (c3_y *)str_c, som);
@ -1133,10 +1133,10 @@ _cm_in_pretty(u3_noun som, c3_o sel_o, c3_c* str_c)
c3_c* c3_c*
u3_cm_pretty(u3_noun som) u3_cm_pretty(u3_noun som)
{ {
c3_w len_w = _cm_in_pretty(som, u3_yes, 0); c3_w len_w = _cm_in_pretty(som, c3y, 0);
c3_c* pre_c = malloc(len_w + 1); c3_c* pre_c = malloc(len_w + 1);
_cm_in_pretty(som, u3_yes, pre_c); _cm_in_pretty(som, c3y, pre_c);
pre_c[len_w] = 0; pre_c[len_w] = 0;
return pre_c; return pre_c;
} }

16
g/n.c
View File

@ -54,7 +54,7 @@ _cn_hint(u3_noun zep,
case c3__germ: { case c3__germ: {
u3_noun pro = u3_cn_nock_on(bus, nex); u3_noun pro = u3_cn_nock_on(bus, nex);
if ( u3_yes == u3_cr_sing(pro, hod) ) { if ( c3y == u3_cr_sing(pro, hod) ) {
u3z(pro); return hod; u3z(pro); return hod;
} else { } else {
u3z(hod); return pro; u3z(hod); return pro;
@ -76,7 +76,7 @@ _cn_hint(u3_noun zep,
{ {
u3_noun pro = u3_cz_find_2(c3__nock, bus, nex); u3_noun pro = u3_cz_find_2(c3__nock, bus, nex);
if ( pro != u3_none ) { if ( pro != c3nne ) {
u3z(bus); u3z(nex); u3z(bus); u3z(nex);
return pro; return pro;
} }
@ -117,7 +117,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol)
u3R->pro.nox_d += 1; u3R->pro.nox_d += 1;
if ( u3_yes == u3_cr_du(hib) ) { if ( c3y == u3_cr_du(hib) ) {
u3_noun poz, riv; u3_noun poz, riv;
poz = u3_cn_nock_on(u3k(bus), u3k(hib)); poz = u3_cn_nock_on(u3k(bus), u3k(hib));
@ -130,7 +130,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol)
default: return u3_cm_bail(c3__exit); default: return u3_cm_bail(c3__exit);
case 0: { case 0: {
if ( u3_no == u3_cr_ud(gal) ) { if ( c3n == u3_cr_ud(gal) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -254,12 +254,12 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol)
u3_noun seb = u3_cn_nock_on(bus, u3k(c_gal)); u3_noun seb = u3_cn_nock_on(bus, u3k(c_gal));
u3_noun pro = u3_cj_kick(seb, b_gal); u3_noun pro = u3_cj_kick(seb, b_gal);
if ( u3_none != pro ) { if ( c3nne != pro ) {
u3_ca_lose(fol); u3_ca_lose(fol);
return pro; return pro;
} }
else { else {
if ( u3_no == u3_cr_ud(b_gal) ) { if ( c3n == u3_cr_ud(b_gal) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -282,7 +282,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol)
{ {
u3_noun zep, hod, nex; u3_noun zep, hod, nex;
if ( u3_yes == u3_cr_du(p_gal) ) { if ( c3y == u3_cr_du(p_gal) ) {
u3_noun b_gal = u3h(p_gal); u3_noun b_gal = u3h(p_gal);
u3_noun c_gal = u3t(p_gal); u3_noun c_gal = u3t(p_gal);
u3_noun d_gal = q_gal; u3_noun d_gal = q_gal;
@ -309,7 +309,7 @@ u3_cn_nock_on(u3_noun bus, u3_noun fol)
u3_noun gof = u3_cn_nock_on(bus, u3k(gal)); u3_noun gof = u3_cn_nock_on(bus, u3k(gal));
u3_noun val = u3_cm_soft_esc(gof); u3_noun val = u3_cm_soft_esc(gof);
if ( u3_ne(u3du(val)) ) { if ( !_(u3du(val)) ) {
u3_cm_bail(u3nt(1, gof, 0)); u3_cm_bail(u3nt(1, gof, 0));
} }
else { else {

314
g/r.c
View File

@ -15,8 +15,8 @@ _frag_word(c3_w a_w, u3_noun b)
c3_w dep_w = u3_ax_dep(a_w); c3_w dep_w = u3_ax_dep(a_w);
while ( dep_w ) { while ( dep_w ) {
if ( u3_no == u3_ca_is_cell(b) ) { if ( c3n == u3_ca_is_cell(b) ) {
return u3_none; return c3nne;
} }
else { else {
u3_cs_cell* b_u = u3_ca_to_ptr(b); u3_cs_cell* b_u = u3_ca_to_ptr(b);
@ -37,8 +37,8 @@ _frag_deep(c3_w a_w, u3_noun b)
c3_w dep_w = 32; c3_w dep_w = 32;
while ( dep_w ) { while ( dep_w ) {
if ( u3_no == u3_ca_is_cell(b) ) { if ( c3n == u3_ca_is_cell(b) ) {
return u3_none; return c3nne;
} }
else { else {
u3_cs_cell* b_u = u3_ca_to_ptr(b); u3_cs_cell* b_u = u3_ca_to_ptr(b);
@ -52,25 +52,25 @@ _frag_deep(c3_w a_w, u3_noun b)
/* u3_cr_at(): /* u3_cr_at():
** **
** Return fragment (a) of (b), or u3_none if not applicable. ** Return fragment (a) of (b), or c3nne if not applicable.
*/ */
u3_weak u3_weak
u3_cr_at(u3_atom a, u3_cr_at(u3_atom a,
u3_noun b) u3_noun b)
{ {
c3_assert(u3_none != a); c3_assert(c3nne != a);
c3_assert(u3_none != b); c3_assert(c3nne != b);
if ( 0 == a ) { if ( 0 == a ) {
return u3_none; return c3nne;
} }
if ( u3_so(u3_ca_is_cat(a)) ) { if ( _(u3_ca_is_cat(a)) ) {
return _frag_word(a, b); return _frag_word(a, b);
} }
else { else {
if ( u3_ne(u3_ca_is_pug(a)) ) { if ( !_(u3_ca_is_pug(a)) ) {
return u3_none; return c3nne;
} }
else { else {
u3_cs_atom* a_u = u3_ca_to_ptr(a); u3_cs_atom* a_u = u3_ca_to_ptr(a);
@ -82,7 +82,7 @@ u3_cr_at(u3_atom a,
while ( len_w ) { while ( len_w ) {
b = _frag_deep(a_u->buf_w[len_w - 1], b); b = _frag_deep(a_u->buf_w[len_w - 1], b);
if ( u3_none == b ) { if ( c3nne == b ) {
return b; return b;
} else { } else {
len_w--; len_w--;
@ -129,19 +129,19 @@ u3_cr_at(u3_atom a,
struct _mean_pair* prs_m) struct _mean_pair* prs_m)
{ {
if ( len_w == 0 ) { if ( len_w == 0 ) {
return u3_yes; return c3y;
} }
else if ( (len_w == 1) && (1 == prs_m[0].axe_w) ) { else if ( (len_w == 1) && (1 == prs_m[0].axe_w) ) {
*prs_m->som = som; *prs_m->som = som;
return u3_yes; return c3y;
} }
else { else {
if ( u3_no == u3_ca_is_cell(som) ) { if ( c3n == u3_ca_is_cell(som) ) {
return u3_no; return c3n;
} else { } else {
c3_w cut_w = _mean_cut(len_w, prs_m); c3_w cut_w = _mean_cut(len_w, prs_m);
return u3_and return c3a
(_mean_extract(u3_ca_h(som), cut_w, prs_m), (_mean_extract(u3_ca_h(som), cut_w, prs_m),
_mean_extract(u3_ca_t(som), (len_w - cut_w), (prs_m + cut_w))); _mean_extract(u3_ca_t(som), (len_w - cut_w), (prs_m + cut_w)));
} }
@ -156,7 +156,7 @@ u3_cr_mean(u3_noun som,
c3_w len_w; c3_w len_w;
struct _mean_pair* prs_m; struct _mean_pair* prs_m;
c3_assert(u3_none != som); c3_assert(c3nne != som);
/* Count. /* Count.
*/ */
@ -382,9 +382,9 @@ _mug_words_buf(c3_w off_w, c3_w nwd_w, u3_noun veb)
c3_w c3_w
u3_cr_mug(u3_noun veb) u3_cr_mug(u3_noun veb)
{ {
c3_assert(u3_none != veb); c3_assert(c3nne != veb);
if ( u3_so(u3_ca_is_cat(veb)) ) { if ( _(u3_ca_is_cat(veb)) ) {
c3_w x_w = veb; c3_w x_w = veb;
return _mug_words(2166136261, (veb ? 1 : 0), &x_w); return _mug_words(2166136261, (veb ? 1 : 0), &x_w);
@ -395,7 +395,7 @@ u3_cr_mug(u3_noun veb)
return veb_u->mug_w; return veb_u->mug_w;
} }
else { else {
if ( u3_so(u3_ca_is_cell(veb)) ) { if ( _(u3_ca_is_cell(veb)) ) {
u3_cs_cell* veb_u = u3_ca_to_ptr(veb); u3_cs_cell* veb_u = u3_ca_to_ptr(veb);
u3_noun hed = veb_u->hed; u3_noun hed = veb_u->hed;
u3_noun tel = veb_u->tel; u3_noun tel = veb_u->tel;
@ -490,7 +490,7 @@ _sung_one(u3_noun* a, u3_noun* b)
c3_o asr_o = u3_ca_is_senior(u3R, *a); c3_o asr_o = u3_ca_is_senior(u3R, *a);
c3_o bsr_o = u3_ca_is_senior(u3R, *b); c3_o bsr_o = u3_ca_is_senior(u3R, *b);
if ( u3_so(asr_o) && u3_so(bsr_o) ) { if ( _(asr_o) && _(bsr_o) ) {
// You shouldn't have let this happen. We don't want to // You shouldn't have let this happen. We don't want to
// descend down to a lower road and free there, because // descend down to a lower road and free there, because
// synchronization - though this could be revisited under // synchronization - though this could be revisited under
@ -498,11 +498,11 @@ _sung_one(u3_noun* a, u3_noun* b)
// //
return; return;
} }
if ( u3_so(asr_o) && !u3_so(bsr_o) ){ if ( _(asr_o) && !_(bsr_o) ){
u3z(*b); u3z(*b);
*b = *a; *b = *a;
} }
if ( u3_so(bsr_o) && !u3_so(asr_o) ) { if ( _(bsr_o) && !_(asr_o) ) {
u3z(*a); u3z(*a);
*a = *b; *a = *b;
} }
@ -537,17 +537,17 @@ static u3_bean
_sung_x(u3_noun a, u3_noun b) _sung_x(u3_noun a, u3_noun b)
{ {
if ( a == b ) { if ( a == b ) {
return u3_yes; return c3y;
} }
else { else {
if ( u3_so(u3_ca_is_atom(a)) ) { if ( _(u3_ca_is_atom(a)) ) {
u3_cs_atom* a_u = u3_ca_to_ptr(a); u3_cs_atom* a_u = u3_ca_to_ptr(a);
if ( !u3_so(u3_ca_is_atom(b)) || if ( !_(u3_ca_is_atom(b)) ||
u3_so(u3_ca_is_cat(a)) || _(u3_ca_is_cat(a)) ||
u3_so(u3_ca_is_cat(b)) ) _(u3_ca_is_cat(b)) )
{ {
return u3_no; return c3n;
} }
else { else {
u3_cs_atom* b_u = u3_ca_to_ptr(b); u3_cs_atom* b_u = u3_ca_to_ptr(b);
@ -556,31 +556,31 @@ _sung_x(u3_noun a, u3_noun b)
b_u->mug_w && b_u->mug_w &&
(a_u->mug_w != b_u->mug_w) ) (a_u->mug_w != b_u->mug_w) )
{ {
return u3_no; return c3n;
} }
else { else {
c3_w w_rez = a_u->len_w; c3_w w_rez = a_u->len_w;
c3_w w_mox = b_u->len_w; c3_w w_mox = b_u->len_w;
if ( w_rez != w_mox ) { if ( w_rez != w_mox ) {
return u3_no; return c3n;
} }
else { else {
c3_w i_w; c3_w i_w;
for ( i_w = 0; i_w < w_rez; i_w++ ) { for ( i_w = 0; i_w < w_rez; i_w++ ) {
if ( a_u->buf_w[i_w] != b_u->buf_w[i_w] ) { if ( a_u->buf_w[i_w] != b_u->buf_w[i_w] ) {
return u3_no; return c3n;
} }
} }
return u3_yes; return c3y;
} }
} }
} }
} }
else { else {
if ( u3_so(u3_ca_is_atom(b)) ) { if ( _(u3_ca_is_atom(b)) ) {
return u3_no; return c3n;
} }
else { else {
u3_cs_cell* a_u = u3_ca_to_ptr(a); u3_cs_cell* a_u = u3_ca_to_ptr(a);
@ -590,22 +590,22 @@ _sung_x(u3_noun a, u3_noun b)
b_u->mug_w && b_u->mug_w &&
(a_u->mug_w != b_u->mug_w) ) (a_u->mug_w != b_u->mug_w) )
{ {
return u3_no; return c3n;
} }
else { else {
if ( u3_no == _sung_x(a_u->hed, b_u->hed) ) { if ( c3n == _sung_x(a_u->hed, b_u->hed) ) {
return u3_no; return c3n;
} }
else { else {
_sung_one(&a_u->hed, &b_u->hed); _sung_one(&a_u->hed, &b_u->hed);
if ( u3_no == _sung_x(a_u->tel, b_u->tel) ) { if ( c3n == _sung_x(a_u->tel, b_u->tel) ) {
return u3_no; return c3n;
} }
else { else {
_sung_one(&a_u->tel, &b_u->tel); _sung_one(&a_u->tel, &b_u->tel);
return u3_yes; return c3y;
} }
} }
} }
@ -622,21 +622,21 @@ static u3_bean
_sing_x(u3_noun a, _sing_x(u3_noun a,
u3_noun b) u3_noun b)
{ {
c3_assert(u3_none != a); c3_assert(c3nne != a);
c3_assert(u3_none != b); c3_assert(c3nne != b);
if ( a == b ) { if ( a == b ) {
return u3_yes; return c3y;
} }
else { else {
if ( u3_so(u3_ca_is_atom(a)) ) { if ( _(u3_ca_is_atom(a)) ) {
u3_cs_atom* a_u = u3_ca_to_ptr(a); u3_cs_atom* a_u = u3_ca_to_ptr(a);
if ( !u3_so(u3_ca_is_atom(b)) || if ( !_(u3_ca_is_atom(b)) ||
u3_so(u3_ca_is_cat(a)) || _(u3_ca_is_cat(a)) ||
u3_so(u3_ca_is_cat(b)) ) _(u3_ca_is_cat(b)) )
{ {
return u3_no; return c3n;
} }
else { else {
u3_cs_atom* b_u = u3_ca_to_ptr(b); u3_cs_atom* b_u = u3_ca_to_ptr(b);
@ -645,31 +645,31 @@ _sing_x(u3_noun a,
b_u->mug_w && b_u->mug_w &&
(a_u->mug_w != b_u->mug_w) ) (a_u->mug_w != b_u->mug_w) )
{ {
return u3_no; return c3n;
} }
else { else {
c3_w w_rez = a_u->len_w; c3_w w_rez = a_u->len_w;
c3_w w_mox = b_u->len_w; c3_w w_mox = b_u->len_w;
if ( w_rez != w_mox ) { if ( w_rez != w_mox ) {
return u3_no; return c3n;
} }
else { else {
c3_w i_w; c3_w i_w;
for ( i_w = 0; i_w < w_rez; i_w++ ) { for ( i_w = 0; i_w < w_rez; i_w++ ) {
if ( a_u->buf_w[i_w] != b_u->buf_w[i_w] ) { if ( a_u->buf_w[i_w] != b_u->buf_w[i_w] ) {
return u3_no; return c3n;
} }
} }
return u3_yes; return c3y;
} }
} }
} }
} }
else { else {
if ( u3_so(u3_ca_is_atom(b)) ) { if ( _(u3_ca_is_atom(b)) ) {
return u3_no; return c3n;
} }
else { else {
u3_cs_cell* a_u = u3_ca_to_ptr(a); u3_cs_cell* a_u = u3_ca_to_ptr(a);
@ -679,16 +679,16 @@ _sing_x(u3_noun a,
b_u->mug_w && b_u->mug_w &&
(a_u->mug_w != b_u->mug_w) ) (a_u->mug_w != b_u->mug_w) )
{ {
return u3_no; return c3n;
} }
else { else {
if ( u3_no == _sing_x(u3_ca_h(a), u3_ca_h(b)) ) { if ( c3n == _sing_x(u3_ca_h(a), u3_ca_h(b)) ) {
return u3_no; return c3n;
} }
else if ( u3_no == _sing_x(u3_ca_t(a), u3_ca_t(b)) ) { else if ( c3n == _sing_x(u3_ca_t(a), u3_ca_t(b)) ) {
return u3_no; return c3n;
} }
return u3_yes; return c3y;
} }
} }
} }
@ -719,7 +719,7 @@ u3_bean
u3_cr_fing(u3_noun a, u3_cr_fing(u3_noun a,
u3_noun b) u3_noun b)
{ {
return (a == b) ? u3_yes : u3_no; return (a == b) ? c3y : c3n;
} }
/* u3_cr_sing_cell(): /* u3_cr_sing_cell():
@ -731,8 +731,8 @@ u3_cr_sing_cell(u3_noun p,
u3_noun q, u3_noun q,
u3_noun b) u3_noun b)
{ {
return u3_and(u3_so(u3_ca_is_cell(b)), return c3a(_(u3_ca_is_cell(b)),
u3_and(u3_cr_sing(p, u3_ca_h(b)), c3a(u3_cr_sing(p, u3_ca_h(b)),
u3_cr_sing(q, u3_ca_t(b)))); u3_cr_sing(q, u3_ca_t(b))));
} }
u3_bean u3_bean
@ -740,8 +740,8 @@ u3_cr_fing_cell(u3_noun p,
u3_noun q, u3_noun q,
u3_noun b) u3_noun b)
{ {
return u3_and(u3_so(u3_ca_is_cell(b)), return c3a(_(u3_ca_is_cell(b)),
u3_and(u3_cr_fing(p, u3_ca_h(b)), c3a(u3_cr_fing(p, u3_ca_h(b)),
u3_cr_fing(q, u3_ca_t(b)))); u3_cr_fing(q, u3_ca_t(b))));
} }
@ -754,8 +754,8 @@ u3_cr_sing_mixt(const c3_c* p_c,
u3_noun q, u3_noun q,
u3_noun b) u3_noun b)
{ {
return u3_and(u3_so(u3_ca_is_cell(b)), return c3a(_(u3_ca_is_cell(b)),
u3_and(u3_cr_sing_c(p_c, u3_ca_h(b)), c3a(u3_cr_sing_c(p_c, u3_ca_h(b)),
u3_cr_sing(q, u3_ca_t(b)))); u3_cr_sing(q, u3_ca_t(b))));
} }
u3_bean u3_bean
@ -763,8 +763,8 @@ u3_cr_fing_mixt(const c3_c* p_c,
u3_noun q, u3_noun q,
u3_noun b) u3_noun b)
{ {
return u3_and(u3_so(u3_ca_is_cell(b)), return c3a(_(u3_ca_is_cell(b)),
u3_and(u3_cr_sing_c(p_c, u3_ca_h(b)), c3a(u3_cr_sing_c(p_c, u3_ca_h(b)),
u3_cr_fing(q, u3_ca_t(b)))); u3_cr_fing(q, u3_ca_t(b))));
} }
@ -778,8 +778,8 @@ u3_cr_sing_trel(u3_noun p,
u3_noun r, u3_noun r,
u3_noun b) u3_noun b)
{ {
return u3_and(u3_so(u3_ca_is_cell(b)), return c3a(_(u3_ca_is_cell(b)),
u3_and(u3_cr_sing(p, u3_ca_h(b)), c3a(u3_cr_sing(p, u3_ca_h(b)),
u3_cr_sing_cell(q, r, u3_ca_t(b)))); u3_cr_sing_cell(q, r, u3_ca_t(b))));
} }
u3_bean u3_bean
@ -788,8 +788,8 @@ u3_cr_fing_trel(u3_noun p,
u3_noun r, u3_noun r,
u3_noun b) u3_noun b)
{ {
return u3_and(u3_so(u3_ca_is_cell(b)), return c3a(_(u3_ca_is_cell(b)),
u3_and(u3_cr_fing(p, u3_ca_h(b)), c3a(u3_cr_fing(p, u3_ca_h(b)),
u3_cr_fing_cell(q, r, u3_ca_t(b)))); u3_cr_fing_cell(q, r, u3_ca_t(b))));
} }
@ -804,8 +804,8 @@ u3_cr_sing_qual(u3_noun p,
u3_noun s, u3_noun s,
u3_noun b) u3_noun b)
{ {
return u3_and(u3_so(u3_ca_is_cell(b)), return c3a(_(u3_ca_is_cell(b)),
u3_and(u3_cr_sing(p, u3_ca_h(b)), c3a(u3_cr_sing(p, u3_ca_h(b)),
u3_cr_sing_trel(q, r, s, u3_ca_t(b)))); u3_cr_sing_trel(q, r, s, u3_ca_t(b))));
} }
u3_bean u3_bean
@ -815,8 +815,8 @@ u3_cr_fing_qual(u3_noun p,
u3_noun s, u3_noun s,
u3_noun b) u3_noun b)
{ {
return u3_and(u3_so(u3_ca_is_cell(b)), return c3a(_(u3_ca_is_cell(b)),
u3_and(u3_cr_fing(p, u3_ca_h(b)), c3a(u3_cr_fing(p, u3_ca_h(b)),
u3_cr_fing_trel(q, r, s, u3_ca_t(b)))); u3_cr_fing_trel(q, r, s, u3_ca_t(b))));
} }
@ -828,24 +828,24 @@ u3_atom
u3_cr_nord(u3_noun a, u3_cr_nord(u3_noun a,
u3_noun b) u3_noun b)
{ {
c3_assert(u3_none != a); c3_assert(c3nne != a);
c3_assert(u3_none != b); c3_assert(c3nne != b);
if ( a == b ) { if ( a == b ) {
return 1; return 1;
} }
else { else {
if ( u3_so(u3_ca_is_atom(a)) ) { if ( _(u3_ca_is_atom(a)) ) {
if ( !u3_so(u3_ca_is_atom(b)) ) { if ( !_(u3_ca_is_atom(b)) ) {
return 0; return 0;
} else { } else {
if ( u3_so(u3_ca_is_cat(a)) ) { if ( _(u3_ca_is_cat(a)) ) {
if ( u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(b)) ) {
return (a < b) ? 0 : 2; return (a < b) ? 0 : 2;
} }
else return 0; else return 0;
} }
else if ( u3_so(u3_ca_is_cat(b)) ) { else if ( _(u3_ca_is_cat(b)) ) {
return 2; return 2;
} }
else { else {
@ -874,7 +874,7 @@ u3_cr_nord(u3_noun a,
} }
} }
} else { } else {
if ( u3_so(u3_ca_is_atom(b)) ) { if ( _(u3_ca_is_atom(b)) ) {
return 2; return 2;
} else { } else {
u3_atom c = u3_cr_nord(u3_ca_h(a), u3_ca_h(b)); u3_atom c = u3_cr_nord(u3_ca_h(a), u3_ca_h(b));
@ -897,24 +897,24 @@ u3_bean
u3_cr_sing_c(const c3_c* a_c, u3_cr_sing_c(const c3_c* a_c,
u3_noun b) u3_noun b)
{ {
c3_assert(u3_none != b); c3_assert(c3nne != b);
if ( !u3_so(u3_ca_is_atom(b)) ) { if ( !_(u3_ca_is_atom(b)) ) {
return u3_no; return c3n;
} }
else { else {
c3_w w_sof = strlen(a_c); c3_w w_sof = strlen(a_c);
c3_w i_w; c3_w i_w;
if ( w_sof != u3_cr_met(3, b) ) { if ( w_sof != u3_cr_met(3, b) ) {
return u3_no; return c3n;
} }
for ( i_w = 0; i_w < w_sof; i_w++ ) { for ( i_w = 0; i_w < w_sof; i_w++ ) {
if ( u3_cr_byte(i_w, b) != a_c[i_w] ) { if ( u3_cr_byte(i_w, b) != a_c[i_w] ) {
return u3_no; return c3n;
} }
} }
return u3_yes; return c3y;
} }
} }
@ -927,19 +927,19 @@ u3_cr_bush(u3_noun a,
u3_noun* b, u3_noun* b,
u3_noun* c) u3_noun* c)
{ {
c3_assert(u3_none != a); c3_assert(c3nne != a);
if ( u3_so(u3_ca_is_atom(a)) ) { if ( _(u3_ca_is_atom(a)) ) {
return u3_no; return c3n;
} }
else { else {
*b = u3_ca_h(a); *b = u3_ca_h(a);
if ( u3_so(u3_ca_is_atom(*b)) ) { if ( _(u3_ca_is_atom(*b)) ) {
return u3_no; return c3n;
} else { } else {
*c = u3_ca_t(a); *c = u3_ca_t(a);
return u3_yes; return c3y;
} }
} }
} }
@ -953,15 +953,15 @@ u3_cr_cell(u3_noun a,
u3_noun* b, u3_noun* b,
u3_noun* c) u3_noun* c)
{ {
c3_assert(u3_none != a); c3_assert(c3nne != a);
if ( u3_so(u3_ca_is_atom(a)) ) { if ( _(u3_ca_is_atom(a)) ) {
return u3_no; return c3n;
} }
else { else {
if ( b ) *b = u3_ca_h(a); if ( b ) *b = u3_ca_h(a);
if ( c ) *c = u3_ca_t(a); if ( c ) *c = u3_ca_t(a);
return u3_yes; return c3y;
} }
} }
@ -976,13 +976,13 @@ u3_cr_p(u3_noun a,
{ {
u3_noun feg, nux; u3_noun feg, nux;
if ( (u3_yes == u3_cr_cell(a, &feg, &nux)) && if ( (c3y == u3_cr_cell(a, &feg, &nux)) &&
(u3_yes == u3_cr_sing(feg, b)) ) (c3y == u3_cr_sing(feg, b)) )
{ {
*c = nux; *c = nux;
return u3_yes; return c3y;
} }
else return u3_no; else return c3n;
} }
/* u3_cr_pq(): /* u3_cr_pq():
@ -997,12 +997,12 @@ u3_cr_pq(u3_noun a,
{ {
u3_noun nux; u3_noun nux;
if ( (u3_yes == u3_cr_p(a, b, &nux)) && if ( (c3y == u3_cr_p(a, b, &nux)) &&
(u3_yes == u3_cr_cell(nux, c, d)) ) (c3y == u3_cr_cell(nux, c, d)) )
{ {
return u3_yes; return c3y;
} }
else return u3_no; else return c3n;
} }
/* u3_cr_pqr(): /* u3_cr_pqr():
@ -1018,12 +1018,12 @@ u3_cr_pqr(u3_noun a,
{ {
u3_noun nux; u3_noun nux;
if ( (u3_yes == u3_cr_p(a, b, &nux)) && if ( (c3y == u3_cr_p(a, b, &nux)) &&
(u3_yes == u3_cr_trel(nux, c, d, e)) ) (c3y == u3_cr_trel(nux, c, d, e)) )
{ {
return u3_yes; return c3y;
} }
else return u3_no; else return c3n;
} }
/* u3_cr_pqrs(): /* u3_cr_pqrs():
@ -1040,12 +1040,12 @@ u3_cr_pqrs(u3_noun a,
{ {
u3_noun nux; u3_noun nux;
if ( (u3_yes == u3_cr_p(a, b, &nux)) && if ( (c3y == u3_cr_p(a, b, &nux)) &&
(u3_yes == u3_cr_qual(nux, c, d, e, f)) ) (c3y == u3_cr_qual(nux, c, d, e, f)) )
{ {
return u3_yes; return c3y;
} }
else return u3_no; else return c3n;
} }
/* u3_cr_trel(): /* u3_cr_trel():
@ -1060,12 +1060,12 @@ u3_cr_trel(u3_noun a,
{ {
u3_noun guf; u3_noun guf;
if ( (u3_yes == u3_cr_cell(a, b, &guf)) && if ( (c3y == u3_cr_cell(a, b, &guf)) &&
(u3_yes == u3_cr_cell(guf, c, d)) ) { (c3y == u3_cr_cell(guf, c, d)) ) {
return u3_yes; return c3y;
} }
else { else {
return u3_no; return c3n;
} }
} }
@ -1082,11 +1082,11 @@ u3_cr_qual(u3_noun a,
{ {
u3_noun guf; u3_noun guf;
if ( (u3_yes == u3_cr_cell(a, b, &guf)) && if ( (c3y == u3_cr_cell(a, b, &guf)) &&
(u3_yes == u3_cr_trel(guf, c, d, e)) ) { (c3y == u3_cr_trel(guf, c, d, e)) ) {
return u3_yes; return c3y;
} }
else return u3_no; else return c3n;
} }
/* u3_cr_quil(): /* u3_cr_quil():
@ -1103,11 +1103,11 @@ u3_cr_quil(u3_noun a,
{ {
u3_noun guf; u3_noun guf;
if ( (u3_yes == u3_cr_cell(a, b, &guf)) && if ( (c3y == u3_cr_cell(a, b, &guf)) &&
(u3_yes == u3_cr_qual(guf, c, d, e, f)) ) { (c3y == u3_cr_qual(guf, c, d, e, f)) ) {
return u3_yes; return c3y;
} }
else return u3_no; else return c3n;
} }
/* u3_cr_hext(): /* u3_cr_hext():
@ -1125,11 +1125,11 @@ u3_cr_hext(u3_noun a,
{ {
u3_noun guf; u3_noun guf;
if ( (u3_yes == u3_cr_cell(a, b, &guf)) && if ( (c3y == u3_cr_cell(a, b, &guf)) &&
(u3_yes == u3_cr_quil(guf, c, d, e, f, g)) ) { (c3y == u3_cr_quil(guf, c, d, e, f, g)) ) {
return u3_yes; return c3y;
} }
else return u3_no; else return c3n;
} }
/* u3_cr_met(): /* u3_cr_met():
@ -1143,8 +1143,8 @@ c3_w
u3_cr_met(c3_y a_y, u3_cr_met(c3_y a_y,
u3_atom b) u3_atom b)
{ {
c3_assert(u3_none != b); c3_assert(c3nne != b);
c3_assert(u3_so(u3_ca_is_atom(b))); c3_assert(_(u3_ca_is_atom(b)));
if ( b == 0 ) { if ( b == 0 ) {
return 0; return 0;
@ -1156,7 +1156,7 @@ u3_cr_met(c3_y a_y,
c3_w gal_w; c3_w gal_w;
c3_w daz_w; c3_w daz_w;
if ( u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(b)) ) {
gal_w = 0; gal_w = 0;
daz_w = b; daz_w = b;
} }
@ -1206,10 +1206,10 @@ c3_b
u3_cr_bit(c3_w a_w, u3_cr_bit(c3_w a_w,
u3_atom b) u3_atom b)
{ {
c3_assert(u3_none != b); c3_assert(c3nne != b);
c3_assert(u3_so(u3_ca_is_atom(b))); c3_assert(_(u3_ca_is_atom(b)));
if ( u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(b)) ) {
if ( a_w >= 31 ) { if ( a_w >= 31 ) {
return 0; return 0;
} }
@ -1239,10 +1239,10 @@ c3_y
u3_cr_byte(c3_w a_w, u3_cr_byte(c3_w a_w,
u3_atom b) u3_atom b)
{ {
c3_assert(u3_none != b); c3_assert(c3nne != b);
c3_assert(u3_so(u3_ca_is_atom(b))); c3_assert(_(u3_ca_is_atom(b)));
if ( u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(b)) ) {
if ( a_w > 3 ) { if ( a_w > 3 ) {
return 0; return 0;
} }
@ -1276,7 +1276,7 @@ u3_cr_bytes(c3_w a_w,
{ {
c3_w i_w; c3_w i_w;
c3_assert(u3_none != d); c3_assert(c3nne != d);
/* Efficiency: don't call u3_cr_byte(). /* Efficiency: don't call u3_cr_byte().
*/ */
@ -1293,10 +1293,10 @@ void
u3_cr_mp(mpz_t a_mp, u3_cr_mp(mpz_t a_mp,
u3_atom b) u3_atom b)
{ {
c3_assert(u3_none != b); c3_assert(c3nne != b);
c3_assert(u3_so(u3_ca_is_atom(b))); c3_assert(_(u3_ca_is_atom(b)));
if ( u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(b)) ) {
mpz_init_set_ui(a_mp, b); mpz_init_set_ui(a_mp, b);
} }
else { else {
@ -1330,10 +1330,10 @@ c3_w
u3_cr_word(c3_w a_w, u3_cr_word(c3_w a_w,
u3_atom b) u3_atom b)
{ {
c3_assert(u3_none != b); c3_assert(c3nne != b);
c3_assert(u3_so(u3_ca_is_atom(b))); c3_assert(_(u3_ca_is_atom(b)));
if ( u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(b)) ) {
if ( a_w > 0 ) { if ( a_w > 0 ) {
return 0; return 0;
} }
@ -1375,7 +1375,7 @@ u3_cr_words(c3_w a_w,
{ {
c3_w i_w; c3_w i_w;
c3_assert(u3_none != d); c3_assert(c3nne != d);
/* Efficiency: don't call u3_cr_word(). /* Efficiency: don't call u3_cr_word().
*/ */
@ -1402,10 +1402,10 @@ u3_cr_chop(c3_g met_g,
c3_w len_w; c3_w len_w;
c3_w* buf_w; c3_w* buf_w;
c3_assert(u3_none != src); c3_assert(c3nne != src);
c3_assert(u3_so(u3_ca_is_atom(src))); c3_assert(_(u3_ca_is_atom(src)));
if ( u3_so(u3_ca_is_cat(src)) ) { if ( _(u3_ca_is_cat(src)) ) {
len_w = src ? 1 : 0; len_w = src ? 1 : 0;
buf_w = &src; buf_w = &src;
} }
@ -1481,11 +1481,11 @@ u3_cr_tape(u3_noun a)
c3_w i_w; c3_w i_w;
c3_y *a_y; c3_y *a_y;
for ( i_w = 0, b=a; u3_yes == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) for ( i_w = 0, b=a; c3y == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) )
; ;
a_y = c3_malloc(i_w + 1); a_y = c3_malloc(i_w + 1);
for ( i_w = 0, b=a; u3_yes == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) { for ( i_w = 0, b=a; c3y == u3_ca_is_cell(b); i_w++, b=u3_ca_t(b) ) {
a_y[i_w] = u3_ca_h(b); a_y[i_w] = u3_ca_h(b);
} }
a_y[i_w] = 0; a_y[i_w] = 0;

6
g/t.c
View File

@ -25,7 +25,7 @@ u3_ct_mean(u3_noun roc)
void void
u3_ct_drop(void) u3_ct_drop(void)
{ {
c3_assert(u3_so(u3du(u3R->bug.tax))); c3_assert(_(u3du(u3R->bug.tax)));
{ {
u3_noun tax = u3R->bug.tax; u3_noun tax = u3R->bug.tax;
@ -42,7 +42,7 @@ u3_lo_tank(c3_l tab_l, u3_noun tac);
void void
u3_ct_slog(u3_noun hod) u3_ct_slog(u3_noun hod)
{ {
if ( u3_yes == u3du(hod) ) { if ( c3y == u3du(hod) ) {
u3_noun pri = u3h(hod); u3_noun pri = u3h(hod);
switch ( pri ) { switch ( pri ) {
@ -92,7 +92,7 @@ u3_ct_come(u3_atom cog)
void void
u3_ct_flee(void) u3_ct_flee(void)
{ {
c3_assert(u3_so(u3du(u3R->pro.don))); c3_assert(_(u3du(u3R->pro.don)));
{ {
u3_noun tax = u3R->bug.tax; u3_noun tax = u3R->bug.tax;

24
g/v.c
View File

@ -105,7 +105,7 @@ u3_cv_wish(const c3_c* str_c)
exp = u3_ckdb_get(u3k(u3A->yot), u3k(txt)); exp = u3_ckdb_get(u3k(u3A->yot), u3k(txt));
if ( u3_none == exp ) { if ( c3nne == exp ) {
exp = _cv_nock_wish(u3k(txt)); exp = _cv_nock_wish(u3k(txt));
u3A->yot = u3_ckdb_put(u3A->yot, u3k(txt), u3k(exp)); u3A->yot = u3_ckdb_put(u3A->yot, u3k(txt), u3k(exp));
} }
@ -161,8 +161,8 @@ u3_cv_nick(u3_noun vir, u3_noun cor)
u3_noun pi_vir, qi_vir; u3_noun pi_vir, qi_vir;
u3_noun vix; u3_noun vix;
if ( (u3_yes == u3_cr_cell((i_vir=u3h(vir)), &pi_vir, &qi_vir)) && if ( (c3y == u3_cr_cell((i_vir=u3h(vir)), &pi_vir, &qi_vir)) &&
(u3_yes == u3du(qi_vir)) && (c3y == u3du(qi_vir)) &&
(c3__hear == u3h(qi_vir)) ) (c3__hear == u3h(qi_vir)) )
{ {
u3_noun gon; u3_noun gon;
@ -356,19 +356,19 @@ _cv_mole(u3_noun fot,
u3_noun uco = u3_do("slay", san); u3_noun uco = u3_do("slay", san);
u3_noun p_uco, q_uco, r_uco, s_uco; u3_noun p_uco, q_uco, r_uco, s_uco;
if ( (u3_no == u3_cr_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) || if ( (c3n == u3_cr_qual(uco, &p_uco, &q_uco, &r_uco, &s_uco)) ||
(0 != p_uco) || (0 != p_uco) ||
(0 != q_uco) || (0 != q_uco) ||
(u3_no == u3_sing(fot, r_uco)) ) (c3n == u3_sing(fot, r_uco)) )
{ {
uL(fprintf(uH, "strange mole %s\n", u3_cr_string(san))); uL(fprintf(uH, "strange mole %s\n", u3_cr_string(san)));
u3z(fot); u3z(uco); return u3_no; u3z(fot); u3z(uco); return c3n;
} }
else { else {
*ato_d = u3_cr_chub(0, s_uco); *ato_d = u3_cr_chub(0, s_uco);
u3z(fot); u3z(uco); return u3_yes; u3z(fot); u3z(uco); return c3y;
} }
} }
@ -379,15 +379,15 @@ _cv_lily(u3_noun fot, u3_noun txt, c3_l* tid_l)
{ {
c3_d ato_d; c3_d ato_d;
if ( u3_no == _cv_mole(fot, txt, &ato_d) ) { if ( c3n == _cv_mole(fot, txt, &ato_d) ) {
return u3_no; return c3n;
} else { } else {
if ( ato_d >= 0x80000000ULL ) { if ( ato_d >= 0x80000000ULL ) {
return u3_no; return c3n;
} else { } else {
*tid_l = (c3_l) ato_d; *tid_l = (c3_l) ato_d;
return u3_yes; return c3y;
} }
} }
} }
@ -431,7 +431,7 @@ u3_cv_punt(u3_noun blu, c3_l tab_l, u3_noun tac)
// We are calling nock here, but hopefully need no protection. // We are calling nock here, but hopefully need no protection.
// //
while ( u3_yes == u3_cr_du(cat) ) { while ( c3y == u3_cr_du(cat) ) {
u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat))); u3_noun wol = u3_dc("wash", u3nc(tab_l, col_l), u3k(u3h(cat)));
u3_cm_wall(wol); u3_cm_wall(wol);

14
g/x.c
View File

@ -4,12 +4,12 @@
*/ */
#include "all.h" #include "all.h"
/* u3_cx_good(): test for u3_none. /* u3_cx_good(): test for c3nne.
*/ */
u3_noun u3_noun
u3_cx_good(u3_weak som) u3_cx_good(u3_weak som)
{ {
if ( u3_none == som ) { if ( c3nne == som ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else return som; else return som;
@ -22,7 +22,7 @@ u3_cx_at(u3_noun axe, u3_noun som)
{ {
u3_weak pro = u3_cr_at(axe, som); u3_weak pro = u3_cr_at(axe, som);
if ( u3_none == pro ) { if ( c3nne == pro ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else return pro; } else return pro;
} }
@ -36,7 +36,7 @@ u3_cx_cell(u3_noun a,
u3_noun* b, u3_noun* b,
u3_noun* c) u3_noun* c)
{ {
if ( u3_no == u3_cr_cell(a, b, c) ) { if ( c3n == u3_cr_cell(a, b, c) ) {
u3_cm_bail(c3__exit); u3_cm_bail(c3__exit);
} }
} }
@ -51,7 +51,7 @@ u3_cx_trel(u3_noun a,
u3_noun* c, u3_noun* c,
u3_noun* d) u3_noun* d)
{ {
if ( u3_no == u3_cr_trel(a, b, c, d) ) { if ( c3n == u3_cr_trel(a, b, c, d) ) {
u3_cm_bail(c3__exit); u3_cm_bail(c3__exit);
} }
} }
@ -67,7 +67,7 @@ u3_cx_qual(u3_noun a,
u3_noun* d, u3_noun* d,
u3_noun* e) u3_noun* e)
{ {
if ( u3_no == u3_cr_qual(a, b, c, d, e) ) { if ( c3n == u3_cr_qual(a, b, c, d, e) ) {
u3_cm_bail(c3__exit); u3_cm_bail(c3__exit);
} }
} }
@ -84,7 +84,7 @@ u3_cx_quil(u3_noun a,
u3_noun* e, u3_noun* e,
u3_noun* f) u3_noun* f)
{ {
if ( u3_no == u3_cr_quil(a, b, c, d, e, f) ) { if ( c3n == u3_cr_quil(a, b, c, d, e, f) ) {
u3_cm_bail(c3__exit); u3_cm_bail(c3__exit);
} }
} }

2
g/z.c
View File

@ -99,7 +99,7 @@ u3_cz_uniq(u3_noun som)
u3_noun key = u3nc(c3__uniq, u3k(som)); u3_noun key = u3nc(c3__uniq, u3k(som));
u3_noun val = u3_ch_get(u3R->cax.har_p, key); u3_noun val = u3_ch_get(u3R->cax.har_p, key);
if ( u3_none != val ) { if ( c3nne != val ) {
u3z(key); u3z(som); return val; u3z(key); u3z(som); return val;
} }
else { else {

8
include/c/defs.h
View File

@ -7,10 +7,10 @@
# define c3y 0 # define c3y 0
# define c3n 1 # define c3n 1
# define _(x) (c3y == (x)) # define _(x) (c3y == (x))
# define __(x) ((x) ? c3y : c3n) # define __(x) ((x) ? c3y : c3n)
# define c3a(x) __(_(x) && _(y)) # define c3a(x, y) __(_(x) && _(y))
# define c3o(x)( __(_(x) || _(y)) # define c3o(x, y) __(_(x) || _(y))
/** Random useful C macros. /** Random useful C macros.

56
include/g/a.h
View File

@ -34,9 +34,9 @@
*/ */
typedef c3_w u3_noun; typedef c3_w u3_noun;
/* u3_none - out-of-band noun. /* c3nne - out-of-band noun.
*/ */
# define u3_none (u3_noun)0xffffffff # define c3nne (u3_noun)0xffffffff
/* Informative typedefs. Use if you like. /* Informative typedefs. Use if you like.
*/ */
@ -47,8 +47,8 @@
typedef u3_noun u3_trel; // must be triple typedef u3_noun u3_trel; // must be triple
typedef u3_noun u3_qual; // must be quadruple typedef u3_noun u3_qual; // must be quadruple
typedef u3_noun u3_quin; // must be quintuple typedef u3_noun u3_quin; // must be quintuple
typedef u3_noun u3_bean; // loobean: 0 == u3_yes, 1 == u3_no typedef u3_noun u3_bean; // loobean: 0 == c3y, 1 == c3n
typedef u3_noun u3_weak; // may be u3_none typedef u3_noun u3_weak; // may be c3nne
typedef u3_noun (*u3_funk)(u3_noun); typedef u3_noun (*u3_funk)(u3_noun);
typedef u3_noun (*u3_funq)(u3_noun, u3_noun); typedef u3_noun (*u3_funq)(u3_noun, u3_noun);
@ -74,29 +74,29 @@
/* Inside a noun. /* Inside a noun.
*/ */
# define u3_ca_is_cat(som) (((som) >> 31) ? u3_no : u3_yes) # define u3_ca_is_cat(som) (((som) >> 31) ? c3n : c3y)
# define u3_ca_is_dog(som) (((som) >> 31) ? u3_yes : u3_no) # define u3_ca_is_dog(som) (((som) >> 31) ? c3y : c3n)
# define u3_ca_is_pug(som) ((2 == ((som) >> 30)) ? u3_yes : u3_no) # define u3_ca_is_pug(som) ((2 == ((som) >> 30)) ? c3y : c3n)
# define u3_ca_is_pom(som) ((3 == ((som) >> 30)) ? u3_yes : u3_no) # define u3_ca_is_pom(som) ((3 == ((som) >> 30)) ? c3y : c3n)
# define u3_ca_to_off(som) ((som) & 0x3fffffff) # define u3_ca_to_off(som) ((som) & 0x3fffffff)
# define u3_ca_to_ptr(som) (u3_ca_into(u3_ca_to_off(som))) # define u3_ca_to_ptr(som) (u3_ca_into(u3_ca_to_off(som)))
# define u3_ca_to_wtr(som) ((c3_w *)u3_ca_to_ptr(som)) # define u3_ca_to_wtr(som) ((c3_w *)u3_ca_to_ptr(som))
# define u3_ca_to_pug(off) (off | 0x80000000) # define u3_ca_to_pug(off) (off | 0x80000000)
# define u3_ca_to_pom(off) (off | 0xc0000000) # define u3_ca_to_pom(off) (off | 0xc0000000)
# define u3_ca_is_atom(som) u3_or(u3_ca_is_cat(som), \ # define u3_ca_is_atom(som) c3o(u3_ca_is_cat(som), \
u3_ca_is_pug(som)) u3_ca_is_pug(som))
# define u3_ca_is_cell(som) u3_ca_is_pom(som) # define u3_ca_is_cell(som) u3_ca_is_pom(som)
# define u3_ca_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3_ca_outa(dog_w)) # define u3_ca_de_twin(dog, dog_w) ((dog & 0xc0000000) | u3_ca_outa(dog_w))
# define u3_ca_h(som) \ # define u3_ca_h(som) \
( u3_so(u3_ca_is_cell(som)) \ ( _(u3_ca_is_cell(som)) \
? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->hed )\ ? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->hed )\
: u3_cm_bail(c3__exit) ) : u3_cm_bail(c3__exit) )
# define u3_ca_t(som) \ # define u3_ca_t(som) \
( u3_so(u3_ca_is_cell(som)) \ ( _(u3_ca_is_cell(som)) \
? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->tel )\ ? ( ((u3_cs_cell *)u3_ca_to_ptr(som))->tel )\
: u3_cm_bail(c3__exit) ) : u3_cm_bail(c3__exit) )
@ -290,48 +290,48 @@
# define u3to(type, x) ((type *) u3_ca_into(x)) # define u3to(type, x) ((type *) u3_ca_into(x))
# define u3of(type, x) (u3_ca_outa((type *)x)) # define u3of(type, x) (u3_ca_outa((type *)x))
# define u3_ca_is_north(r) ((r->cap_p > r->hat_p) ? u3_yes : u3_no) # define u3_ca_is_north(r) __(r->cap_p > r->hat_p)
# define u3_ca_is_south(r) ((u3_so(u3_ca_is_north(r))) ? u3_no : u3_yes) # define u3_ca_is_south(r) !u3_ca_is_north(r)
# define u3_ca_open(r) ( (u3_yes == u3_ca_is_north(r)) \ # define u3_ca_open(r) ( (c3y == u3_ca_is_north(r)) \
? (c3_w)(r->cap_p - r->hat_p) \ ? (c3_w)(r->cap_p - r->hat_p) \
: (c3_w)(r->hat_p - r->cap_p) ) : (c3_w)(r->hat_p - r->cap_p) )
# define u3_ca_north_is_senior(r, dog) \ # define u3_ca_north_is_senior(r, dog) \
u3_say((u3_ca_to_off(dog) < r->rut_p) || \ __((u3_ca_to_off(dog) < r->rut_p) || \
(u3_ca_to_off(dog) >= r->mat_p)) (u3_ca_to_off(dog) >= r->mat_p))
# define u3_ca_north_is_junior(r, dog) \ # define u3_ca_north_is_junior(r, dog) \
u3_say((u3_ca_to_off(dog) >= r->cap_p) && \ __((u3_ca_to_off(dog) >= r->cap_p) && \
(u3_ca_to_off(dog) < r->mat_p)) (u3_ca_to_off(dog) < r->mat_p))
# define u3_ca_north_is_normal(r, dog) \ # define u3_ca_north_is_normal(r, dog) \
u3_and(u3_not(u3_ca_north_is_senior(r, dog)), \ c3a(!(u3_ca_north_is_senior(r, dog)), \
u3_not(u3_ca_north_is_junior(r, dog))) !(u3_ca_north_is_junior(r, dog)))
# define u3_ca_south_is_senior(r, dog) \ # define u3_ca_south_is_senior(r, dog) \
u3_say((u3_ca_to_off(dog) < r->mat_p) || \ __((u3_ca_to_off(dog) < r->mat_p) || \
(u3_ca_to_off(dog) >= r->rut_p)) (u3_ca_to_off(dog) >= r->rut_p))
# define u3_ca_south_is_junior(r, dog) \ # define u3_ca_south_is_junior(r, dog) \
u3_say((u3_ca_to_off(dog) < r->cap_p) && \ __((u3_ca_to_off(dog) < r->cap_p) && \
(u3_ca_to_off(dog) >= r->mat_p)) (u3_ca_to_off(dog) >= r->mat_p))
# define u3_ca_south_is_normal(r, dog) \ # define u3_ca_south_is_normal(r, dog) \
u3_and(u3_not(u3_ca_south_is_senior(r, dog)), \ c3a(!(u3_ca_south_is_senior(r, dog)), \
u3_not(u3_ca_south_is_junior(r, dog))) !(u3_ca_south_is_junior(r, dog)))
# define u3_ca_is_junior(r, som) \ # define u3_ca_is_junior(r, som) \
( u3_so(u3_ca_is_cat(som)) \ ( _(u3_ca_is_cat(som)) \
? u3_no \ ? c3n \
: u3_so(u3_ca_is_north(r)) \ : _(u3_ca_is_north(r)) \
? u3_ca_north_is_junior(r, som) \ ? u3_ca_north_is_junior(r, som) \
: u3_ca_south_is_junior(r, som) ) : u3_ca_south_is_junior(r, som) )
# define u3_ca_is_senior(r, som) \ # define u3_ca_is_senior(r, som) \
( u3_so(u3_ca_is_cat(som)) \ ( _(u3_ca_is_cat(som)) \
? u3_yes \ ? c3y \
: u3_so(u3_ca_is_north(r)) \ : _(u3_ca_is_north(r)) \
? u3_ca_north_is_senior(r, som) \ ? u3_ca_north_is_senior(r, som) \
: u3_ca_south_is_senior(r, som) ) : u3_ca_south_is_senior(r, som) )

2
include/g/e.h
View File

@ -81,7 +81,7 @@
/* u3_ce_grab(): garbage-collect the world, plus extra roots. /* u3_ce_grab(): garbage-collect the world, plus extra roots.
*/ */
void void
u3_ce_grab(c3_c* cap_c, u3_noun som, ...); // terminate with u3_none u3_ce_grab(c3_c* cap_c, u3_noun som, ...); // terminate with c3nne
/* u3_ce_dirty(): count dirty pages. /* u3_ce_dirty(): count dirty pages.
*/ */

8
include/g/h.h
View File

@ -62,10 +62,10 @@
** u3_ch_slot_to_noun(): slot to cell ** u3_ch_slot_to_noun(): slot to cell
** u3_ch_noun_to_slot(): cell to slot ** u3_ch_noun_to_slot(): cell to slot
*/ */
# define u3_ch_slot_is_null(sot) ((0 == ((sot) >> 30)) ? u3_yes : u3_no) # define u3_ch_slot_is_null(sot) ((0 == ((sot) >> 30)) ? c3y : c3n)
# define u3_ch_slot_is_node(sot) ((1 == ((sot) >> 30)) ? u3_yes : u3_no) # define u3_ch_slot_is_node(sot) ((1 == ((sot) >> 30)) ? c3y : c3n)
# define u3_ch_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? u3_yes : u3_no) # define u3_ch_slot_is_noun(sot) ((1 == ((sot) >> 31)) ? c3y : c3n)
# define u3_ch_slot_is_warm(sot) (((sot) & 0x40000000) ? u3_yes : u3_no) # define u3_ch_slot_is_warm(sot) (((sot) & 0x40000000) ? c3y : c3n)
# define u3_ch_slot_to_node(sot) (u3_ca_into((sot) & 0x3fffffff)) # define u3_ch_slot_to_node(sot) (u3_ca_into((sot) & 0x3fffffff))
# define u3_ch_node_to_slot(ptr) (u3_ca_outa(ptr) | 0x40000000) # define u3_ch_node_to_slot(ptr) (u3_ca_outa(ptr) | 0x40000000)
# define u3_ch_slot_to_noun(sot) (0x40000000 | (sot)) # define u3_ch_slot_to_noun(sot) (0x40000000 | (sot))

2
include/g/j.h
View File

@ -138,7 +138,7 @@
c3_l c3_l
u3_cj_find(u3_noun bat); u3_cj_find(u3_noun bat);
/* u3_cj_kick(): try to kick by jet. If no kick, produce u3_none. /* u3_cj_kick(): try to kick by jet. If no kick, produce c3nne.
** **
** `axe` is RETAINED by the caller; `cor` is RETAINED iff there ** `axe` is RETAINED by the caller; `cor` is RETAINED iff there
** is no kick, TRANSFERRED if one. ** is no kick, TRANSFERRED if one.

6
include/g/r.h
View File

@ -8,18 +8,18 @@
# define u3_cr_du(a) u3_ca_is_cell(a) # define u3_cr_du(a) u3_ca_is_cell(a)
# define u3_cr_ud(a) u3_ca_is_atom(a) # define u3_cr_ud(a) u3_ca_is_atom(a)
#else #else
/* u3_cr_du(): u3_yes iff `a` is cell. /* u3_cr_du(): c3y iff `a` is cell.
*/ */
u3_bean u3_bean
u3_cr_du(u3_noun a); u3_cr_du(u3_noun a);
/* u3_cr_ud(): u3_no iff `a` is cell. /* u3_cr_ud(): c3n iff `a` is cell.
*/ */
u3_bean u3_bean
u3_cr_ud(u3_noun a); u3_cr_ud(u3_noun a);
#endif #endif
/* u3_cr_at(): fragment `a` of `b`, or u3_none. /* u3_cr_at(): fragment `a` of `b`, or c3nne.
*/ */
u3_weak u3_weak
u3_cr_at(u3_atom a, u3_cr_at(u3_atom a,

2
include/g/x.h
View File

@ -18,7 +18,7 @@
u3_noun u3_noun
u3_cx_t(u3_noun som); u3_cx_t(u3_noun som);
#endif #endif
/* u3_cx_good(): test for u3_none. /* u3_cx_good(): test for c3nne.
*/ */
u3_noun u3_noun
u3_cx_good(u3_weak som); u3_cx_good(u3_weak som);

8
j/1/add.c
View File

@ -11,7 +11,7 @@
u3_cqa_add(u3_atom a, u3_cqa_add(u3_atom a,
u3_atom b) u3_atom b)
{ {
if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) {
c3_w c = a + b; c3_w c = a + b;
return u3_ci_words(1, &c); return u3_ci_words(1, &c);
@ -33,9 +33,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

6
j/1/dec.c
View File

@ -20,7 +20,7 @@
return u3_cm_error("decrement-underflow"); return u3_cm_error("decrement-underflow");
} }
else { else {
if ( u3_so(u3_ca_is_cat(a)) ) { if ( _(u3_ca_is_cat(a)) ) {
return a - 1; return a - 1;
} }
else { else {
@ -38,8 +38,8 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

8
j/1/div.c
View File

@ -15,7 +15,7 @@
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) {
return a / b; return a / b;
} }
else { else {
@ -36,9 +36,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

12
j/1/gte.c
View File

@ -10,8 +10,8 @@
u3_noun u3_noun
u3_cqa_gte(u3_atom a, u3_atom b) u3_cqa_gte(u3_atom a, u3_atom b)
{ {
if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) {
return u3_say(a >= b); return __(a >= b);
} }
else { else {
mpz_t a_mp, b_mp; mpz_t a_mp, b_mp;
@ -20,7 +20,7 @@
u3_cr_mp(a_mp, a); u3_cr_mp(a_mp, a);
u3_cr_mp(b_mp, b); u3_cr_mp(b_mp, b);
cmp = (mpz_cmp(a_mp, b_mp) >= 0) ? u3_yes : u3_no; cmp = (mpz_cmp(a_mp, b_mp) >= 0) ? c3y : c3n;
mpz_clear(a_mp); mpz_clear(a_mp);
mpz_clear(b_mp); mpz_clear(b_mp);
@ -34,9 +34,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

12
j/1/gth.c
View File

@ -11,8 +11,8 @@
u3_cqa_gth(u3_atom a, u3_cqa_gth(u3_atom a,
u3_atom b) u3_atom b)
{ {
if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) {
return u3_say(a > b); return __(a > b);
} }
else { else {
mpz_t a_mp, b_mp; mpz_t a_mp, b_mp;
@ -21,7 +21,7 @@
u3_cr_mp(a_mp, a); u3_cr_mp(a_mp, a);
u3_cr_mp(b_mp, b); u3_cr_mp(b_mp, b);
cmp = (mpz_cmp(a_mp, b_mp) > 0) ? u3_yes : u3_no; cmp = (mpz_cmp(a_mp, b_mp) > 0) ? c3y : c3n;
mpz_clear(a_mp); mpz_clear(a_mp);
mpz_clear(b_mp); mpz_clear(b_mp);
@ -34,9 +34,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

12
j/1/lte.c
View File

@ -10,8 +10,8 @@
u3_noun u3_noun
u3_cqa_lte(u3_atom a, u3_atom b) u3_cqa_lte(u3_atom a, u3_atom b)
{ {
if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) {
return u3_say(a <= b); return __(a <= b);
} }
else { else {
mpz_t a_mp, b_mp; mpz_t a_mp, b_mp;
@ -20,7 +20,7 @@
u3_cr_mp(a_mp, a); u3_cr_mp(a_mp, a);
u3_cr_mp(b_mp, b); u3_cr_mp(b_mp, b);
cmp = (mpz_cmp(a_mp, b_mp) <= 0) ? u3_yes : u3_no; cmp = (mpz_cmp(a_mp, b_mp) <= 0) ? c3y : c3n;
mpz_clear(a_mp); mpz_clear(a_mp);
mpz_clear(b_mp); mpz_clear(b_mp);
@ -33,9 +33,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

12
j/1/lth.c
View File

@ -11,8 +11,8 @@
u3_cqa_lth(u3_atom a, u3_cqa_lth(u3_atom a,
u3_atom b) u3_atom b)
{ {
if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) {
return u3_say(a < b); return __(a < b);
} }
else { else {
mpz_t a_mp, b_mp; mpz_t a_mp, b_mp;
@ -21,7 +21,7 @@
u3_cr_mp(a_mp, a); u3_cr_mp(a_mp, a);
u3_cr_mp(b_mp, b); u3_cr_mp(b_mp, b);
cmp = (mpz_cmp(a_mp, b_mp) < 0) ? u3_yes : u3_no; cmp = (mpz_cmp(a_mp, b_mp) < 0) ? c3y : c3n;
mpz_clear(a_mp); mpz_clear(a_mp);
mpz_clear(b_mp); mpz_clear(b_mp);
@ -34,9 +34,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

6
j/1/mod.c
View File

@ -32,9 +32,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

8
j/1/mul.c
View File

@ -11,7 +11,7 @@
u3_cqa_mul(u3_atom a, u3_cqa_mul(u3_atom a,
u3_atom b) u3_atom b)
{ {
if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) {
c3_d c = ((c3_d) a) * ((c3_d) b); c3_d c = ((c3_d) a) * ((c3_d) b);
return u3_ci_chubs(1, &c); return u3_ci_chubs(1, &c);
@ -33,9 +33,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

8
j/1/sub.c
View File

@ -10,7 +10,7 @@
u3_noun u3_noun
u3_cqa_sub(u3_atom a, u3_atom b) u3_cqa_sub(u3_atom a, u3_atom b)
{ {
if ( u3_so(u3_ca_is_cat(a)) && u3_so(u3_ca_is_cat(b)) ) { if ( _(u3_ca_is_cat(a)) && _(u3_ca_is_cat(b)) ) {
if ( a < b ) { if ( a < b ) {
return u3_cm_error("subtract-underflow"); return u3_cm_error("subtract-underflow");
} }
@ -40,9 +40,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

2
j/2/bind.c
View File

@ -24,7 +24,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_bind(a, b); return u3_cqb_bind(a, b);

2
j/2/clap.c
View File

@ -27,7 +27,7 @@
{ {
u3_noun a, b, c; u3_noun a, b, c;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a,
u3_cv_sam_6, &b, u3_cv_sam_6, &b,
u3_cv_sam_7, &c, 0) ) { u3_cv_sam_7, &c, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);

4
j/2/drop.c
View File

@ -22,8 +22,8 @@
{ {
u3_noun a; u3_noun a;
if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) {
return u3_none; return c3nne;
} else { } else {
return u3_cqb_drop(a); return u3_cqb_drop(a);
} }

4
j/2/flop.c
View File

@ -16,7 +16,7 @@
if ( u3_nul == a ) { if ( u3_nul == a ) {
return b; return b;
} }
else if ( u3_no == u3du(a) ) { else if ( c3n == u3du(a) ) {
u3z(b); u3z(b);
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
@ -32,7 +32,7 @@
{ {
u3_noun a; u3_noun a;
if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_flop(a); return u3_cqb_flop(a);

4
j/2/lent.c
View File

@ -16,7 +16,7 @@
if ( 0 == a ) { if ( 0 == a ) {
return len; return len;
} }
else if ( u3_no == u3du(a) ) { else if ( c3n == u3du(a) ) {
u3z(len); u3z(len);
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -31,7 +31,7 @@
{ {
u3_noun a; u3_noun a;
if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_lent(a); return u3_cqb_lent(a);

10
j/2/levy.c
View File

@ -13,16 +13,16 @@
u3_noun b) u3_noun b)
{ {
if ( 0 == a ) { if ( 0 == a ) {
return u3_yes; return c3y;
} else { } else {
u3_noun loz; u3_noun loz;
if ( u3_no == u3du(a) ) { if ( c3n == u3du(a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else switch ( (loz = u3_cn_slam_on(u3k(b), u3k(u3h(a)))) ) { else switch ( (loz = u3_cn_slam_on(u3k(b), u3k(u3h(a)))) ) {
case u3_yes: return u3_cqb_levy(u3t(a), b); case c3y: return u3_cqb_levy(u3t(a), b);
case u3_no: return u3_no; case c3n: return c3n;
default: u3z(loz); default: u3z(loz);
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -34,7 +34,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_levy(a, b); return u3_cqb_levy(a, b);

10
j/2/lien.c
View File

@ -12,16 +12,16 @@
u3_noun b) u3_noun b)
{ {
if ( 0 == a ) { if ( 0 == a ) {
return u3_no; return c3n;
} else { } else {
u3_noun loz; u3_noun loz;
if ( u3_no == u3du(a) ) { if ( c3n == u3du(a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else switch ( (loz = u3_cn_slam_on(u3k(b), u3k(u3h(a)))) ) { else switch ( (loz = u3_cn_slam_on(u3k(b), u3k(u3h(a)))) ) {
case u3_yes: return u3_yes; case c3y: return c3y;
case u3_no: return u3_cqb_lien(u3t(a), b); case c3n: return u3_cqb_lien(u3t(a), b);
default: u3z(loz); default: u3z(loz);
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -32,7 +32,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_lien(a, b); return u3_cqb_lien(a, b);

2
j/2/need.c
View File

@ -24,7 +24,7 @@
{ {
u3_noun a; u3_noun a;
if ( u3_none == (a = u3_cr_at(u3_cv_sam, cor)) ) { if ( c3nne == (a = u3_cr_at(u3_cv_sam, cor)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_need(a); return u3_cqb_need(a);

4
j/2/reel.c
View File

@ -15,7 +15,7 @@
if ( 0 == a ) { if ( 0 == a ) {
return u3k(u3_cr_at(u3_cv_sam_3, b)); return u3k(u3_cr_at(u3_cv_sam_3, b));
} }
else if ( u3_no == u3du(a) ) { else if ( c3n == u3du(a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -31,7 +31,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_reel(a, b); return u3_cqb_reel(a, b);

6
j/2/roll.c
View File

@ -14,7 +14,7 @@
if ( 0 == a ) { if ( 0 == a ) {
return u3k(u3_cr_at(u3_cv_sam_3, b)); return u3k(u3_cr_at(u3_cv_sam_3, b));
} }
else if ( u3_no == u3du(a) ) { else if ( c3n == u3du(a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -23,7 +23,7 @@
u3_noun daz = u3_cn_slam_on(u3k(b), u3nc(gim, zor)); u3_noun daz = u3_cn_slam_on(u3k(b), u3nc(gim, zor));
u3_noun vel = u3_ci_molt(u3k(b), u3_cv_sam_3, daz, 0); u3_noun vel = u3_ci_molt(u3k(b), u3_cv_sam_3, daz, 0);
if ( u3_none == vel ) { if ( c3nne == vel ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
u3_noun hox = u3_cqb_roll(u3t(a), vel); u3_noun hox = u3_cqb_roll(u3t(a), vel);
@ -38,7 +38,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_roll(a, b); return u3_cqb_roll(a, b);

8
j/2/scag.c
View File

@ -12,7 +12,7 @@
u3_atom a, u3_atom a,
u3_noun b) u3_noun b)
{ {
if ( u3_ne(u3_ca_is_cat(a)) ) { if ( !_(u3_ca_is_cat(a)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
@ -23,7 +23,7 @@
return u3_nul; return u3_nul;
while ( i_w ) { while ( i_w ) {
if ( u3_no == u3du(b) ) { if ( c3n == u3du(b) ) {
return u3_nul; return u3_nul;
} }
acc = u3_ci_cell( u3h(b), acc ); acc = u3_ci_cell( u3h(b), acc );
@ -41,8 +41,8 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

8
j/2/skim.c
View File

@ -15,15 +15,15 @@
if ( 0 == a ) { if ( 0 == a ) {
return a; return a;
} }
else if ( u3_no == u3du(a) ) { else if ( c3n == u3du(a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a))); u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a)));
u3_noun vyr = u3_cqb_skim(u3t(a), b); u3_noun vyr = u3_cqb_skim(u3t(a), b);
switch ( hoz ) { switch ( hoz ) {
case u3_yes: return u3nc(u3k(u3h(a)), vyr); case c3y: return u3nc(u3k(u3h(a)), vyr);
case u3_no: return vyr; case c3n: return vyr;
default: u3z(hoz); default: u3z(hoz);
u3z(vyr); u3z(vyr);
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
@ -36,7 +36,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_skim(a, b); return u3_cqb_skim(a, b);

14
j/2/skip.c
View File

@ -15,18 +15,18 @@
if ( 0 == a ) { if ( 0 == a ) {
return a; return a;
} }
else if ( u3_no == u3du(a) ) { else if ( c3n == u3du(a) ) {
return u3_none; return c3nne;
} else { } else {
u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a))); u3_noun hoz = u3_cn_slam_on(u3k(b), u3k(u3h(a)));
u3_noun vyr = u3_cqb_skip(u3t(a), b); u3_noun vyr = u3_cqb_skip(u3t(a), b);
switch ( hoz ) { switch ( hoz ) {
case u3_yes: return vyr; case c3y: return vyr;
case u3_no: return u3nc(u3k(u3h(a)), vyr); case c3n: return u3nc(u3k(u3h(a)), vyr);
default: u3z(hoz); default: u3z(hoz);
u3z(vyr); u3z(vyr);
return u3_none; return c3nne;
} }
} }
} }
@ -36,8 +36,8 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_none; return c3nne;
} else { } else {
return u3_cqb_skip(a, b); return u3_cqb_skip(a, b);
} }

8
j/2/slag.c
View File

@ -10,14 +10,14 @@
u3_noun u3_noun
u3_cqb_slag(u3_atom a, u3_noun b) u3_cqb_slag(u3_atom a, u3_noun b)
{ {
if ( u3_ne(u3_ca_is_cat(a)) ) { if ( !_(u3_ca_is_cat(a)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
c3_w len_w = a; c3_w len_w = a;
while ( len_w ) { while ( len_w ) {
if ( u3_no == u3du(b) ) { if ( c3n == u3du(b) ) {
return u3_nul; return u3_nul;
} }
b = u3t(b); b = u3t(b);
@ -31,8 +31,8 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

10
j/2/snag.c
View File

@ -11,20 +11,20 @@
u3_cqb_snag(u3_atom a, u3_cqb_snag(u3_atom a,
u3_noun b) u3_noun b)
{ {
if ( u3_ne(u3_ca_is_cat(a)) ) { if ( !_(u3_ca_is_cat(a)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
c3_w len_w = a; c3_w len_w = a;
while ( len_w ) { while ( len_w ) {
if ( u3_no == u3du(b) ) { if ( c3n == u3du(b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
b = u3t(b); b = u3t(b);
len_w--; len_w--;
} }
if ( u3_no == u3du(b) ) { if ( c3n == u3du(b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
return u3k(u3h(b)); return u3k(u3h(b));
@ -35,8 +35,8 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

2
j/2/sort.c
View File

@ -22,7 +22,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_sort(a, b); return u3_cqb_sort(a, b);

4
j/2/turn.c
View File

@ -13,7 +13,7 @@
if ( 0 == a ) { if ( 0 == a ) {
return a; return a;
} }
else if ( u3_no == u3du(a) ) { else if ( c3n == u3du(a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -28,7 +28,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_turn(a, b); return u3_cqb_turn(a, b);

4
j/2/weld.c
View File

@ -14,7 +14,7 @@
if ( 0 == a ) { if ( 0 == a ) {
return u3k(b); return u3k(b);
} }
else if ( u3_no == u3du(a) ) { else if ( c3n == u3du(a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -26,7 +26,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqb_weld(a, b); return u3_cqb_weld(a, b);

6
j/3/bex.c
View File

@ -12,7 +12,7 @@
{ {
mpz_t a_mp; mpz_t a_mp;
if ( u3_ne(u3_ca_is_cat(a)) ) { if ( !_(u3_ca_is_cat(a)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
@ -28,8 +28,8 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

14
j/3/can.c
View File

@ -11,7 +11,7 @@
u3_cqc_can(u3_atom a, u3_cqc_can(u3_atom a,
u3_noun b) u3_noun b)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
@ -30,13 +30,13 @@
if ( 0 == cab ) { if ( 0 == cab ) {
break; break;
} }
if ( u3_no == u3du(cab) ) return u3_cm_bail(c3__fail); if ( c3n == u3du(cab) ) return u3_cm_bail(c3__fail);
i_cab = u3h(cab); i_cab = u3h(cab);
if ( u3_no == u3du(i_cab) ) return u3_cm_bail(c3__fail); if ( c3n == u3du(i_cab) ) return u3_cm_bail(c3__fail);
pi_cab = u3h(i_cab); pi_cab = u3h(i_cab);
qi_cab = u3t(i_cab); qi_cab = u3t(i_cab);
if ( u3_no == u3_ca_is_cat(pi_cab) ) return u3_cm_bail(c3__fail); if ( c3n == u3_ca_is_cat(pi_cab) ) return u3_cm_bail(c3__fail);
if ( u3_no == u3ud(qi_cab) ) return u3_cm_bail(c3__fail); if ( c3n == u3ud(qi_cab) ) return u3_cm_bail(c3__fail);
if ( (tot_w + pi_cab) < tot_w ) return u3_cm_bail(c3__fail); if ( (tot_w + pi_cab) < tot_w ) return u3_cm_bail(c3__fail);
tot_w += pi_cab; tot_w += pi_cab;
@ -74,8 +74,8 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {

4
j/3/cap.c
View File

@ -28,8 +28,8 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

10
j/3/cat.c
View File

@ -12,7 +12,7 @@
u3_atom b, u3_atom b,
u3_atom c) u3_atom c)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
@ -44,12 +44,12 @@
{ {
u3_noun a, b, c; u3_noun a, b, c;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a,
u3_cv_sam_6, &b, u3_cv_sam_6, &b,
u3_cv_sam_7, &c, 0)) || u3_cv_sam_7, &c, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) || (c3n == u3ud(b)) ||
(u3_no == u3ud(c)) ) (c3n == u3ud(c)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

6
j/3/con.c
View File

@ -41,9 +41,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

16
j/3/cut.c
View File

@ -14,13 +14,13 @@
u3_atom c, u3_atom c,
u3_atom d) u3_atom d)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
if ( u3_ne(u3_ca_is_cat(b)) ) { if ( !_(u3_ca_is_cat(b)) ) {
return 0; return 0;
} }
if ( u3_ne(u3_ca_is_cat(c)) ) { if ( !_(u3_ca_is_cat(c)) ) {
c = 0x7fffffff; c = 0x7fffffff;
} }
@ -57,14 +57,14 @@
{ {
u3_noun a, b, c, d; u3_noun a, b, c, d;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a,
u3_cv_sam_12, &b, u3_cv_sam_12, &b,
u3_cv_sam_13, &c, u3_cv_sam_13, &c,
u3_cv_sam_7, &d, 0)) || u3_cv_sam_7, &d, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) || (c3n == u3ud(b)) ||
(u3_no == u3ud(c)) || (c3n == u3ud(c)) ||
(u3_no == u3ud(d)) ) (c3n == u3ud(d)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

6
j/3/dis.c
View File

@ -40,9 +40,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

18
j/3/dor.c
View File

@ -12,24 +12,24 @@
u3_atom a, u3_atom a,
u3_atom b) u3_atom b)
{ {
if ( u3_yes == u3_cr_sing(a, b) ) { if ( c3y == u3_cr_sing(a, b) ) {
return u3_yes; return c3y;
} }
else { else {
if ( u3_yes == u3ud(a) ) { if ( c3y == u3ud(a) ) {
if ( u3_yes == u3ud(b) ) { if ( c3y == u3ud(b) ) {
return u3_cqa_lth(a, b); return u3_cqa_lth(a, b);
} }
else { else {
return u3_yes; return c3y;
} }
} }
else { else {
if ( u3_yes == u3ud(b) ) { if ( c3y == u3ud(b) ) {
return u3_no; return c3n;
} }
else { else {
if ( u3_yes == u3_cr_sing(u3h(a), u3h(b)) ) { if ( c3y == u3_cr_sing(u3h(a), u3h(b)) ) {
return u3_cqc_dor(u3t(a), u3t(b)); return u3_cqc_dor(u3t(a), u3t(b));
} }
else return u3_cqc_dor(u3h(a), u3h(b)); else return u3_cqc_dor(u3h(a), u3h(b));
@ -43,7 +43,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqc_dor(a, b); return u3_cqc_dor(a, b);

12
j/3/end.c
View File

@ -13,10 +13,10 @@
u3_atom b, u3_atom b,
u3_atom c) u3_atom c)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else if ( u3_ne(u3_ca_is_cat(b)) ) { else if ( !_(u3_ca_is_cat(b)) ) {
return u3k(c); return u3k(c);
} }
else { else {
@ -48,12 +48,12 @@
{ {
u3_noun a, b, c; u3_noun a, b, c;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a,
u3_cv_sam_6, &b, u3_cv_sam_6, &b,
u3_cv_sam_7, &c, 0)) || u3_cv_sam_7, &c, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) || (c3n == u3ud(b)) ||
(u3_no == u3ud(c)) ) (c3n == u3ud(c)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

4
j/3/gor.c
View File

@ -17,14 +17,14 @@
if ( c_w == d_w ) { if ( c_w == d_w ) {
return u3_cqc_dor(a, b); return u3_cqc_dor(a, b);
} }
else return (c_w < d_w) ? u3_yes : u3_no; else return (c_w < d_w) ? c3y : c3n;
} }
u3_noun u3_noun
u3_cwc_gor(u3_noun cor) u3_cwc_gor(u3_noun cor)
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqc_gor(a, b); return u3_cqc_gor(a, b);

14
j/3/hor.c
View File

@ -11,21 +11,21 @@
u3_cqc_hor(u3_noun a, u3_cqc_hor(u3_noun a,
u3_noun b) u3_noun b)
{ {
if ( u3_yes == u3ud(a) ) { if ( c3y == u3ud(a) ) {
if ( u3_yes == u3ud(b) ) { if ( c3y == u3ud(b) ) {
return u3_cqc_gor(a, b); return u3_cqc_gor(a, b);
} else { } else {
return u3_yes; return c3y;
} }
} else { } else {
if ( u3_yes == u3ud(b) ) { if ( c3y == u3ud(b) ) {
return u3_no; return c3n;
} }
else { else {
u3_noun h_a = u3h(a); u3_noun h_a = u3h(a);
u3_noun h_b = u3h(b); u3_noun h_b = u3h(b);
if ( u3_yes == u3_cr_sing(h_a, h_b) ) { if ( c3y == u3_cr_sing(h_a, h_b) ) {
return u3_cqc_gor(u3t(a), u3t(b)); return u3_cqc_gor(u3t(a), u3t(b));
} else { } else {
return u3_cqc_gor(h_a, h_b); return u3_cqc_gor(h_a, h_b);
@ -38,7 +38,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqc_hor(a, b); return u3_cqc_hor(a, b);

12
j/3/lsh.c
View File

@ -10,10 +10,10 @@
u3_noun u3_noun
u3_cqc_lsh(u3_atom a, u3_atom b, u3_atom c) u3_cqc_lsh(u3_atom a, u3_atom b, u3_atom c)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else if ( u3_ne(u3_ca_is_cat(b)) ) { else if ( !_(u3_ca_is_cat(b)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
@ -45,12 +45,12 @@
{ {
u3_noun a, b, c; u3_noun a, b, c;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a,
u3_cv_sam_6, &b, u3_cv_sam_6, &b,
u3_cv_sam_7, &c, 0)) || u3_cv_sam_7, &c, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) || (c3n == u3ud(b)) ||
(u3_no == u3ud(c)) ) (c3n == u3ud(c)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

4
j/3/mas.c
View File

@ -35,8 +35,8 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

10
j/3/met.c
View File

@ -12,7 +12,7 @@
u3_atom a, u3_atom a,
u3_atom b) u3_atom b)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
if ( 0 == b ) { if ( 0 == b ) {
return 0; return 0;
} else return 1; } else return 1;
@ -20,7 +20,7 @@
else { else {
c3_w met_w = u3_cr_met(a, b); c3_w met_w = u3_cr_met(a, b);
if ( u3_ne(u3_ca_is_cat(met_w)) ) { if ( !_(u3_ca_is_cat(met_w)) ) {
return u3_ci_words(1, &met_w); return u3_ci_words(1, &met_w);
} }
else return u3_cr_met(a, b); else return u3_cr_met(a, b);
@ -32,9 +32,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

6
j/3/mix.c
View File

@ -40,9 +40,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

2
j/3/mug.c
View File

@ -12,7 +12,7 @@
{ {
u3_noun sam; u3_noun sam;
if ( u3_none == (sam = u3_cr_at(u3_cv_sam, cor)) ) { if ( c3nne == (sam = u3_cr_at(u3_cv_sam, cor)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cr_mug(sam); return u3_cr_mug(sam);

6
j/3/peg.c
View File

@ -35,9 +35,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) || (c3n == u3ud(b)) ||
(0 == a) || (0 == a) ||
(0 == b) ) (0 == b) )
{ {

34
j/3/po.c
View File

@ -10,7 +10,7 @@
static u3_noun static u3_noun
_po_find(u3_noun buf, u3_noun a) _po_find(u3_noun buf, u3_noun a)
{ {
if ( u3_ne(u3_ca_is_cat(a)) ) { if ( !_(u3_ca_is_cat(a)) ) {
return u3_nul; return u3_nul;
} }
else { else {
@ -38,10 +38,10 @@
{ {
u3_noun x, a, buf; u3_noun x, a, buf;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) ||
(u3_no == u3du(x)) || (c3n == u3du(x)) ||
(u3_no == u3ud(buf = u3h(x))) || (c3n == u3ud(buf = u3h(x))) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
@ -54,10 +54,10 @@
{ {
u3_noun x, a, buf; u3_noun x, a, buf;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) ||
(u3_no == u3du(x)) || (c3n == u3du(x)) ||
(u3_no == u3ud(buf = u3t(x))) || (c3n == u3ud(buf = u3t(x))) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
@ -71,10 +71,10 @@
{ {
u3_noun x, a, buf; u3_noun x, a, buf;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) ||
(u3_no == u3du(x)) || (c3n == u3du(x)) ||
(u3_no == u3ud(buf = u3h(x))) || (c3n == u3ud(buf = u3h(x))) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(a >= 256) ) (a >= 256) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
@ -92,10 +92,10 @@
{ {
u3_noun x, a, buf; u3_noun x, a, buf;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &a, u3_cv_con_sam, &x, 0)) ||
(u3_no == u3du(x)) || (c3n == u3du(x)) ||
(u3_no == u3ud(buf = u3t(x))) || (c3n == u3ud(buf = u3t(x))) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(a >= 256) ) (a >= 256) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);

10
j/3/rap.c
View File

@ -11,7 +11,7 @@
u3_cqc_rap(u3_atom a, u3_cqc_rap(u3_atom a,
u3_noun b) u3_noun b)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -31,10 +31,10 @@
if ( 0 == cab ) { if ( 0 == cab ) {
break; break;
} }
else if ( u3_no == u3du(cab) ) { else if ( c3n == u3du(cab) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3ud(h_cab = u3h(cab)) ) { else if ( c3n == u3ud(h_cab = u3h(cab)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( (tot_w + (len_w = u3_cr_met(a_g, h_cab))) < tot_w ) { else if ( (tot_w + (len_w = u3_cr_met(a_g, h_cab))) < tot_w ) {
@ -75,8 +75,8 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

8
j/3/rip.c
View File

@ -11,7 +11,7 @@
u3_cqc_rip(u3_atom a, u3_cqc_rip(u3_atom a,
u3_atom b) u3_atom b)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
@ -73,9 +73,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

12
j/3/rsh.c
View File

@ -13,10 +13,10 @@
u3_atom b, u3_atom b,
u3_atom c) u3_atom c)
{ {
if ( u3_ne(u3_ca_is_cat(a)) || (a >= 32) ) { if ( !_(u3_ca_is_cat(a)) || (a >= 32) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else if ( u3_ne(u3_ca_is_cat(b)) ) { else if ( !_(u3_ca_is_cat(b)) ) {
return 0; return 0;
} }
else { else {
@ -46,12 +46,12 @@
{ {
u3_noun a, b, c; u3_noun a, b, c;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a,
u3_cv_sam_6, &b, u3_cv_sam_6, &b,
u3_cv_sam_7, &c, 0)) || u3_cv_sam_7, &c, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) || (c3n == u3ud(b)) ||
(u3_no == u3ud(c)) ) (c3n == u3ud(c)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {

4
j/3/vor.c
View File

@ -17,14 +17,14 @@
if ( c_w == d_w ) { if ( c_w == d_w ) {
return u3_cqc_dor(a, b); return u3_cqc_dor(a, b);
} }
else return (c_w < d_w) ? u3_yes : u3_no; else return (c_w < d_w) ? c3y : c3n;
} }
u3_noun u3_noun
u3_cwc_vor(u3_noun cor) u3_cwc_vor(u3_noun cor)
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) { if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqc_vor(a, b); return u3_cqc_vor(a, b);

10
j/4/by_gas.c
View File

@ -16,20 +16,20 @@
return u3k(a); return u3k(a);
} }
else { else {
if ( u3_no == u3du(b) ) { if ( c3n == u3du(b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
u3_noun i_b = u3h(b); u3_noun i_b = u3h(b);
u3_noun t_b = u3t(b); u3_noun t_b = u3t(b);
if ( u3_no == u3du(i_b) ) { if ( c3n == u3du(i_b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
u3_noun pi_b = u3h(i_b); u3_noun pi_b = u3h(i_b);
u3_noun qi_b = u3t(i_b); u3_noun qi_b = u3t(i_b);
u3_noun c; u3_noun c;
if ( u3_none == (c = u3_cqdb_put(a, pi_b, qi_b)) ) { if ( c3nne == (c = u3_cqdb_put(a, pi_b, qi_b)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
u3_noun d = u3_cqdb_gas(c, t_b); u3_noun d = u3_cqdb_gas(c, t_b);
@ -47,7 +47,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdb_gas(a, b); return u3_cqdb_gas(a, b);
@ -59,7 +59,7 @@
u3_weak c = u3_cqdb_gas(a, b); u3_weak c = u3_cqdb_gas(a, b);
u3z(a); u3z(b); u3z(a); u3z(b);
if ( u3_none == c ) { if ( c3nne == c ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else return c; else return c;

16
j/4/by_get.c
View File

@ -17,17 +17,17 @@
u3_noun l_a, n_a, r_a; u3_noun l_a, n_a, r_a;
u3_noun pn_a, qn_a; u3_noun pn_a, qn_a;
if ( (u3_no == u3_cr_trel(a, &n_a, &l_a, &r_a)) || if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) ||
(u3_no == u3_cr_cell(n_a, &pn_a, &qn_a) ) ) (c3n == u3_cr_cell(n_a, &pn_a, &qn_a) ) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
if ( (u3_yes == u3_cr_sing(b, pn_a)) ) { if ( (c3y == u3_cr_sing(b, pn_a)) ) {
return u3nc(u3_nul, u3k(qn_a)); return u3nc(u3_nul, u3k(qn_a));
} }
else { else {
if ( u3_yes == u3_cqc_gor(b, pn_a) ) { if ( c3y == u3_cqc_gor(b, pn_a) ) {
return u3_cqdb_get(l_a, b); return u3_cqdb_get(l_a, b);
} }
else return u3_cqdb_get(r_a, b); else return u3_cqdb_get(r_a, b);
@ -41,7 +41,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdb_get(a, b); return u3_cqdb_get(a, b);
@ -53,9 +53,9 @@
u3_noun c = u3_cqdb_get(a, b); u3_noun c = u3_cqdb_get(a, b);
u3z(a); u3z(b); u3z(a); u3z(b);
if ( u3_no == u3_cr_du(c) ) { if ( c3n == u3_cr_du(c) ) {
u3z(c); u3z(c);
return u3_none; return c3nne;
} else { } else {
u3_noun pro = u3k(u3t(c)); u3_noun pro = u3k(u3t(c));
@ -68,7 +68,7 @@
{ {
u3_weak c = u3_ckdb_get(a, b); u3_weak c = u3_ckdb_get(a, b);
if ( u3_none == c ) { if ( c3nne == c ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else return c; else return c;

16
j/4/by_has.c
View File

@ -13,23 +13,23 @@
u3_noun b) u3_noun b)
{ {
if ( u3_nul == a ) { if ( u3_nul == a ) {
return u3_no; return c3n;
} }
else { else {
u3_noun l_a, n_a, r_a; u3_noun l_a, n_a, r_a;
u3_noun pn_a, qn_a; u3_noun pn_a, qn_a;
if ( (u3_no == u3_cr_trel(a, &n_a, &l_a, &r_a)) || if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) ||
(u3_no == u3_cr_cell(n_a, &pn_a, &qn_a)) ) (c3n == u3_cr_cell(n_a, &pn_a, &qn_a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
if ( (u3_yes == u3_cr_sing(b, pn_a)) ) { if ( (c3y == u3_cr_sing(b, pn_a)) ) {
return u3_yes; return c3y;
} }
else { else {
if ( u3_yes == u3_cqc_gor(b, pn_a) ) { if ( c3y == u3_cqc_gor(b, pn_a) ) {
return u3_cqdb_has(l_a, b); return u3_cqdb_has(l_a, b);
} }
else return u3_cqdb_has(r_a, b); else return u3_cqdb_has(r_a, b);
@ -43,7 +43,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdb_has(a, b); return u3_cqdb_has(a, b);
@ -55,7 +55,7 @@
u3_weak c = u3_cqdb_has(a, b); u3_weak c = u3_cqdb_has(a, b);
u3z(a); u3z(b); u3z(a); u3z(b);
if ( u3_none == c ) { if ( c3nne == c ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else return c; else return c;

24
j/4/by_int.c
View File

@ -22,33 +22,33 @@
u3_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a; u3_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a;
u3_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b; u3_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b;
if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(n_a, &p_n_a, &q_n_a) ) { else if ( c3n == u3_cr_cell(n_a, &p_n_a, &q_n_a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(n_b, &p_n_b, &q_n_b) ) { else if ( c3n == u3_cr_cell(n_b, &p_n_b, &q_n_b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_yes == u3_cqc_vor(p_n_a, p_n_b) ) { else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) {
if ( u3_yes == u3_cr_sing(p_n_a, p_n_b) ) { if ( c3y == u3_cr_sing(p_n_a, p_n_b) ) {
return u3nt( return u3nt(
u3k(n_b), u3k(n_b),
u3_cqdb_int(u3k(l_a), u3k(l_b)), u3_cqdb_int(u3k(l_a), u3k(l_b)),
u3_cqdb_int(u3k(r_a), u3k(r_b))); u3_cqdb_int(u3k(r_a), u3k(r_b)));
} }
else if ( u3_yes == u3_cqc_hor(p_n_b, p_n_a) ) { else if ( c3y == u3_cqc_hor(p_n_b, p_n_a) ) {
return u3_cqdb_uni( return u3_cqdb_uni(
u3_cqdb_int( u3_cqdb_int(
@ -75,14 +75,14 @@
u3k(l_b))); u3k(l_b)));
} }
} }
else if ( u3_yes == u3_cr_sing(p_n_b, p_n_a) ) { else if ( c3y == u3_cr_sing(p_n_b, p_n_a) ) {
return u3nt( return u3nt(
u3k(n_b), u3k(n_b),
u3_cqdb_int(u3k(l_b), u3k(l_a)), u3_cqdb_int(u3k(l_b), u3k(l_a)),
u3_cqdb_int(u3k(r_b), u3k(r_a))); u3_cqdb_int(u3k(r_b), u3k(r_a)));
} }
else if ( u3_yes == u3_cqc_hor(p_n_a, p_n_b) ) { else if ( c3y == u3_cqc_hor(p_n_a, p_n_b) ) {
return u3_cqdb_uni( return u3_cqdb_uni(
u3_cqdb_int( u3_cqdb_int(
@ -116,7 +116,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdb_int(a, b); return u3_cqdb_int(a, b);

16
j/4/by_put.c
View File

@ -24,13 +24,13 @@
u3_noun l_a, n_a, r_a, pn_a, qn_a; u3_noun l_a, n_a, r_a, pn_a, qn_a;
u3_noun d, l_d, n_d, r_d; u3_noun d, l_d, n_d, r_d;
if ( (u3_no == u3_cr_trel(a, &n_a, &l_a, &r_a)) || if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) ||
(u3_no == u3_cr_cell(n_a, &pn_a, &qn_a)) ) (c3n == u3_cr_cell(n_a, &pn_a, &qn_a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_yes == u3_cr_sing(pn_a, b) ) { else if ( c3y == u3_cr_sing(pn_a, b) ) {
if ( u3_yes == u3_cr_sing(qn_a, c) ) { if ( c3y == u3_cr_sing(qn_a, c) ) {
return u3k(a); return u3k(a);
} else { } else {
return u3nt return u3nt
@ -40,10 +40,10 @@
} }
} }
else { else {
if ( u3_yes == u3_cqc_gor(b, pn_a) ) { if ( c3y == u3_cqc_gor(b, pn_a) ) {
d = u3_cqdb_put(l_a, b, c); d = u3_cqdb_put(l_a, b, c);
if ( u3_yes == u3_cqc_vor(pn_a, u3h(u3h(d))) ) { if ( c3y == u3_cqc_vor(pn_a, u3h(u3h(d))) ) {
return u3nt(u3k(n_a), return u3nt(u3k(n_a),
d, d,
u3k(r_a)); u3k(r_a));
@ -67,7 +67,7 @@
else { else {
d = u3_cqdb_put(r_a, b, c); d = u3_cqdb_put(r_a, b, c);
if ( u3_yes == u3_cqc_vor(pn_a, u3h(u3h(d))) ) { if ( c3y == u3_cqc_vor(pn_a, u3h(u3h(d))) ) {
return u3nt(u3k(n_a), return u3nt(u3k(n_a),
u3k(l_a), u3k(l_a),
d); d);
@ -97,7 +97,7 @@
{ {
u3_noun a, b, c; u3_noun a, b, c;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &b, if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &b,
u3_cv_sam_3, &c, u3_cv_sam_3, &c,
u3_cv_con_sam, &a, 0) ) { u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);

24
j/4/by_uni.c
View File

@ -22,33 +22,33 @@
u3_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a; u3_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a;
u3_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b; u3_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b;
if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( (u3_no == u3_cr_cell(n_a, &p_n_a, &q_n_a)) ) { else if ( (c3n == u3_cr_cell(n_a, &p_n_a, &q_n_a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( (u3_no == u3_cr_cell(n_b, &p_n_b, &q_n_b)) ) { else if ( (c3n == u3_cr_cell(n_b, &p_n_b, &q_n_b)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_yes == u3_cqc_vor(p_n_a, p_n_b) ) { else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) {
if ( u3_yes == u3_cr_sing(p_n_a, p_n_b) ) { if ( c3y == u3_cr_sing(p_n_a, p_n_b) ) {
return u3nt(u3k(n_b), return u3nt(u3k(n_b),
u3_cqdb_uni( u3_cqdb_uni(
u3k(l_a), u3k(l_b)), u3k(l_a), u3k(l_b)),
u3_cqdb_uni( u3_cqdb_uni(
u3k(r_a), u3k(r_b))); u3k(r_a), u3k(r_b)));
} }
else if ( u3_yes == u3_cqc_hor(p_n_b, p_n_a) ) { else if ( c3y == u3_cqc_hor(p_n_b, p_n_a) ) {
return u3_cqdb_uni( return u3_cqdb_uni(
u3nt( u3nt(
@ -77,14 +77,14 @@
u3k(l_b)); u3k(l_b));
} }
} }
else if ( u3_yes == u3_cr_sing(p_n_b, p_n_a) ) { else if ( c3y == u3_cr_sing(p_n_b, p_n_a) ) {
return u3nt( return u3nt(
u3k(n_b), u3k(n_b),
u3_cqdb_uni(u3k(r_b), u3k(r_a)), u3_cqdb_uni(u3k(r_b), u3k(r_a)),
u3_cqdb_uni(u3k(l_b), u3k(l_a))); u3_cqdb_uni(u3k(l_b), u3k(l_a)));
} }
else if ( u3_yes == u3_cqc_hor(p_n_a, p_n_b) ) { else if ( c3y == u3_cqc_hor(p_n_a, p_n_b) ) {
return u3_cqdb_uni( return u3_cqdb_uni(
u3k(r_a), u3k(r_a),
@ -120,7 +120,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdb_uni(a, b); return u3_cqdb_uni(a, b);

8
j/4/in_gas.c
View File

@ -16,14 +16,14 @@
return u3k(a); return u3k(a);
} }
else { else {
if ( u3_no == u3du(b) ) { if ( c3n == u3du(b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
u3_noun i_b = u3h(b); u3_noun i_b = u3h(b);
u3_noun t_b = u3t(b); u3_noun t_b = u3t(b);
u3_noun c; u3_noun c;
if ( u3_none == (c = u3_cqdi_put(a, i_b)) ) { if ( c3nne == (c = u3_cqdi_put(a, i_b)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
u3_noun d = u3_cqdi_gas(c, t_b); u3_noun d = u3_cqdi_gas(c, t_b);
@ -40,7 +40,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdi_gas(a, b); return u3_cqdi_gas(a, b);
@ -52,7 +52,7 @@
u3_weak c = u3_cqdi_gas(a, b); u3_weak c = u3_cqdi_gas(a, b);
u3z(a); u3z(b); u3z(a); u3z(b);
if ( u3_none == c ) { if ( c3nne == c ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else return c; else return c;

14
j/4/in_has.c
View File

@ -11,20 +11,20 @@
u3_cqdi_has(u3_noun a, u3_noun b) u3_cqdi_has(u3_noun a, u3_noun b)
{ {
if ( u3_nul == a ) { if ( u3_nul == a ) {
return u3_no; return c3n;
} }
else { else {
u3_noun l_a, n_a, r_a; u3_noun l_a, n_a, r_a;
if ( (u3_no == u3_cr_mean(a, 2, &n_a, 6, &l_a, 7, &r_a, 0)) ) { if ( (c3n == u3_cr_mean(a, 2, &n_a, 6, &l_a, 7, &r_a, 0)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
if ( (u3_yes == u3_cr_sing(b, n_a)) ) { if ( (c3y == u3_cr_sing(b, n_a)) ) {
return u3_yes; return c3y;
} }
else { else {
if ( u3_yes == u3_cqc_hor(b, n_a) ) { if ( c3y == u3_cqc_hor(b, n_a) ) {
return u3_cqdi_has(l_a, b); return u3_cqdi_has(l_a, b);
} }
else return u3_cqdi_has(r_a, b); else return u3_cqdi_has(r_a, b);
@ -37,7 +37,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdi_has(a, b); return u3_cqdi_has(a, b);
@ -49,7 +49,7 @@
u3_weak c = u3_cqdi_has(a, b); u3_weak c = u3_cqdi_has(a, b);
u3z(a); u3z(b); u3z(a); u3z(b);
if ( u3_none == c ) { if ( c3nne == c ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else return c; else return c;

16
j/4/in_int.c
View File

@ -23,30 +23,30 @@
u3_noun l_b, n_b, r_b, lr_b; u3_noun l_b, n_b, r_b, lr_b;
u3_noun c; u3_noun c;
if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
if ( u3_yes == u3_cqc_vor(n_b, n_a) ) { if ( c3y == u3_cqc_vor(n_b, n_a) ) {
c = a; a = b; b = c; c = a; a = b; b = c;
c = n_a; n_a = n_b; n_b = c; c = n_a; n_a = n_b; n_b = c;
c = lr_a; lr_a = lr_b; lr_b = c; c = lr_a; lr_a = lr_b; lr_b = c;
} }
if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_yes == u3_cr_sing(n_a, n_b) ) { else if ( c3y == u3_cr_sing(n_a, n_b) ) {
return u3nt(u3k(n_a), return u3nt(u3k(n_a),
u3_cqdi_int(l_a, l_b), u3_cqdi_int(l_a, l_b),
u3_cqdi_int(r_a, r_b)); u3_cqdi_int(r_a, r_b));
} }
else if ( u3_yes == u3_cqc_hor(n_b, n_a) ) { else if ( c3y == u3_cqc_hor(n_b, n_a) ) {
return u3_cqdi_uni( return u3_cqdi_uni(
u3_cqdi_int( u3_cqdi_int(
l_a, l_a,
@ -79,7 +79,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdi_int(a, b); return u3_cqdi_int(a, b);

16
j/4/in_mer.c
View File

@ -21,30 +21,30 @@
u3_noun l_b, n_b, r_b, lr_b; u3_noun l_b, n_b, r_b, lr_b;
u3_noun c; u3_noun c;
if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
if ( u3_yes == u3_cqc_vor(n_b, n_a) ) { if ( c3y == u3_cqc_vor(n_b, n_a) ) {
c = a; a = b; b = c; c = a; a = b; b = c;
c = n_a; n_a = n_b; n_b = c; c = n_a; n_a = n_b; n_b = c;
c = lr_a; lr_a = lr_b; lr_b = c; c = lr_a; lr_a = lr_b; lr_b = c;
} }
if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_yes == u3_cr_sing(n_a, n_b) ) { else if ( c3y == u3_cr_sing(n_a, n_b) ) {
return u3nt(u3k(n_a), return u3nt(u3k(n_a),
u3_cqdi_mer(l_a, l_b), u3_cqdi_mer(l_a, l_b),
u3_cqdi_mer(r_a, r_b)); u3_cqdi_mer(r_a, r_b));
} }
else if ( u3_yes == u3_cqc_hor(n_b, n_a) ) { else if ( c3y == u3_cqc_hor(n_b, n_a) ) {
return u3_cqdi_mer( return u3_cqdi_mer(
u3nt( u3nt(
n_a, n_a,
@ -79,7 +79,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {

14
j/4/in_put.c
View File

@ -19,20 +19,20 @@
u3_noun l_a, n_a, r_a, lr_a; // XX copy tree boilerplate to other pt4 u3_noun l_a, n_a, r_a, lr_a; // XX copy tree boilerplate to other pt4
u3_noun c, l_c, n_c, r_c; u3_noun c, l_c, n_c, r_c;
if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_yes == u3_cr_sing(n_a, b) ) { else if ( c3y == u3_cr_sing(n_a, b) ) {
return u3k(a); return u3k(a);
} }
else if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
if ( u3_yes == u3_cqc_hor(b, n_a) ) { if ( c3y == u3_cqc_hor(b, n_a) ) {
c = u3_cqdi_put(l_a, b); c = u3_cqdi_put(l_a, b);
if ( u3_yes == u3_cqc_vor(n_a, u3h(c)) ) { if ( c3y == u3_cqc_vor(n_a, u3h(c)) ) {
return u3nt(u3k(n_a), return u3nt(u3k(n_a),
c, c,
u3k(r_a)); u3k(r_a));
@ -56,7 +56,7 @@
else { else {
c = u3_cqdi_put(r_a, b); c = u3_cqdi_put(r_a, b);
if ( u3_yes == u3_cqc_vor(n_a, u3h(c)) ) { if ( c3y == u3_cqc_vor(n_a, u3h(c)) ) {
return u3nt(u3k(n_a), return u3nt(u3k(n_a),
u3k(l_a), u3k(l_a),
c); c);
@ -86,7 +86,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdi_put(a, b); return u3_cqdi_put(a, b);

6
j/4/in_tap.c
View File

@ -17,7 +17,7 @@
} else { } else {
u3_noun l_a, n_a, r_a; u3_noun l_a, n_a, r_a;
if ( (u3_no == u3_cr_trel(a, &n_a, &l_a, &r_a)) ) { if ( (c3n == u3_cr_trel(a, &n_a, &l_a, &r_a)) ) {
u3z(b); u3z(b);
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
@ -42,7 +42,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdi_tap(a, b); return u3_cqdi_tap(a, b);
@ -54,7 +54,7 @@
u3_weak c = u3_cqdi_tap(a, b); u3_weak c = u3_cqdi_tap(a, b);
u3z(a); u3z(b); u3z(a); u3z(b);
if ( u3_none == c ) { if ( c3nne == c ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else return c; else return c;

24
j/4/in_uni.c
View File

@ -22,28 +22,28 @@
u3_noun l_a, n_a, r_a, lr_a; u3_noun l_a, n_a, r_a, lr_a;
u3_noun l_b, n_b, r_b, lr_b; u3_noun l_b, n_b, r_b, lr_b;
if ( (u3_no == u3_cr_cell(a, &n_a, &lr_a)) ) { if ( (c3n == u3_cr_cell(a, &n_a, &lr_a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( (u3_no == u3_cr_cell(b, &n_b, &lr_b)) ) { else if ( (c3n == u3_cr_cell(b, &n_b, &lr_b)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
if ( u3_yes == u3_cqc_vor(n_a, n_b) ) { if ( c3y == u3_cqc_vor(n_a, n_b) ) {
if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_yes == u3_cr_sing(n_a, n_b) ) { else if ( c3y == u3_cr_sing(n_a, n_b) ) {
return u3nt( return u3nt(
u3k(n_b), u3k(n_b),
u3_cqdi_uni(u3k(l_a), u3k(l_b)), u3_cqdi_uni(u3k(l_a), u3k(l_b)),
u3_cqdi_uni(u3k(r_a), u3k(r_b))); u3_cqdi_uni(u3k(r_a), u3k(r_b)));
} }
else if ( u3_yes == u3_cqc_hor(n_b, n_a) ) { else if ( c3y == u3_cqc_hor(n_b, n_a) ) {
return u3_cqdi_uni( return u3_cqdi_uni(
u3nt( u3nt(
@ -72,20 +72,20 @@
u3k(l_b)); u3k(l_b));
} }
} }
else if ( u3_no == u3_cr_cell(lr_b, &l_b, &r_b) ) { else if ( c3n == u3_cr_cell(lr_b, &l_b, &r_b) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_no == u3_cr_cell(lr_a, &l_a, &r_a) ) { else if ( c3n == u3_cr_cell(lr_a, &l_a, &r_a) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else if ( u3_yes == u3_cr_sing(n_b, n_a) ) { else if ( c3y == u3_cr_sing(n_b, n_a) ) {
return u3nt( return u3nt(
u3k(n_b), u3k(n_b),
u3_cqdi_uni(u3k(r_b), u3k(r_a)), u3_cqdi_uni(u3k(r_b), u3k(r_a)),
u3_cqdi_uni(u3k(l_b), u3k(l_a))); u3_cqdi_uni(u3k(l_b), u3k(l_a)));
} }
else if ( u3_yes == u3_cqc_hor(n_a, n_b) ) { else if ( c3y == u3_cqc_hor(n_a, n_b) ) {
return u3_cqdi_uni( return u3_cqdi_uni(
u3k(r_a), u3k(r_a),
@ -122,7 +122,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqdi_uni(a, b); return u3_cqdi_uni(a, b);

12
j/5/aesc.c
View File

@ -55,9 +55,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -108,9 +108,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }

4
j/5/cue.c
View File

@ -50,7 +50,7 @@
u3_noun x = u3_ch_get(har_p, u3k(u3t(d))); u3_noun x = u3_ch_get(har_p, u3k(u3t(d)));
p = u3_cqa_add(2, u3h(d)); p = u3_cqa_add(2, u3h(d));
if ( u3_none == x ) { if ( c3nne == x ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
q = x; q = x;
@ -80,7 +80,7 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
return u3_cqe_cue(a); return u3_cqe_cue(a);

2
j/5/ed_puck.c
View File

@ -18,7 +18,7 @@
c3_w met_w; c3_w met_w;
u3_noun a = u3_cr_at(u3_cv_sam, cor); u3_noun a = u3_cr_at(u3_cv_sam, cor);
if ( (u3_none == a) || (u3_no == u3ud(a)) ) { if ( (c3nne == a) || (c3n == u3ud(a)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }

2
j/5/ed_sign.c
View File

@ -42,7 +42,7 @@
u3_cwee_sign(u3_noun cor) u3_cwee_sign(u3_noun cor)
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, if ( c3n == u3_cr_mean(cor,
u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) { u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {

4
j/5/ed_veri.c
View File

@ -28,7 +28,7 @@
u3_cr_bytes(0, 32, pub_y, pk); u3_cr_bytes(0, 32, pub_y, pk);
u3_cr_bytes(0, mesm_w, mes_y, m); u3_cr_bytes(0, mesm_w, mes_y, m);
ret = ed25519_verify(sig_y, mes_y, mesm_w, pub_y) == 1 ? u3_yes : u3_no; ret = ed25519_verify(sig_y, mes_y, mesm_w, pub_y) == 1 ? c3y : c3n;
free(mes_y); free(mes_y);
return ret; return ret;
} }
@ -37,7 +37,7 @@
u3_cwee_veri(u3_noun cor) u3_cwee_veri(u3_noun cor)
{ {
u3_noun a, b, c; u3_noun a, b, c;
if ( u3_no == u3_cr_mean(cor, if ( c3n == u3_cr_mean(cor,
u3_cv_sam_2, &a, u3_cv_sam_6, &b, u3_cv_sam_2, &a, u3_cv_sam_6, &b,
u3_cv_sam_7, &c, 0) ) { u3_cv_sam_7, &c, 0) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);

8
j/5/jam.c
View File

@ -88,17 +88,17 @@
u3_noun c = u3_ch_get(har_p, a); u3_noun c = u3_ch_get(har_p, a);
u3_noun x; u3_noun x;
if ( u3_none == c ) { if ( c3nne == c ) {
u3_ch_put(har_p, a, u3k(b)); u3_ch_put(har_p, a, u3k(b));
if ( u3_yes == u3ud(a) ) { if ( c3y == u3ud(a) ) {
x = _jam_in_flat(har_p, a, l); x = _jam_in_flat(har_p, a, l);
} else { } else {
x = _jam_in_pair(har_p, u3h(a), u3t(a), b, l); x = _jam_in_pair(har_p, u3h(a), u3t(a), b, l);
} }
} }
else { else {
if ( u3_yes == u3ud(a) && u3_cr_met(0, a) <= u3_cr_met(0, c) ) { if ( c3y == u3ud(a) && u3_cr_met(0, a) <= u3_cr_met(0, c) ) {
x = _jam_in_flat(har_p, a, l); x = _jam_in_flat(har_p, a, l);
} }
else { else {
@ -127,7 +127,7 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
return u3_cqe_jam(a); return u3_cqe_jam(a);

4
j/5/lore.c
View File

@ -49,8 +49,8 @@
{ {
u3_noun lub; u3_noun lub;
if ( (u3_none == (lub = u3_cr_at(u3_cv_sam, cor))) || if ( (c3nne == (lub = u3_cr_at(u3_cv_sam, cor))) ||
(u3_no == u3ud(lub)) ) (c3n == u3ud(lub)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {

46
j/5/loss.c
View File

@ -97,7 +97,7 @@
hav = u3_ckdb_get(u3k(loc_u->sev), u3k(how)); hav = u3_ckdb_get(u3k(loc_u->sev), u3k(how));
teg = u3nc(u3_ci_words(1, &i_w), teg = u3nc(u3_ci_words(1, &i_w),
(hav == u3_none) ? u3_nul : hav); (hav == c3nne) ? u3_nul : hav);
loc_u->sev = u3_ckdb_put(loc_u->sev, u3k(how), teg); loc_u->sev = u3_ckdb_put(loc_u->sev, u3k(how), teg);
} }
} }
@ -131,7 +131,7 @@
c3_w inx_w, c3_w inx_w,
c3_w goy_w) c3_w goy_w)
{ {
return u3_say return __
( (loc_u->kct_w == inx_w) || ( (loc_u->kct_w == inx_w) ||
(u3_cr_word(0, u3h(loc_u->kad[inx_w])) > goy_w) ); (u3_cr_word(0, u3h(loc_u->kad[inx_w])) > goy_w) );
} }
@ -143,7 +143,7 @@
c3_w inx_w, c3_w inx_w,
c3_w goy_w) c3_w goy_w)
{ {
return u3_say return __
( (0 == inx_w) || ( (0 == inx_w) ||
(u3_cr_word(0, u3h(loc_u->kad[inx_w - 1])) < goy_w) ); (u3_cr_word(0, u3h(loc_u->kad[inx_w - 1])) < goy_w) );
} }
@ -159,15 +159,15 @@
c3_w goy_w) c3_w goy_w)
{ {
while ( *inx_w <= max_w ) { while ( *inx_w <= max_w ) {
if ( u3_no == _lonk(loc_u, *inx_w, goy_w) ) { if ( c3n == _lonk(loc_u, *inx_w, goy_w) ) {
return u3_no; return c3n;
} }
if ( u3_yes == _hink(loc_u, *inx_w, goy_w) ) { if ( c3y == _hink(loc_u, *inx_w, goy_w) ) {
return u3_yes; return c3y;
} }
else ++*inx_w; else ++*inx_w;
} }
return u3_no; return c3n;
} }
#endif #endif
@ -184,22 +184,22 @@
c3_assert(max_w >= *inx_w); c3_assert(max_w >= *inx_w);
if ( max_w == *inx_w ) { if ( max_w == *inx_w ) {
if ( u3_no == _lonk(loc_u, *inx_w, goy_w) ) { if ( c3n == _lonk(loc_u, *inx_w, goy_w) ) {
return u3_no; return c3n;
} }
if ( u3_yes == _hink(loc_u, *inx_w, goy_w) ) { if ( c3y == _hink(loc_u, *inx_w, goy_w) ) {
return u3_yes; return c3y;
} }
else { else {
++*inx_w; ++*inx_w;
return u3_no; return c3n;
} }
} }
else { else {
c3_w mid_w = *inx_w + ((max_w - *inx_w) / 2); c3_w mid_w = *inx_w + ((max_w - *inx_w) / 2);
if ( (u3_no == _lonk(loc_u, mid_w, goy_w)) || if ( (c3n == _lonk(loc_u, mid_w, goy_w)) ||
(u3_yes == _hink(loc_u, mid_w, goy_w)) ) (c3y == _hink(loc_u, mid_w, goy_w)) )
{ {
return _bink(loc_u, inx_w, mid_w, goy_w); return _bink(loc_u, inx_w, mid_w, goy_w);
} else { } else {
@ -225,7 +225,7 @@
bik = _bink(loc_u, &inx_w, loc_u->kct_w, goy_w); bik = _bink(loc_u, &inx_w, loc_u->kct_w, goy_w);
if ( u3_yes == bik ) { if ( c3y == bik ) {
_merg(loc_u, inx_w + 1, u3t(gay)); _merg(loc_u, inx_w + 1, u3t(gay));
_lune(loc_u, inx_w, goy_w); _lune(loc_u, inx_w, goy_w);
} }
@ -244,7 +244,7 @@
u3_noun i_hel = u3h(loc_u->hel); u3_noun i_hel = u3h(loc_u->hel);
u3_noun guy = u3_ckdb_get(u3k(loc_u->sev), u3k(i_hel)); u3_noun guy = u3_ckdb_get(u3k(loc_u->sev), u3k(i_hel));
if ( u3_none != guy ) { if ( c3nne != guy ) {
u3_noun gay = u3_ckb_flop(guy); u3_noun gay = u3_ckb_flop(guy);
_merg(loc_u, 0, gay); _merg(loc_u, 0, gay);
@ -275,8 +275,8 @@
_listp(u3_noun lix) _listp(u3_noun lix)
{ {
while ( 1 ) { while ( 1 ) {
if ( u3_nul == lix ) return u3_yes; if ( u3_nul == lix ) return c3y;
if ( u3_no == u3du(lix) ) return u3_no; if ( c3n == u3du(lix) ) return c3n;
lix = u3t(lix); lix = u3t(lix);
} }
} }
@ -286,10 +286,10 @@
{ {
u3_noun hel, hev; u3_noun hel, hev;
if ( (u3_none == (hel = u3_cr_at(u3_cv_sam_2, cor))) || if ( (c3nne == (hel = u3_cr_at(u3_cv_sam_2, cor))) ||
(u3_none == (hev = u3_cr_at(u3_cv_sam_3, cor))) || (c3nne == (hev = u3_cr_at(u3_cv_sam_3, cor))) ||
(u3_no == _listp(hel)) || (c3n == _listp(hel)) ||
(u3_no == _listp(hev)) ) (c3n == _listp(hev)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {

2
j/5/mat.c
View File

@ -45,7 +45,7 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
return u3_cqe_mat(a); return u3_cqe_mat(a);

2
j/5/mink.c
View File

@ -10,7 +10,7 @@
{ {
u3_noun bus, fol, fly; u3_noun bus, fol, fly;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_4, &bus, if ( c3n == u3_cr_mean(cor, u3_cv_sam_4, &bus,
u3_cv_sam_5, &fol, u3_cv_sam_5, &fol,
u3_cv_sam_3, &fly, u3_cv_sam_3, &fly,
0) ) 0) )

2
j/5/mule.c
View File

@ -9,7 +9,7 @@
{ {
u3_noun tap; u3_noun tap;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &tap, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &tap, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {

154
j/5/parse.c
View File

@ -44,8 +44,8 @@
u3_cx_cell(zyc, &p_zyc, &q_zyc); u3_cx_cell(zyc, &p_zyc, &q_zyc);
u3_cx_cell(naz, &p_naz, &q_naz); u3_cx_cell(naz, &p_naz, &q_naz);
if ( u3_ne(u3_ca_is_cat(p_zyc)) || u3_ne(u3_ca_is_cat(q_zyc)) || if ( !_(u3_ca_is_cat(p_zyc)) || !_(u3_ca_is_cat(q_zyc)) ||
u3_ne(u3_ca_is_cat(p_naz)) || u3_ne(u3_ca_is_cat(q_naz)) ) !_(u3_ca_is_cat(p_naz)) || !_(u3_ca_is_cat(q_naz)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -66,7 +66,7 @@
u3_noun zac; u3_noun zac;
u3_cx_cell(tub, &p_tub, &q_tub); u3_cx_cell(tub, &p_tub, &q_tub);
if ( u3_no == u3du(q_tub) ) { if ( c3n == u3du(q_tub) ) {
return _fail(tub); return _fail(tub);
} }
else { else {
@ -94,7 +94,7 @@
u3_noun p_vex, q_vex; u3_noun p_vex, q_vex;
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return u3k(vex); return u3k(vex);
} else { } else {
u3_noun uq_vex = u3t(q_vex); u3_noun uq_vex = u3t(q_vex);
@ -109,7 +109,7 @@
u3_cx_cell(yit, &p_yit, &q_yit); u3_cx_cell(yit, &p_yit, &q_yit);
yur = _last(p_vex, p_yit); yur = _last(p_vex, p_yit);
if ( u3_no == u3du(q_yit) ) { if ( c3n == u3du(q_yit) ) {
ret = u3nc(yur, u3k(q_vex)); ret = u3nc(yur, u3k(q_vex));
} }
else { else {
@ -145,10 +145,10 @@
{ {
u3_noun van, raq, vex, sab; u3_noun van, raq, vex, sab;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex,
u3_cv_sam_3, &sab, u3_cv_sam_3, &sab,
u3_cv_con, &van, 0)) || u3_cv_con, &van, 0)) ||
(u3_none == (raq = u3_cr_at(u3_cv_sam, van))) ) (c3nne == (raq = u3_cr_at(u3_cv_sam, van))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -169,7 +169,7 @@
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return vex; return vex;
} }
else { else {
@ -194,8 +194,8 @@
{ {
u3_noun van, cus, sef, tub; u3_noun van, cus, sef, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_no == u3_cr_mean(van, u3_cv_sam_2, &cus, u3_cv_sam_3, &sef, 0)) ) (c3n == u3_cr_mean(van, u3_cv_sam_2, &cus, u3_cv_sam_3, &sef, 0)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -216,7 +216,7 @@
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return vex; return vex;
} }
else { else {
@ -243,8 +243,8 @@
{ {
u3_noun van, poq, sef, tub; u3_noun van, poq, sef, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_no == u3_cr_mean(van, u3_cv_sam_2, &poq, u3_cv_sam_3, &sef, 0)) ) (c3n == u3_cr_mean(van, u3_cv_sam_2, &poq, u3_cv_sam_3, &sef, 0)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -263,7 +263,7 @@
u3_noun p_vex, q_vex; u3_noun p_vex, q_vex;
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return u3k(vex); return u3k(vex);
} else { } else {
u3_noun uq_vex = u3t(q_vex); u3_noun uq_vex = u3t(q_vex);
@ -278,7 +278,7 @@
u3_cx_cell(yit, &p_yit, &q_yit); u3_cx_cell(yit, &p_yit, &q_yit);
yur = _last(p_vex, p_yit); yur = _last(p_vex, p_yit);
if ( u3_no == u3du(q_yit) ) { if ( c3n == u3du(q_yit) ) {
ret = u3nc(yur, u3k(q_yit)); ret = u3nc(yur, u3k(q_yit));
} }
else { else {
@ -307,10 +307,10 @@
{ {
u3_noun van, raq, vex, sab; u3_noun van, raq, vex, sab;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex,
u3_cv_sam_3, &sab, u3_cv_sam_3, &sab,
u3_cv_con, &van, 0)) || u3_cv_con, &van, 0)) ||
(u3_none == (raq = u3_cr_at(u3_cv_sam, van))) ) (c3nne == (raq = u3_cr_at(u3_cv_sam, van))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -339,8 +339,8 @@
{ {
u3_noun van, huf, tub; u3_noun van, huf, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_none == (huf = u3_cr_at(u3_cv_sam, van))) ) (c3nne == (huf = u3_cr_at(u3_cv_sam, van))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -359,7 +359,7 @@
u3_noun p_vex, q_vex; u3_noun p_vex, q_vex;
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return u3k(vex); return u3k(vex);
} }
else { else {
@ -375,7 +375,7 @@
u3_cx_cell(yit, &p_yit, &q_yit); u3_cx_cell(yit, &p_yit, &q_yit);
yur = _last(p_vex, p_yit); yur = _last(p_vex, p_yit);
if ( u3_no == u3du(q_yit) ) { if ( c3n == u3du(q_yit) ) {
ret = u3nc(yur, u3_nul); ret = u3nc(yur, u3_nul);
} }
else { else {
@ -390,7 +390,7 @@
goy = _last(yur, p_wam); goy = _last(yur, p_wam);
u3z(yur); u3z(yur);
if ( u3_no == u3du(q_wam) ) { if ( c3n == u3du(q_wam) ) {
ret = u3nc(goy, u3_nul); ret = u3nc(goy, u3_nul);
} else { } else {
u3_noun uq_wam = u3t(q_wam); u3_noun uq_wam = u3t(q_wam);
@ -416,10 +416,10 @@
{ {
u3_noun van, bus, vex, sab; u3_noun van, bus, vex, sab;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex,
u3_cv_sam_3, &sab, u3_cv_sam_3, &sab,
u3_cv_con, &van, 0)) || u3_cv_con, &van, 0)) ||
(u3_none == (bus = u3_cr_at(u3_cv_sam, van))) ) (c3nne == (bus = u3_cr_at(u3_cv_sam, van))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -440,7 +440,7 @@
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return vex; return vex;
} }
else { else {
@ -475,8 +475,8 @@
{ {
u3_noun van, hez, sef, tub; u3_noun van, hez, sef, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_no == u3_cr_mean(van, u3_cv_sam_2, &hez, u3_cv_sam_3, &sef, 0)) ) (c3n == u3_cr_mean(van, u3_cv_sam_2, &hez, u3_cv_sam_3, &sef, 0)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
@ -496,13 +496,13 @@
u3_cx_cell(tub, &p_tub, &q_tub); u3_cx_cell(tub, &p_tub, &q_tub);
if ( u3_no == u3du(q_tub) ) { if ( c3n == u3du(q_tub) ) {
return _fail(tub); return _fail(tub);
} }
else { else {
u3_noun iq_tub = u3h(q_tub); u3_noun iq_tub = u3h(q_tub);
if ( u3_yes == u3_cr_sing(daf, iq_tub) ) { if ( c3y == u3_cr_sing(daf, iq_tub) ) {
return _next(tub); return _next(tub);
} }
else return _fail(tub); else return _fail(tub);
@ -514,8 +514,8 @@
{ {
u3_noun van, daf, tub; u3_noun van, daf, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_none == (daf = u3_cr_at(u3_cv_sam, van))) ) (c3nne == (daf = u3_cr_at(u3_cv_sam, van))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -534,14 +534,14 @@
u3_cx_cell(tub, &p_tub, &q_tub); u3_cx_cell(tub, &p_tub, &q_tub);
if ( u3_no == u3du(q_tub) ) { if ( c3n == u3du(q_tub) ) {
return _fail(tub); return _fail(tub);
} }
else { else {
u3_noun iq_tub = u3h(q_tub); u3_noun iq_tub = u3h(q_tub);
while ( u3_yes == u3du(bud) ) { while ( c3y == u3du(bud) ) {
if ( u3_yes == u3_cr_sing(u3h(bud), iq_tub) ) { if ( c3y == u3_cr_sing(u3h(bud), iq_tub) ) {
return _next(tub); return _next(tub);
} }
bud = u3t(bud); bud = u3t(bud);
@ -555,8 +555,8 @@
{ {
u3_noun van, bud, tub; u3_noun van, bud, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_none == (bud = u3_cr_at(u3_cv_sam, van))) ) (c3nne == (bud = u3_cr_at(u3_cv_sam, van))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -573,7 +573,7 @@
u3_noun p_vex, q_vex; u3_noun p_vex, q_vex;
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return u3k(vex); return u3k(vex);
} }
else { else {
@ -601,7 +601,7 @@
{ {
u3_noun vex, sab; u3_noun vex, sab;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return _cqe_pfix(vex, sab); return _cqe_pfix(vex, sab);
@ -618,7 +618,7 @@
u3_noun p_vex, q_vex; u3_noun p_vex, q_vex;
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return u3k(vex); return u3k(vex);
} }
else { else {
@ -634,7 +634,7 @@
u3_cx_cell(yit, &p_yit, &q_yit); u3_cx_cell(yit, &p_yit, &q_yit);
yur = _last(p_vex, p_yit); yur = _last(p_vex, p_yit);
if ( u3_no == u3du(q_yit) ) { if ( c3n == u3du(q_yit) ) {
ret = u3nc(yur, u3k(q_yit)); ret = u3nc(yur, u3k(q_yit));
} }
else { else {
@ -658,7 +658,7 @@
{ {
u3_noun vex, sab; u3_noun vex, sab;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return _cqe_plug(vex, sab); return _cqe_plug(vex, sab);
@ -674,7 +674,7 @@
u3_noun p_vex, q_vex; u3_noun p_vex, q_vex;
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_yes == u3du(q_vex) ) { if ( c3y == u3du(q_vex) ) {
return u3k(vex); return u3k(vex);
} else { } else {
u3_noun roq = u3_cx_good(u3_cn_kick_on(u3k(sab))); u3_noun roq = u3_cx_good(u3_cn_kick_on(u3k(sab)));
@ -697,7 +697,7 @@
{ {
u3_noun vex, sab; u3_noun vex, sab;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqe_pose(vex, sab); return u3_cqe_pose(vex, sab);
@ -712,7 +712,7 @@
u3_noun p_vex, q_vex; u3_noun p_vex, q_vex;
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return u3k(vex); return u3k(vex);
} }
else { else {
@ -727,7 +727,7 @@
u3_cx_cell(yit, &p_yit, &q_yit); u3_cx_cell(yit, &p_yit, &q_yit);
yur = _last(p_vex, p_yit); yur = _last(p_vex, p_yit);
if ( u3_no == u3du(q_yit) ) { if ( c3n == u3du(q_yit) ) {
ret = u3nc(yur, u3_nul); ret = u3nc(yur, u3_nul);
} }
else { else {
@ -750,7 +750,7 @@
{ {
u3_noun vex, sab; u3_noun vex, sab;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) { if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &vex, u3_cv_sam_3, &sab, 0)) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return _cqe_sfix(vex, sab); return _cqe_sfix(vex, sab);
@ -767,7 +767,7 @@
u3_cx_cell(tub, &p_tub, &q_tub); u3_cx_cell(tub, &p_tub, &q_tub);
if ( u3_no == u3du(q_tub) ) { if ( c3n == u3du(q_tub) ) {
return _fail(tub); return _fail(tub);
} }
else { else {
@ -775,9 +775,9 @@
u3_noun iq_tub = u3h(q_tub); u3_noun iq_tub = u3h(q_tub);
u3_cx_cell(zep, &p_zep, &q_zep); u3_cx_cell(zep, &p_zep, &q_zep);
if ( u3_so(u3_ca_is_cat(p_zep)) && if ( _(u3_ca_is_cat(p_zep)) &&
u3_so(u3_ca_is_cat(q_zep)) && _(u3_ca_is_cat(q_zep)) &&
u3_so(u3_ca_is_cat(iq_tub)) ) _(u3_ca_is_cat(iq_tub)) )
{ {
if ( (iq_tub >= p_zep) && (iq_tub <= q_zep) ) { if ( (iq_tub >= p_zep) && (iq_tub <= q_zep) ) {
return _next(tub); return _next(tub);
@ -795,8 +795,8 @@
{ {
u3_noun van, zep, tub; u3_noun van, zep, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_none == (zep = u3_cr_at(u3_cv_sam, van))) ) (c3nne == (zep = u3_cr_at(u3_cv_sam, van))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -817,7 +817,7 @@
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
return vex; return vex;
} }
else { else {
@ -844,8 +844,8 @@
{ {
u3_noun van, gob, sef, tub; u3_noun van, gob, sef, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_no == u3_cr_mean(van, u3_cv_sam_2, &gob, u3_cv_sam_3, &sef, 0)) ) (c3n == u3_cr_mean(van, u3_cv_sam_2, &gob, u3_cv_sam_3, &sef, 0)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -860,23 +860,23 @@
u3_noun ort, u3_noun ort,
u3_noun wan) u3_noun wan)
{ {
if ( u3_ne(u3_ca_is_cat(ort)) ) { if ( !_(u3_ca_is_cat(ort)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else { else {
if ( u3_no == u3du(wan) ) { if ( c3n == u3du(wan) ) {
if ( u3_ne(u3_ca_is_cat(wan)) ) { if ( !_(u3_ca_is_cat(wan)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else return (ort < wan) ? u3_yes : u3_no; else return (ort < wan) ? c3y : c3n;
} }
else { else {
u3_noun h_wan = u3h(wan); u3_noun h_wan = u3h(wan);
if ( u3_ne(u3_ca_is_cat(h_wan)) ) { if ( !_(u3_ca_is_cat(h_wan)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else return (ort < h_wan) ? u3_yes : u3_no; else return (ort < h_wan) ? c3y : c3n;
} }
} }
} }
@ -889,17 +889,17 @@
u3_noun p_tub, q_tub; u3_noun p_tub, q_tub;
u3_cx_cell(tub, &p_tub, &q_tub); u3_cx_cell(tub, &p_tub, &q_tub);
if ( u3_no == u3du(q_tub) ) { if ( c3n == u3du(q_tub) ) {
return _fail(tub); return _fail(tub);
} }
else { else {
u3_noun iq_tub = u3h(q_tub); u3_noun iq_tub = u3h(q_tub);
if ( u3_ne(u3_ca_is_cat(iq_tub)) ) { if ( !_(u3_ca_is_cat(iq_tub)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
else while ( 1 ) { else while ( 1 ) {
if ( u3_no == u3du(hel) ) { if ( c3n == u3du(hel) ) {
return _fail(tub); return _fail(tub);
} }
else { else {
@ -910,25 +910,25 @@
u3_cx_trel(hel, &n_hel, &l_hel, &r_hel); u3_cx_trel(hel, &n_hel, &l_hel, &r_hel);
u3_cx_cell(n_hel, &pn_hel, &qn_hel); u3_cx_cell(n_hel, &pn_hel, &qn_hel);
if ( (u3_no == u3du(pn_hel)) ) { if ( (c3n == u3du(pn_hel)) ) {
bit_o = u3_say((iq_tub == pn_hel)); bit_o = __((iq_tub == pn_hel));
} }
else { else {
u3_noun hpn_hel = u3h(pn_hel); u3_noun hpn_hel = u3h(pn_hel);
u3_noun tpn_hel = u3t(pn_hel); u3_noun tpn_hel = u3t(pn_hel);
if ( u3_ne(u3_ca_is_cat(hpn_hel)) || if ( !_(u3_ca_is_cat(hpn_hel)) ||
u3_ne(u3_ca_is_cat(tpn_hel)) ) { !_(u3_ca_is_cat(tpn_hel)) ) {
return _fail(tub); return _fail(tub);
} }
else bit_o = u3_say((iq_tub >= hpn_hel) && (iq_tub <= tpn_hel)); else bit_o = __((iq_tub >= hpn_hel) && (iq_tub <= tpn_hel));
} }
if ( u3_yes == bit_o ) { if ( c3y == bit_o ) {
return u3_cx_good return u3_cx_good
(u3_cn_slam_on(u3k(qn_hel), u3k(tub))); (u3_cn_slam_on(u3k(qn_hel), u3k(tub)));
} else { } else {
if ( u3_yes == _stew_wor(iq_tub, pn_hel) ) { if ( c3y == _stew_wor(iq_tub, pn_hel) ) {
hel = l_hel; hel = l_hel;
} }
else hel = r_hel; else hel = r_hel;
@ -943,8 +943,8 @@
{ {
u3_noun con, hel, tub; u3_noun con, hel, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &con, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &con, 0)) ||
(u3_none == (hel = u3_cr_at(2, con))) ) (c3nne == (hel = u3_cr_at(2, con))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
@ -965,7 +965,7 @@
u3_noun ret; u3_noun ret;
u3_cx_cell(vex, &p_vex, &q_vex); u3_cx_cell(vex, &p_vex, &q_vex);
if ( u3_no == u3du(q_vex) ) { if ( c3n == u3du(q_vex) ) {
ret = u3nq(u3k(p_vex), ret = u3nq(u3k(p_vex),
u3_nul, u3_nul,
u3k(rud), u3k(rud),
@ -980,7 +980,7 @@
wag = _cqe_stir_fun(rud, raq, fel, quq_vex); wag = _cqe_stir_fun(rud, raq, fel, quq_vex);
u3_cx_cell(wag, &p_wag, &q_wag); u3_cx_cell(wag, &p_wag, &q_wag);
if ( u3_no == u3du(q_wag) ) { if ( c3n == u3du(q_wag) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
uq_wag = u3t(q_wag); uq_wag = u3t(q_wag);
@ -1005,8 +1005,8 @@
{ {
u3_noun van, rud, raq, fel, tub; u3_noun van, rud, raq, fel, tub;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam, &tub, u3_cv_con, &van, 0)) ||
(u3_no == u3_cr_mean(van, u3_cv_sam_2, &rud, (c3n == u3_cr_mean(van, u3_cv_sam_2, &rud,
u3_cv_sam_6, &raq, u3_cv_sam_6, &raq,
u3_cv_sam_7, &fel, u3_cv_sam_7, &fel,
0)) ) 0)) )

60
j/5/rd.c
View File

@ -29,8 +29,8 @@ union doub {
{ {
u3_noun a; u3_noun a;
if (u3_no == u3_cr_mean(cor, u3_cv_sam, &a, 0) if (c3n == u3_cr_mean(cor, u3_cv_sam, &a, 0)
|| u3_no == u3ud(a)) { || c3n == u3ud(a)) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
else { else {
@ -56,9 +56,9 @@ union doub {
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -85,9 +85,9 @@ union doub {
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -114,9 +114,9 @@ union doub {
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -143,9 +143,9 @@ union doub {
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -163,7 +163,7 @@ union doub {
c.c = u3_cr_chub(0, a); c.c = u3_cr_chub(0, a);
d.c = u3_cr_chub(0, b); d.c = u3_cr_chub(0, b);
return u3_say(c.d <= d.d); return __(c.d <= d.d);
} }
u3_noun u3_noun
@ -171,9 +171,9 @@ union doub {
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -191,7 +191,7 @@ union doub {
c.c = u3_cr_chub(0, a); c.c = u3_cr_chub(0, a);
d.c = u3_cr_chub(0, b); d.c = u3_cr_chub(0, b);
return u3_say(c.d < d.d); return __(c.d < d.d);
} }
u3_noun u3_noun
@ -199,9 +199,9 @@ union doub {
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -219,7 +219,7 @@ union doub {
c.c = u3_cr_chub(0, a); c.c = u3_cr_chub(0, a);
d.c = u3_cr_chub(0, b); d.c = u3_cr_chub(0, b);
return u3_say(c.d >= d.d); return __(c.d >= d.d);
} }
u3_noun u3_noun
@ -227,9 +227,9 @@ union doub {
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -247,7 +247,7 @@ union doub {
c.c = u3_cr_chub(0, a); c.c = u3_cr_chub(0, a);
d.c = u3_cr_chub(0, b); d.c = u3_cr_chub(0, b);
return u3_say(c.d > d.d); return __(c.d > d.d);
} }
u3_noun u3_noun
@ -255,9 +255,9 @@ union doub {
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) || if ( c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0) ||
u3_no == u3ud(a) || c3n == u3ud(a) ||
u3_no == u3ud(b) ) c3n == u3ud(b) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }

6
j/5/repg.c
View File

@ -128,9 +128,9 @@
u3_noun rad; u3_noun rad;
u3_noun rep; u3_noun rep;
if ( (u3_none == (lub = u3_cr_at(u3_cv_sam_2, cor))) || if ( (c3nne == (lub = u3_cr_at(u3_cv_sam_2, cor))) ||
(u3_none == (rad = u3_cr_at(u3_cv_sam_6, cor))) || (c3nne == (rad = u3_cr_at(u3_cv_sam_6, cor))) ||
(u3_none == (rep = u3_cr_at(u3_cv_sam_7, cor))) ) (c3nne == (rep = u3_cr_at(u3_cv_sam_7, cor))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {

4
j/5/rexp.c
View File

@ -129,8 +129,8 @@
u3_noun lub; u3_noun lub;
u3_noun rad; u3_noun rad;
if ( (u3_none == (lub = u3_cr_at(u3_cv_sam_2, cor))) || if ( (c3nne == (lub = u3_cr_at(u3_cv_sam_2, cor))) ||
(u3_none == (rad = u3_cr_at(u3_cv_sam_3, cor))) ) (c3nne == (rad = u3_cr_at(u3_cv_sam_3, cor))) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {

10
j/5/rub.c
View File

@ -26,7 +26,7 @@
u3_atom y = u3_cqa_inc(x); u3_atom y = u3_cqa_inc(x);
// Sanity check: crash if decoding more bits than available // Sanity check: crash if decoding more bits than available
if ( u3_yes == u3_cqa_gth(x, m)) { if ( c3y == u3_cqa_gth(x, m)) {
// fprintf(stderr, "[%%rub-hard %d %d %d]\r\n", a, x, m); // fprintf(stderr, "[%%rub-hard %d %d %d]\r\n", a, x, m);
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} }
@ -34,7 +34,7 @@
u3z(x); u3z(x);
x = y; x = y;
} }
if ( u3_yes == u3_cr_sing(x, a) ) { if ( c3y == u3_cr_sing(x, a) ) {
u3z(x); u3z(x);
return u3nc(1, 0); return u3nc(1, 0);
} }
@ -71,9 +71,9 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_no == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) || if ( (c3n == u3_cr_mean(cor, u3_cv_sam_2, &a, u3_cv_sam_3, &b, 0)) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {

28
j/5/shax.c
View File

@ -45,7 +45,7 @@
u3_cqe_shal(u3_atom a, u3_cqe_shal(u3_atom a,
u3_atom b) u3_atom b)
{ {
c3_assert(u3_so(u3_ca_is_cat(a))); c3_assert(_(u3_ca_is_cat(a)));
c3_y* fat_y = c3_malloc(a + 1); c3_y* fat_y = c3_malloc(a + 1);
u3_cr_bytes(0, a, fat_y, b); u3_cr_bytes(0, a, fat_y, b);
@ -87,8 +87,8 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) || if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ||
(u3_no == u3ud(a)) ) (c3n == u3ud(a)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
@ -101,11 +101,11 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam_2, cor))) || if ( (c3nne == (a = u3_cr_at(u3_cv_sam_2, cor))) ||
(u3_none == (b = u3_cr_at(u3_cv_sam_3, cor))) || (c3nne == (b = u3_cr_at(u3_cv_sam_3, cor))) ||
(u3_no == u3ud(a)) || (c3n == u3ud(a)) ||
(u3_no == u3_ca_is_cat(a)) || (c3n == u3_ca_is_cat(a)) ||
(u3_no == u3ud(b)) ) (c3n == u3ud(b)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
@ -118,10 +118,10 @@
{ {
u3_noun sal, ruz; u3_noun sal, ruz;
if ( (u3_none == (sal = u3_cr_at(u3_cv_sam_2, cor))) || if ( (c3nne == (sal = u3_cr_at(u3_cv_sam_2, cor))) ||
(u3_none == (ruz = u3_cr_at(u3_cv_sam_3, cor))) || (c3nne == (ruz = u3_cr_at(u3_cv_sam_3, cor))) ||
(u3_no == u3ud(sal)) || (c3n == u3ud(sal)) ||
(u3_no == u3ud(ruz)) ) (c3n == u3ud(ruz)) )
{ {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
@ -137,7 +137,7 @@
{ {
u3_noun l = u3_nul; u3_noun l = u3_nul;
if ( u3_ne(u3_ca_is_cat(b)) ) { if ( !_(u3_ca_is_cat(b)) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} }
while ( 0 != b ) { while ( 0 != b ) {
@ -185,7 +185,7 @@
{ {
u3_noun a, b; u3_noun a, b;
if ( u3_no == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) { if ( c3n == u3_cr_mean(cor, u3_cv_sam, &b, u3_cv_con_sam, &a, 0) ) {
return u3_cm_bail(c3__exit); return u3_cm_bail(c3__exit);
} else { } else {
return u3_cqeo_raw(a, b); return u3_cqeo_raw(a, b);

14
j/5/tape.c
View File

@ -11,10 +11,10 @@
_norm( _norm(
u3_noun a) u3_noun a)
{ {
if ( u3_no == u3du(a) ) { if ( c3n == u3du(a) ) {
return u3_nul; return u3_nul;
} else { } else {
return u3nc(((u3_yes == u3du(u3h(a))) ? u3_nul : u3k(u3h(a))), return u3nc(((c3y == u3du(u3h(a))) ? u3_nul : u3k(u3h(a))),
_norm(u3t(a))); _norm(u3t(a)));
} }
} }
@ -25,10 +25,10 @@
{ {
while ( 1 ) { while ( 1 ) {
if ( u3_nul == a ) { if ( u3_nul == a ) {
return u3_yes; return c3y;
} }
if ( u3_no == u3ud(u3h(a)) ) { if ( c3n == u3ud(u3h(a)) ) {
return u3_no; return c3n;
} }
a = u3t(a); a = u3t(a);
} }
@ -37,7 +37,7 @@
u3_noun u3_noun
u3_cqe_tape(u3_noun a) u3_cqe_tape(u3_noun a)
{ {
if ( u3_yes == _good(a) ) { if ( c3y == _good(a) ) {
return u3k(a); return u3k(a);
} else { } else {
return _norm(a); return _norm(a);
@ -48,7 +48,7 @@
{ {
u3_noun a; u3_noun a;
if ( (u3_none == (a = u3_cr_at(u3_cv_sam, cor))) ) { if ( (c3nne == (a = u3_cr_at(u3_cv_sam, cor))) ) {
return u3_cm_bail(c3__fail); return u3_cm_bail(c3__fail);
} else { } else {
return u3_cqe_tape(a); return u3_cqe_tape(a);

Some files were not shown because too many files have changed in this diff Show More