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

Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-06-12 10:24:56 -07:00
commit e7b1d8d798
11 changed files with 549 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -153,14 +153,15 @@ J164_4_OFILES=\
gen164/4/in.o \ gen164/4/in.o \
gen164/4/by.o \ gen164/4/by.o \
gen164/4/in_has.o \ gen164/4/in_has.o \
gen164/4/in_int.o \
gen164/4/in_gas.o \ gen164/4/in_gas.o \
gen164/4/in_mer.o \
gen164/4/in_put.o \ gen164/4/in_put.o \
gen164/4/in_tap.o \ gen164/4/in_tap.o \
gen164/4/in_uni.o \
gen164/4/by_gas.o \ gen164/4/by_gas.o \
gen164/4/by_get.o \ gen164/4/by_get.o \
gen164/4/by_has.o \ gen164/4/by_has.o \
gen164/4/by_mer.o \ gen164/4/by_int.o \
gen164/4/by_put.o \ gen164/4/by_put.o \
gen164/4/by_uni.o gen164/4/by_uni.o

4
gen164/4/by.c
View File

@ -10,7 +10,7 @@
extern u2_ho_jet j2_mcj(Pt4, by, gas)[]; extern u2_ho_jet j2_mcj(Pt4, by, gas)[];
extern u2_ho_jet j2_mcj(Pt4, by, get)[]; extern u2_ho_jet j2_mcj(Pt4, by, get)[];
extern u2_ho_jet j2_mcj(Pt4, by, has)[]; extern u2_ho_jet j2_mcj(Pt4, by, has)[];
extern u2_ho_jet j2_mcj(Pt4, by, mer)[]; extern u2_ho_jet j2_mcj(Pt4, by, int)[];
extern u2_ho_jet j2_mcj(Pt4, by, put)[]; extern u2_ho_jet j2_mcj(Pt4, by, put)[];
extern u2_ho_jet j2_mcj(Pt4, by, uni)[]; extern u2_ho_jet j2_mcj(Pt4, by, uni)[];
@ -21,7 +21,7 @@
{ j2_sc(Pt4, by, gas), j2_mcj(Pt4, by, gas), 0, 0, u2_none }, { j2_sc(Pt4, by, gas), j2_mcj(Pt4, by, gas), 0, 0, u2_none },
{ j2_sc(Pt4, by, get), j2_mcj(Pt4, by, get), 0, 0, u2_none }, { j2_sc(Pt4, by, get), j2_mcj(Pt4, by, get), 0, 0, u2_none },
{ j2_sc(Pt4, by, has), j2_mcj(Pt4, by, has), 0, 0, u2_none }, { j2_sc(Pt4, by, has), j2_mcj(Pt4, by, has), 0, 0, u2_none },
{ j2_sc(Pt4, by, mer), j2_mcj(Pt4, by, mer), 0, 0, u2_none }, { j2_sc(Pt4, by, int), j2_mcj(Pt4, by, int), 0, 0, u2_none },
{ j2_sc(Pt4, by, put), j2_mcj(Pt4, by, put), 0, 0, u2_none }, { j2_sc(Pt4, by, put), j2_mcj(Pt4, by, put), 0, 0, u2_none },
{ j2_sc(Pt4, by, uni), j2_mcj(Pt4, by, uni), 0, 0, u2_none }, { j2_sc(Pt4, by, uni), j2_mcj(Pt4, by, uni), 0, 0, u2_none },
{} {}

135
gen164/4/by_int.c Normal file
View File

@ -0,0 +1,135 @@
/* j/4/by_int.c
**
** This file is in the public domain.
*/
#include "all.h"
#include "../pit.h"
/* functions
*/
u2_weak // transfer
j2_mcc(Pt4, by, int)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b) // retain
{
if ( u2_nul == a ) {
return u2_rx(wir_r, u2_nul);
}
else if ( u2_nul == b ) {
return u2_rx(wir_r, u2_nul);
}
else {
u2_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a;
u2_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b;
if ( (u2_no == u2_as_cell(a, &n_a, &lr_a)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( (u2_no == u2_as_cell(b, &n_b, &lr_b)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(lr_a, &l_a, &r_a) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(lr_b, &l_b, &r_b) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(n_a, &p_n_a, &q_n_a) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(n_b, &p_n_b, &q_n_b) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_yes == j2_mbc(Pt3, vor)(wir_r, p_n_a, p_n_b) ) {
if ( u2_yes == u2_sing(p_n_a, p_n_b) ) {
return u2_rt(
wir_r,
u2_rx(wir_r, n_b),
j2_mcc(Pt4, by, int)(wir_r, u2_rx(wir_r, l_a), u2_rx(wir_r, l_b)),
j2_mcc(Pt4, by, int)(wir_r, u2_rx(wir_r, r_a), u2_rx(wir_r, r_b)));
}
else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, p_n_b, p_n_a) ) {
return j2_mcc(Pt4, by, uni)(
wir_r,
j2_mcc(Pt4, by, int)(wir_r,
u2_rx(wir_r, l_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
u2_rx(wir_r, l_b),
u2_rx(wir_r, u2_nul))),
j2_mcc(Pt4, by, int)(wir_r,
u2_rx(wir_r, a),
u2_rx(wir_r, r_b)));
}
else {
return j2_mcc(Pt4, by, uni)(
wir_r,
j2_mcc(Pt4, by, int)(wir_r,
u2_rx(wir_r, r_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
u2_rx(wir_r, u2_nul),
u2_rx(wir_r, r_b))),
j2_mcc(Pt4, by, int)(wir_r,
u2_rx(wir_r, a),
u2_rx(wir_r, l_b)));
}
}
else if ( u2_yes == u2_sing(p_n_b, p_n_a) ) {
return u2_rt(
wir_r,
u2_rx(wir_r, n_b),
j2_mcc(Pt4, by, int)(wir_r, u2_rx(wir_r, l_b), u2_rx(wir_r, l_a)),
j2_mcc(Pt4, by, int)(wir_r, u2_rx(wir_r, r_b), u2_rx(wir_r, r_a)));
}
else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, p_n_a, p_n_b) ) {
return j2_mcc(Pt4, by, uni)(
wir_r,
j2_mcc(Pt4, by, int)(wir_r,
u2_rx(wir_r, l_b),
u2_rt(wir_r,
u2_rx(wir_r, n_a),
u2_rx(wir_r, l_a),
u2_rx(wir_r, u2_nul))),
j2_mcc(Pt4, by, int)(wir_r,
u2_rx(wir_r, a),
u2_rx(wir_r, r_a)));
}
else {
return j2_mcc(Pt4, by, uni)(
wir_r,
j2_mcc(Pt4, by, int)(wir_r,
u2_rx(wir_r, r_b),
u2_rt(wir_r,
u2_rx(wir_r, n_a),
u2_rx(wir_r, u2_nul),
u2_rx(wir_r, r_a))),
j2_mcc(Pt4, by, int)(wir_r,
u2_rx(wir_r, a),
u2_rx(wir_r, l_a)));
}
}
}
u2_weak // transfer
j2_mc(Pt4, by, int)(u2_wire wir_r,
u2_noun cor) // retain
{
u2_noun a, b;
if ( u2_no == u2_mean(cor, u2_cv_sam, &b, u2_cv_con_sam, &a, 0) ) {
return u2_bl_bail(wir_r, c3__exit);
} else {
return j2_mcc(Pt4, by, int)(wir_r, a, b);
}
}
/* structures
*/
u2_ho_jet
j2_mcj(Pt4, by, int)[] = {
{ ".2", c3__lite, j2_mc(Pt4, by, int), Tier4, u2_none, u2_none },
{ }
};

106
gen164/4/by_mer.c
View File

@ -1,106 +0,0 @@
/* j/4/by_mer.c
**
** This file is in the public domain.
*/
#include "all.h"
#include "../pit.h"
/* functions
*/
u2_weak // transfer
j2_mcc(Pt4, by, mer)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b) // retain
{
if ( u2_nul == a ) {
return u2_rx(wir_r, b);
}
else if ( u2_nul == b ) {
return u2_rx(wir_r, a);
}
else {
u2_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a;
u2_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b;
u2_noun c;
if ( (u2_no == u2_as_cell(a, &n_a, &lr_a)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( (u2_no == u2_as_cell(b, &n_b, &lr_b)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( (u2_no == u2_as_cell(n_a, &p_n_a, &q_n_a)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( (u2_no == u2_as_cell(n_b, &p_n_b, &q_n_b)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else {
if ( u2_yes == j2_mbc(Pt3, vor)(wir_r, p_n_b, p_n_a) ) {
c = a; a = b; b = c;
c = n_a; n_a = n_b; n_b = c;
c = lr_a; lr_a = lr_b; lr_b = c;
c = p_n_a; p_n_a = p_n_b; p_n_b = c;
c = q_n_a; q_n_a = q_n_b; q_n_b = c;
}
if ( u2_no == u2_as_cell(lr_a, &l_a, &r_a) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(lr_b, &l_b, &r_b) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_yes == u2_sing(p_n_a, p_n_b) ) {
return u2_rt(wir_r, u2_rx(wir_r, n_b),
j2_mcc(Pt4, by, mer)(wir_r, l_a, l_b),
j2_mcc(Pt4, by, mer)(wir_r, r_a, r_b));
}
else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, p_n_b, p_n_a) ) {
return j2_mcc(Pt4, by, mer)(wir_r,
u2_rt(wir_r,
n_a,
j2_mcc(Pt4, by, mer)(wir_r,
l_a,
u2_rt(wir_r,
n_b,
l_b,
u2_nul)),
r_a),
r_b);
}
else {
return j2_mcc(Pt4, by, mer)(wir_r,
u2_rt(wir_r,
n_a,
l_a,
j2_mcc(Pt4, by, mer)(wir_r,
r_a,
u2_rt(wir_r,
n_b,
u2_nul,
r_b))),
l_b);
}
}
}
}
u2_weak // transfer
j2_mc(Pt4, by, mer)(u2_wire wir_r,
u2_noun cor) // retain
{
u2_noun a, b;
if ( u2_no == u2_mean(cor, u2_cv_sam, &b, u2_cv_con_sam, &a, 0) ) {
return u2_bl_bail(wir_r, c3__exit);
} else {
return j2_mcc(Pt4, by, mer)(wir_r, a, b);
}
}
/* structures
*/
u2_ho_jet
j2_mcj(Pt4, by, mer)[] = {
{ ".2", c3__lite, j2_mc(Pt4, by, mer), Tier4, u2_none, u2_none },
{ }
};

109
gen164/4/by_uni.c
View File

@ -1,4 +1,4 @@
/* j/4/uni.c /* j/4/by_uni.c
** **
** This file is in the public domain. ** This file is in the public domain.
*/ */
@ -12,25 +12,105 @@
u2_noun a, // retain u2_noun a, // retain
u2_noun b) // retain u2_noun b) // retain
{ {
if ( u2_nul == b ) { if ( u2_nul == a ) {
return u2k(a); return u2_rx(wir_r, b);
}
else if ( u2_nul == b ) {
return u2_rx(wir_r, a);
} }
else { else {
u2_noun l_b, n_b, r_b; u2_noun l_a, n_a, r_a, lr_a, p_n_a, q_n_a;
u2_noun pn_b, qn_b; u2_noun l_b, n_b, r_b, lr_b, p_n_b, q_n_b;
if ( (u2_no == u2_as_trel(b, &n_b, &l_b, &r_b)) || if ( (u2_no == u2_as_cell(a, &n_a, &lr_a)) ) {
(u2_no == u2_as_cell(n_b, &pn_b, &qn_b)) )
{
return u2_bl_bail(wir_r, c3__exit); return u2_bl_bail(wir_r, c3__exit);
} }
else if ( (u2_no == u2_as_cell(b, &n_b, &lr_b)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( (u2_no == u2_as_cell(n_a, &p_n_a, &q_n_a)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( (u2_no == u2_as_cell(n_b, &p_n_b, &q_n_b)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(lr_a, &l_a, &r_a) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(lr_b, &l_b, &r_b) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_yes == j2_mbc(Pt3, vor)(wir_r, p_n_a, p_n_b) ) {
if ( u2_yes == u2_sing(p_n_a, p_n_b) ) {
return u2_rt(wir_r, u2_rx(wir_r, n_b),
j2_mcc(Pt4, by, uni)(
wir_r, u2_rx(wir_r, l_a), u2_rx(wir_r, l_b)),
j2_mcc(Pt4, by, uni)(
wir_r, u2_rx(wir_r, r_a), u2_rx(wir_r, r_b)));
}
else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, p_n_b, p_n_a) ) {
return j2_mcc(Pt4, by, uni)(
wir_r,
u2_rt(wir_r,
u2_rx(wir_r, n_a),
j2_mcc(Pt4, by, uni)(wir_r,
u2_rx(wir_r, l_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
u2_rx(wir_r, l_b),
u2_rx(wir_r, u2_nul))),
u2_rx(wir_r, r_a)),
u2_rx(wir_r, r_b));
}
else {
return j2_mcc(Pt4, by, uni)(
wir_r,
u2_rt(wir_r,
u2_rx(wir_r, n_a),
u2_rx(wir_r, l_a),
j2_mcc(Pt4, by, uni)(wir_r,
u2_rx(wir_r, r_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
u2_rx(wir_r, u2_nul),
u2_rx(wir_r, r_b)))),
u2_rx(wir_r, l_b));
}
}
else if ( u2_yes == u2_sing(p_n_b, p_n_a) ) {
return u2_rt(
wir_r,
u2_rx(wir_r, n_b),
j2_mcc(Pt4, by, uni)(wir_r, u2_rx(wir_r, r_b), u2_rx(wir_r, r_a)),
j2_mcc(Pt4, by, uni)(wir_r, u2_rx(wir_r, l_b), u2_rx(wir_r, l_a)));
}
else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, p_n_a, p_n_b) ) {
return j2_mcc(Pt4, by, uni)(
wir_r,
u2_rx(wir_r, r_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
j2_mcc(Pt4, by, uni)(wir_r,
u2_rt(wir_r,
u2_rx(wir_r, n_a),
u2_rx(wir_r, l_a),
u2_rx(wir_r, u2_nul)),
u2_rx(wir_r, l_b)),
u2_rx(wir_r, r_b)));
}
else { else {
u2_noun l = j2_mcc(Pt4, by, uni)(wir_r, a, l_b); return j2_mcc(Pt4, by, uni)(
u2_noun r = j2_mcc(Pt4, by, uni)(wir_r, l, r_b); wir_r,
u2_noun z = j2_mcc(Pt4, by, put)(wir_r, r, pn_b, qn_b); u2_rx(wir_r, l_a),
u2_rt(wir_r,
u2z(l); u2z(r); u2_rx(wir_r, n_b),
return z; u2_rx(wir_r, l_b),
j2_mcc(Pt4, by, uni)(wir_r,
u2_rx(wir_r, r_b),
u2_rt(wir_r,
u2_rx(wir_r, n_a),
u2_rx(wir_r, u2_nul),
u2_rx(wir_r, r_a)))));
} }
} }
} }
@ -54,3 +134,4 @@
{ ".2", c3__lite, j2_mc(Pt4, by, uni), Tier4, u2_none, u2_none }, { ".2", c3__lite, j2_mc(Pt4, by, uni), Tier4, u2_none, u2_none },
{ } { }
}; };

6
gen164/4/in.c
View File

@ -9,9 +9,10 @@
*/ */
extern u2_ho_jet j2_mcj(Pt4, in, gas)[]; extern u2_ho_jet j2_mcj(Pt4, in, gas)[];
extern u2_ho_jet j2_mcj(Pt4, in, has)[]; extern u2_ho_jet j2_mcj(Pt4, in, has)[];
extern u2_ho_jet j2_mcj(Pt4, in, mer)[]; extern u2_ho_jet j2_mcj(Pt4, in, int)[];
extern u2_ho_jet j2_mcj(Pt4, in, put)[]; extern u2_ho_jet j2_mcj(Pt4, in, put)[];
extern u2_ho_jet j2_mcj(Pt4, in, tap)[]; extern u2_ho_jet j2_mcj(Pt4, in, tap)[];
extern u2_ho_jet j2_mcj(Pt4, in, uni)[];
/* structures /* structures
*/ */
@ -19,9 +20,10 @@
j2_mbd(Pt4, in)[] = { j2_mbd(Pt4, in)[] = {
{ j2_sc(Pt4, in, gas), j2_mcj(Pt4, in, gas), 0, 0, u2_none }, { j2_sc(Pt4, in, gas), j2_mcj(Pt4, in, gas), 0, 0, u2_none },
{ j2_sc(Pt4, in, has), j2_mcj(Pt4, in, has), 0, 0, u2_none }, { j2_sc(Pt4, in, has), j2_mcj(Pt4, in, has), 0, 0, u2_none },
{ j2_sc(Pt4, in, mer), j2_mcj(Pt4, in, mer), 0, 0, u2_none }, { j2_sc(Pt4, in, int), j2_mcj(Pt4, in, int), 0, 0, u2_none },
{ j2_sc(Pt4, in, put), j2_mcj(Pt4, in, put), 0, 0, u2_none }, { j2_sc(Pt4, in, put), j2_mcj(Pt4, in, put), 0, 0, u2_none },
{ j2_sc(Pt4, in, tap), j2_mcj(Pt4, in, tap), 0, 0, u2_none }, { j2_sc(Pt4, in, tap), j2_mcj(Pt4, in, tap), 0, 0, u2_none },
{ j2_sc(Pt4, in, uni), j2_mcj(Pt4, in, uni), 0, 0, u2_none },
{} {}
}; };

63
gen164/4/in_mer.c → gen164/4/in_int.c
View File

@ -1,4 +1,4 @@
/* j/4/in_mer.c /* j/4/in_int.c
** **
** This file is in the public domain. ** This file is in the public domain.
*/ */
@ -8,15 +8,15 @@
/* functions /* functions
*/ */
u2_weak // transfer u2_weak // transfer
j2_mcc(Pt4, in, mer)(u2_wire wir_r, j2_mcc(Pt4, in, int)(u2_wire wir_r,
u2_noun a, // retain u2_noun a, // retain
u2_noun b) // retain u2_noun b) // retain
{ {
if ( u2_nul == a ) { if ( u2_nul == a ) {
return u2_rx(wir_r, b); return u2_rx(wir_r, u2_nul);
} }
else if ( u2_nul == b ) { else if ( u2_nul == b ) {
return u2_rx(wir_r, a); return u2_rx(wir_r, u2_nul);
} }
else { else {
u2_noun l_a, n_a, r_a, lr_a; u2_noun l_a, n_a, r_a, lr_a;
@ -43,40 +43,38 @@
} }
else if ( u2_yes == u2_sing(n_a, n_b) ) { else if ( u2_yes == u2_sing(n_a, n_b) ) {
return u2_rt(wir_r, u2_rx(wir_r, n_a), return u2_rt(wir_r, u2_rx(wir_r, n_a),
j2_mcc(Pt4, in, mer)(wir_r, l_a, l_b), j2_mcc(Pt4, in, int)(wir_r, l_a, l_b),
j2_mcc(Pt4, in, mer)(wir_r, r_a, r_b)); j2_mcc(Pt4, in, int)(wir_r, r_a, r_b));
} }
else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, n_b, n_a) ) { else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, n_b, n_a) ) {
return j2_mcc(Pt4, in, mer)(wir_r, return j2_mcc(Pt4, in, uni)(wir_r,
u2_rt(wir_r, j2_mcc(Pt4, in, int)(wir_r,
n_a, l_a,
j2_mcc(Pt4, in, mer)(wir_r, u2_rt(wir_r,
l_a, n_b,
u2_rt(wir_r, l_b,
n_b, u2_nul)),
l_b, j2_mcc(Pt4, in, int)(wir_r,
u2_nul)), a,
r_a), r_b));
r_b);
} }
else { else {
return j2_mcc(Pt4, in, mer)(wir_r, return j2_mcc(Pt4, in, uni)(wir_r,
u2_rt(wir_r, j2_mcc(Pt4, in, int)(wir_r,
n_a, r_a,
l_a, u2_rt(wir_r,
j2_mcc(Pt4, in, mer)(wir_r, n_b,
r_a, u2_nul,
u2_rt(wir_r, r_b)),
n_b, j2_mcc(Pt4, in, int)(wir_r,
u2_nul, a,
r_b))), l_b));
l_b);
} }
} }
} }
} }
u2_weak // transfer u2_weak // transfer
j2_mc(Pt4, in, mer)(u2_wire wir_r, j2_mc(Pt4, in, int)(u2_wire wir_r,
u2_noun cor) // retain u2_noun cor) // retain
{ {
u2_noun a, b; u2_noun a, b;
@ -84,15 +82,16 @@
if ( u2_no == u2_mean(cor, u2_cv_sam, &b, u2_cv_con_sam, &a, 0) ) { if ( u2_no == u2_mean(cor, u2_cv_sam, &b, u2_cv_con_sam, &a, 0) ) {
return u2_bl_bail(wir_r, c3__exit); return u2_bl_bail(wir_r, c3__exit);
} else { } else {
return j2_mcc(Pt4, in, mer)(wir_r, a, b); return j2_mcc(Pt4, in, int)(wir_r, a, b);
} }
} }
/* structures /* structures
*/ */
u2_ho_jet u2_ho_jet
j2_mcj(Pt4, in, mer)[] = { j2_mcj(Pt4, in, int)[] = {
{ ".2", c3__lite, j2_mc(Pt4, in, mer), Tier4, u2_none, u2_none }, { ".2", c3__lite, j2_mc(Pt4, in, int), Tier4, u2_none, u2_none },
{ } { }
}; };

139
gen164/4/in_uni.c Normal file
View File

@ -0,0 +1,139 @@
/* j/4/in_uni.c
**
** This file is in the public domain.
*/
#include "all.h"
#include "../pit.h"
/* functions
*/
u2_weak // transfer
j2_mcc(Pt4, in, uni)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b) // retain
{
if ( u2_nul == a ) {
return u2_rx(wir_r, b);
}
else if ( u2_nul == b ) {
return u2_rx(wir_r, a);
}
else {
u2_noun l_a, n_a, r_a, lr_a;
u2_noun l_b, n_b, r_b, lr_b;
if ( (u2_no == u2_as_cell(a, &n_a, &lr_a)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( (u2_no == u2_as_cell(b, &n_b, &lr_b)) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else {
if ( u2_yes == j2_mbc(Pt3, vor)(wir_r, n_a, n_b) ) {
if ( u2_no == u2_as_cell(lr_a, &l_a, &r_a) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(lr_b, &l_b, &r_b) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_yes == u2_sing(n_a, n_b) ) {
return u2_rt(
wir_r,
u2_rx(wir_r, n_b),
j2_mcc(Pt4, in, uni)(wir_r, u2_rx(wir_r, l_a), u2_rx(wir_r, l_b)),
j2_mcc(Pt4, in, uni)(wir_r, u2_rx(wir_r, r_a), u2_rx(wir_r, r_b)));
}
else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, n_b, n_a) ) {
return j2_mcc(Pt4, in, uni)(
wir_r,
u2_rt(wir_r,
u2_rx(wir_r, n_a),
j2_mcc(Pt4, in, uni)(wir_r,
u2_rx(wir_r, l_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
u2_rx(wir_r, l_b),
u2_rx(wir_r, u2_nul))),
u2_rx(wir_r, r_a)),
u2_rx(wir_r, r_b));
}
else {
return j2_mcc(Pt4, in, uni)(
wir_r,
u2_rt(wir_r,
u2_rx(wir_r, n_a),
u2_rx(wir_r, l_a),
j2_mcc(Pt4, in, uni)(wir_r,
u2_rx(wir_r, r_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
u2_rx(wir_r, u2_nul),
u2_rx(wir_r, r_b)))),
u2_rx(wir_r, l_b));
}
}
else if ( u2_no == u2_as_cell(lr_b, &l_b, &r_b) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_no == u2_as_cell(lr_a, &l_a, &r_a) ) {
return u2_bl_bail(wir_r, c3__exit);
}
else if ( u2_yes == u2_sing(n_b, n_a) ) {
return u2_rt(
wir_r,
u2_rx(wir_r, n_b),
j2_mcc(Pt4, in, uni)(wir_r, u2_rx(wir_r, r_b), u2_rx(wir_r, r_a)),
j2_mcc(Pt4, in, uni)(wir_r, u2_rx(wir_r, l_b), u2_rx(wir_r, l_a)));
}
else if ( u2_yes == j2_mbc(Pt3, hor)(wir_r, n_a, n_b) ) {
return j2_mcc(Pt4, in, uni)(
wir_r,
u2_rx(wir_r, r_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
j2_mcc(Pt4, in, uni)(wir_r,
u2_rt(wir_r,
u2_rx(wir_r, n_a),
u2_rx(wir_r, l_a),
u2_nul),
u2_rx(wir_r, l_b)),
u2_rx(wir_r, r_b)));
}
else {
return j2_mcc(Pt4, in, uni)(
wir_r,
u2_rx(wir_r, l_a),
u2_rt(wir_r,
u2_rx(wir_r, n_b),
u2_rx(wir_r, l_b),
j2_mcc(Pt4, in, uni)(wir_r,
u2_rt(wir_r,
u2_rx(wir_r, n_a),
u2_rx(wir_r, u2_nul),
u2_rx(wir_r, r_a)),
u2_rx(wir_r, r_b))));
}
}
}
}
u2_weak // transfer
j2_mc(Pt4, in, uni)(u2_wire wir_r,
u2_noun cor) // retain
{
u2_noun a, b;
if ( u2_no == u2_mean(cor, u2_cv_sam, &b, u2_cv_con_sam, &a, 0) ) {
return u2_bl_bail(wir_r, c3__exit);
} else {
return j2_mcc(Pt4, in, uni)(wir_r, a, b);
}
}
/* structures
*/
u2_ho_jet
j2_mcj(Pt4, in, uni)[] = {
{ ".2", c3__lite, j2_mc(Pt4, in, uni), Tier4, u2_none, u2_none },
{ }
};

108
gen164/6/ap.c
View File

@ -85,6 +85,15 @@
} }
/*** /***
**** ****
***/
_open_do_p(bczp) // $!
{
return u2_bt
(wir_r, c3__bccb, c3__axil, u2_rx(wir_r, p_gen));
}
/***
****
***/ ***/
_open_do_p(brhp) // |- _open_do_p(brhp) // |-
{ {
@ -274,6 +283,15 @@
/*** /***
**** ****
***/ ***/
_open_do_pq(cncb) // %_
{
return u2_bc
(wir_r, c3__ktls,
u2_bq(wir_r, u2_bc(wir_r, c3__cnzz, u2_rx(wir_r, p_gen)),
c3__cnts,
u2_rx(wir_r, p_gen),
u2_rx(wir_r, q_gen)));
}
_open_do_pq(cncl) // %: _open_do_pq(cncl) // %:
{ {
return u2_bq return u2_bq
@ -334,21 +352,60 @@
u2_bc(wir_r, u2_nul, _6)), u2_bc(wir_r, u2_nul, _6)),
u2_rx(wir_r, r_gen)))); u2_rx(wir_r, r_gen))));
} }
_open_do_p(cnzy) // %cnzy
{
return u2_bt
(wir_r, c3__cnts,
u2_bc(wir_r, u2_rx(wir_r, p_gen), u2_nul),
u2_nul);
}
_open_do_p(cnzz) // %cnzz
{
return u2_bt
(wir_r, c3__cnts, u2_rx(wir_r, p_gen), u2_nul);
}
/***
****
***/
_open_do_p(hxgl) // #<
{
return u2_bq
(wir_r, c3__cnhp,
u2_bc(wir_r, c3__cnzy, c3__noah),
u2_bc(wir_r, c3__zpgr,
u2_bc(wir_r, c3__cltr, u2_rx(wir_r, p_gen))),
u2_nul);
}
_open_do_p(hxgr) // #>
{
return u2_bq
(wir_r, c3__cnhp,
u2_bc(wir_r, c3__cnzy, c3__cain),
u2_bc(wir_r, c3__zpgr,
u2_bc(wir_r, c3__cltr, u2_rx(wir_r, p_gen))),
u2_nul);
}
/***
****
***/
_open_do_pq(ktdt) // ^.
{
return u2_bt
(wir_r, c3__ktls,
u2_bq(wir_r, c3__cnhp, u2_rx(wir_r, p_gen), u2_rx(wir_r, q_gen), u2_nul),
u2_rx(wir_r, q_gen));
}
/*** /***
**** ****
***/ ***/
_open_do_pq(brcb) // |_ _open_do_pq(brcb) // |_
{ {
// [%brcb *] [%tsls [%bctr p.gen] [%brcn q.gen]]
return u2_bt(wir_r, c3__tsls, return u2_bt(wir_r, c3__tsls,
u2_bc(wir_r, c3__bctr, u2_rx(wir_r, p_gen)), u2_bc(wir_r, c3__bctr, u2_rx(wir_r, p_gen)),
u2_bc(wir_r, c3__brcn, u2_rx(wir_r, q_gen))); u2_bc(wir_r, c3__brcn, u2_rx(wir_r, q_gen)));
} }
_open_do_pq(brkt) // &- _open_do_pq(brkt) // |^
{ {
// [%brkt *] [%tsgr [%brcn (~(put by q.gen) %% [%ash p.gen])] %%]
//
u2_noun diz = u2_bc(wir_r, c3__ash, u2_rx(wir_r, p_gen)); u2_noun diz = u2_bc(wir_r, c3__ash, u2_rx(wir_r, p_gen));
u2_noun ret = u2_bt u2_noun ret = u2_bt
(wir_r, (wir_r,
@ -361,6 +418,13 @@
u2_rz(wir_r, diz); u2_rz(wir_r, diz);
return ret; return ret;
} }
_open_do_pq(brls) // |+
{
return u2_bc(wir_r, c3__ktbr,
u2_bt(wir_r, c3__brts,
u2_rx(wir_r, p_gen),
u2_rx(wir_r, q_gen)));
}
/*** /***
**** ****
***/ ***/
@ -391,6 +455,15 @@
u2_bq(wir_r, c3__live, u2_bq(wir_r, c3__live,
c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)), c3__dtzz, u2_blip, u2_rx(wir_r, p_gen)),
u2_rx(wir_r, q_gen)); u2_rx(wir_r, q_gen));
}
_open_do_pq(sgcb) // ~_
{
return u2_bt
(wir_r, c3__sggr,
u2_bc(wir_r, c3__mean,
u2_bc(wir_r, c3__brdt,
u2_rx(wir_r, p_gen))),
u2_rx(wir_r, q_gen));
} }
static u2_noun static u2_noun
_sgcn_a(u2_wire wir_r, _sgcn_a(u2_wire wir_r,
@ -428,6 +501,15 @@
_sgcn_a(wir_r, r_gen, u2_nul))), _sgcn_a(wir_r, r_gen, u2_nul))),
u2_rx(wir_r, s_gen)); u2_rx(wir_r, s_gen));
} }
_open_do_pq(sgfs) // ~/
{
return u2_bc
(wir_r, c3__sgcn,
u2_bq(wir_r, u2_rx(wir_r, p_gen),
u2_bc(wir_r, u2_nul, _7),
u2_nul,
u2_rx(wir_r, q_gen)));
}
_open_do_pq(sgls) // ~+ _open_do_pq(sgls) // ~+
{ {
return u2_bt return u2_bt
@ -533,32 +615,48 @@
return u2_bl_bail(wir_r, c3__fail); \ return u2_bl_bail(wir_r, c3__fail); \
} else return _open_in_##stem(wir_r, p_gen, q_gen, r_gen, s_gen); } else return _open_in_##stem(wir_r, p_gen, q_gen, r_gen, s_gen);
_open_p (bczp);
_open_p (brhp); _open_p (brhp);
_open_p (brdt); _open_p (brdt);
_open_pq (brcb); _open_pq (brcb);
_open_pq (brkt); _open_pq (brkt);
_open_pq (brls);
_open_pq (clcb); _open_pq (clcb);
_open_pq (clhp); _open_pq (clhp);
_open_pqrs(clkt); _open_pqrs(clkt);
_open_pqr (clls); _open_pqr (clls);
_open_p (cltr); _open_p (cltr);
_open_p (clsg); _open_p (clsg);
_open_pq (cncb);
_open_pq (cncl); _open_pq (cncl);
_open_pq (cndt); _open_pq (cndt);
_open_pqrs(cnkt); _open_pqrs(cnkt);
_open_pq (cnhp); _open_pq (cnhp);
_open_pqr (cnls); _open_pqr (cnls);
_open_pqr (cnsg); _open_pqr (cnsg);
_open_p (cnzy);
_open_p (cnzz);
_open_p (hxgl);
_open_p (hxgr);
_open_pq (ktdt);
_open_pq (sgts); _open_pq (sgts);
_open_pq (sgbr); _open_pq (sgbr);
_open_pq (sggl); _open_pq (sggl);
_open_pq (sgbc); _open_pq (sgbc);
_open_pq (sgcb);
_open_pqrs(sgcn); _open_pqrs(sgcn);
_open_pq (sgfs);
_open_pq (sgls); _open_pq (sgls);
_open_pq (smcl); _open_pq (smcl);
_open_pq (tsgl); _open_pq (tsgl);
_open_pq (tshp); _open_pq (tshp);
_open_pq (tsls); _open_pq (tsls);
_open_pqr (wtdt); _open_pqr (wtdt);
_open_pq (wtgl); _open_pq (wtgl);
_open_p (wtzp); _open_p (wtzp);

34
gen164/pit.h
View File

@ -294,11 +294,6 @@
/** Tier 4. /** Tier 4.
**/ **/
u2_weak // transfer
j2_mcc(Pt4, in, put)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b); // retain
u2_weak // transfer u2_weak // transfer
j2_mcc(Pt4, in, gas)(u2_wire wir_r, j2_mcc(Pt4, in, gas)(u2_wire wir_r,
u2_noun a, // retain u2_noun a, // retain
@ -309,16 +304,42 @@
u2_noun a, // retain u2_noun a, // retain
u2_noun b); // retain u2_noun b); // retain
u2_weak // transfer
j2_mcc(Pt4, in, int)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b); // retain
u2_weak // transfer
j2_mcc(Pt4, in, put)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b); // retain
u2_weak // transfer u2_weak // transfer
j2_mcc(Pt4, in, tap)(u2_wire wir_r, j2_mcc(Pt4, in, tap)(u2_wire wir_r,
u2_noun a, // retain u2_noun a, // retain
u2_noun b); // retain u2_noun b); // retain
u2_weak // transfer
j2_mcc(Pt4, in, uni)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b); // retain
u2_noun // transfer u2_noun // transfer
j2_mcc(Pt4, by, get)(u2_wire wir_r, j2_mcc(Pt4, by, get)(u2_wire wir_r,
u2_noun a, // retain u2_noun a, // retain
u2_noun b); // retain u2_noun b); // retain
u2_weak // transfer
j2_mcc(Pt4, by, gas)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b); // retain
u2_weak // transfer
j2_mcc(Pt4, by, int)(u2_wire wir_r,
u2_noun a, // retain
u2_noun b); // retain
u2_weak // transfer u2_weak // transfer
j2_mcc(Pt4, by, put)(u2_wire wir_r, j2_mcc(Pt4, by, put)(u2_wire wir_r,
u2_noun a, // retain u2_noun a, // retain
@ -326,9 +347,10 @@
u2_noun c); // retain u2_noun c); // retain
u2_weak // transfer u2_weak // transfer
j2_mcc(Pt4, by, gas)(u2_wire wir_r, j2_mcc(Pt4, by, uni)(u2_wire wir_r,
u2_noun a, // retain u2_noun a, // retain
u2_noun b); // retain u2_noun b); // retain
/** Tier 5. /** Tier 5.
**/ **/
u2_noun // transfer u2_noun // transfer

9
include/c/motes.h
View File

@ -41,6 +41,7 @@
# define c3__bbye c3_s4('b','b','y','e') # define c3__bbye c3_s4('b','b','y','e')
# define c3__bcbn c3_s4('b','c','b','n') # define c3__bcbn c3_s4('b','c','b','n')
# define c3__bcbr c3_s4('b','c','b','r') # define c3__bcbr c3_s4('b','c','b','r')
# define c3__bccb c3_s4('b','c','c','b')
# define c3__bccn c3_s4('b','c','c','n') # define c3__bccn c3_s4('b','c','c','n')
# define c3__bcdg c3_s4('b','c','d','g') # define c3__bcdg c3_s4('b','c','d','g')
# define c3__bckt c3_s4('b','c','k','t') # define c3__bckt c3_s4('b','c','k','t')
@ -51,6 +52,7 @@
# define c3__bcsg c3_s4('b','c','s','g') # define c3__bcsg c3_s4('b','c','s','g')
# define c3__bctr c3_s4('b','c','t','r') # define c3__bctr c3_s4('b','c','t','r')
# define c3__bcts c3_s4('b','c','t','s') # define c3__bcts c3_s4('b','c','t','s')
# define c3__bczp c3_s4('b','c','z','p')
# define c3__bead c3_s4('b','e','a','d') # define c3__bead c3_s4('b','e','a','d')
# define c3__bean c3_s4('b','e','a','n') # define c3__bean c3_s4('b','e','a','n')
# define c3__bear c3_s4('b','e','a','r') # define c3__bear c3_s4('b','e','a','r')
@ -142,6 +144,7 @@
# define c3__by c3_s2('b','y') # define c3__by c3_s2('b','y')
# define c3__byte c3_s4('b','y','t','e') # define c3__byte c3_s4('b','y','t','e')
# define c3__cage c3_s4('c','a','g','e') # define c3__cage c3_s4('c','a','g','e')
# define c3__cain c3_s4('c','a','i','n')
# define c3__call c3_s4('c','a','l','l') # define c3__call c3_s4('c','a','l','l')
# define c3__can c3_s3('c','a','n') # define c3__can c3_s3('c','a','n')
# define c3__cap c3_s3('c','a','p') # define c3__cap c3_s3('c','a','p')
@ -188,6 +191,7 @@
# define c3__cltr c3_s4('c','l','t','r') # define c3__cltr c3_s4('c','l','t','r')
# define c3__cnbc c3_s4('c','n','b','c') # define c3__cnbc c3_s4('c','n','b','c')
# define c3__cnbr c3_s4('c','n','b','r') # define c3__cnbr c3_s4('c','n','b','r')
# define c3__cncb c3_s4('c','n','c','b')
# define c3__cncl c3_s4('c','n','c','l') # define c3__cncl c3_s4('c','n','c','l')
# define c3__cndt c3_s4('c','n','d','t') # define c3__cndt c3_s4('c','n','d','t')
# define c3__cnhp c3_s4('c','n','h','p') # define c3__cnhp c3_s4('c','n','h','p')
@ -500,6 +504,8 @@
# define c3__hunk c3_s4('h','u','n','k') # define c3__hunk c3_s4('h','u','n','k')
# define c3__hxtr c3_s4('h','x','t','r') # define c3__hxtr c3_s4('h','x','t','r')
# define c3__hxts c3_s4('h','x','t','s') # define c3__hxts c3_s4('h','x','t','s')
# define c3__hxgl c3_s4('h','x','g','l')
# define c3__hxgr c3_s4('h','x','g','r')
# define c3__ic c3_s2('i','c') # define c3__ic c3_s2('i','c')
# define c3__ice c3_s3('i','c','e') # define c3__ice c3_s3('i','c','e')
# define c3__if c3_s2('i','f') # define c3__if c3_s2('i','f')
@ -685,6 +691,7 @@
# define c3__nil c3_s3('n','i','l') # define c3__nil c3_s3('n','i','l')
# define c3__nilk c3_s4('n','i','l','k') # define c3__nilk c3_s4('n','i','l','k')
# define c3__no c3_s2('n','o') # define c3__no c3_s2('n','o')
# define c3__noah c3_s4('n','o','a','h')
# define c3__nock c3_s4('n','o','c','k') # define c3__nock c3_s4('n','o','c','k')
# define c3__none c3_s4('n','o','n','e') # define c3__none c3_s4('n','o','n','e')
# define c3__nop c3_s3('n','o','p') # define c3__nop c3_s3('n','o','p')
@ -873,6 +880,7 @@
# define c3__sgdp c3_s4('s','g','d','p') # define c3__sgdp c3_s4('s','g','d','p')
# define c3__sgdt c3_s4('s','g','d','t') # define c3__sgdt c3_s4('s','g','d','t')
# define c3__sgdx c3_s4('s','g','d','x') # define c3__sgdx c3_s4('s','g','d','x')
# define c3__sgfs c3_s4('s','g','f','s')
# define c3__sggl c3_s4('s','g','g','l') # define c3__sggl c3_s4('s','g','g','l')
# define c3__sggr c3_s4('s','g','g','r') # define c3__sggr c3_s4('s','g','g','r')
# define c3__sghp c3_s4('s','g','h','p') # define c3__sghp c3_s4('s','g','h','p')
@ -1136,6 +1144,7 @@
# define c3__zpdg c3_s4('z','p','d','g') # define c3__zpdg c3_s4('z','p','d','g')
# define c3__zpdx c3_s4('z','p','d','x') # define c3__zpdx c3_s4('z','p','d','x')
# define c3__zpfs c3_s4('z','p','f','s') # define c3__zpfs c3_s4('z','p','f','s')
# define c3__zpgr c3_s4('z','p','g','r')
# define c3__zphs c3_s4('z','p','h','x') # define c3__zphs c3_s4('z','p','h','x')
# define c3__zphx c3_s4('z','p','h','x') # define c3__zphx c3_s4('z','p','h','x')
# define c3__zplc c3_s4('z','p','l','c') # define c3__zplc c3_s4('z','p','l','c')