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

Old help totally cleaned out.

Browse Source
This commit is contained in:
Curtis Yarvin 2018-05-24 15:40:28 -07:00
parent fde39c38e8
commit 7a9a9047c3
17 changed files with 145 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/c/motes.h
View File

@ -240,6 +240,7 @@
# define c3__cook c3_s4('c','o','o','k')
# define c3__cool c3_s4('c','o','o','l')
# define c3__core c3_s4('c','o','r','e')
# define c3__corp c3_s4('c','o','r','p')
# define c3__corm c3_s4('c','o','r','m')
# define c3__cow c3_s3('c','o','w')
# define c3__cpu c3_s3('c','p','u')

2
include/jets/q.h
View File

@ -297,6 +297,8 @@
u3_noun u3qzp_open(u3_noun, u3_noun, u3_noun);
u3_noun u3qzp_rake(u3_noun);
void u3qf_test(const c3_c*, u3_noun);
# define u3qzu_van_fan 28
# define u3qzu_van_rib 58
# define u3qzu_van_vrf 59

1
jets/f/ap.c
View File

@ -511,6 +511,7 @@
u3qdb_put(q_gen, u3_blip, diz)),
u3nc(c3__cnzy, u3_blip));
c3_assert(0);
u3z(diz);
return ret;
}

76
jets/f/core.c
View File

@ -40,3 +40,79 @@
return u3qf_core(pac, con);
}
}
#if 0
static void
_fork_test(const c3_c *lab_c, u3_noun set)
{
if ( u3_nul == set ) {
return;
} else {
u3_noun n_set, l_set, r_set;
u3x_trel(set, &n_set, &l_set, &r_set);
u3qf_test(lab_c, n_set);
_fork_test(lab_c, l_set);
_fork_test(lab_c, r_set);
}
}
void
u3qf_test(const c3_c* lab_c, u3_noun sut)
{
u3_noun p_sut, q_sut;
if ( c3n == u3du(sut) ) switch ( sut ) {
default: u3m_bail(c3__fail); return;
case c3__noun:
{
return;
}
case c3__void:
{
return;
}
}
else switch ( u3h(sut) ) {
default: u3m_bail(c3__fail); return;
case c3__atom: u3x_cell(u3t(sut), &p_sut, &q_sut);
{
return;
}
case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut);
{
u3qf_test(lab_c, p_sut);
u3qf_test(lab_c, q_sut);
return;
}
case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut);
{
u3qf_test(lab_c, p_sut);
return;
}
case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut);
{
u3qf_test(lab_c, q_sut);
return;
}
case c3__fork: p_sut = u3t(sut);
{
_fork_test(lab_c, p_sut);
return;
}
case c3__hint: u3x_cell(u3t(sut), &p_sut, &q_sut);
{
u3qf_test(lab_c, q_sut);
u3qf_test(lab_c, u3h(p_sut));
return;
}
case c3__hold: u3x_cell(u3t(sut), &p_sut, &q_sut);
{
u3qf_test(lab_c, p_sut);
return;
}
}
}
#endif

4
jets/f/loot.c
View File

@ -22,8 +22,8 @@
return u3m_bail(c3__fail);
}
else {
u3_noun qn_dom = u3t(n_dom);
u3_noun yep = u3qf_look(cog, qn_dom);
u3_noun qqn_dom = u3t(u3t(n_dom));
u3_noun yep = u3qf_look(cog, qqn_dom);
if ( (u3_nul == l_dom) && (u3_nul == r_dom) ) {
if ( u3_nul == yep ) {

5
jets/f/type.c
View File

@ -35,7 +35,10 @@
case c3__fork: p_sut = u3t(sut);
{
}
case c3__hold: p_sut = u3t(sut);
case c3__hint: u3x_cell(u3t(sut), &p_sut, &q_sut);
{
}
case c3__hold: u3x_cell(u3t(sut), &p_sut, &q_sut);
{
}
}

2
jets/f/ut_crop.c
View File

@ -257,7 +257,7 @@
u3_noun sut,
u3_noun ref)
{
c3_m fun_m = 144 + c3__crop + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__crop + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_2(fun_m, sut, ref);
if ( u3_none != pro ) {

39
jets/f/ut_find.c
View File

@ -224,7 +224,7 @@
u3_noun u_zem = u3t(zem);
u3_noun pu_zem = u3h(u_zem);
u3_noun qu_zem = u3t(u_zem);
u3_noun qqu_zem = u3t(qu_zem);
u3_noun zut;
u3_noun mut;
u3_noun pro;
@ -236,21 +236,20 @@
#if 1
if ( qpq_sut == c3__wet ) {
if ( u3h(qqu_zem) != c3__elm ) {
return u3m_error("wet-elm-mismatch");
}
} else if ( qpq_sut == c3__dry ) {
if ( u3h(qqu_zem) != c3__ash) {
return u3m_error("dry-ash-mismatch");
}
} else u3m_bail(c3__fail);
zut = u3nc(c3__elm, u3k(qu_zem));
}
else if ( qpq_sut == c3__dry ) {
zut = u3nc(c3__ash, u3k(qu_zem));
}
else u3m_bail(c3__fail);
#endif
pro = u3nt
(c3y,
u3nc(u3nc(u3_nul, u3k(axe)), u3k(lon)),
u3nt(c3n,
u3qc_peg(2, pu_zem),
u3nt(u3nc(mut, u3k(qqu_zem)), u3_nul, u3_nul)));
u3nt(u3nc(mut, zut), u3_nul, u3_nul)));
u3z(zem);
return pro;
@ -552,17 +551,16 @@
else {
u3_noun pp_sut = u3h(p_sut); // (map term {wain (unit twig)})
u3_noun qp_sut = u3t(p_sut); // (list (pair type nock))
u3_noun tyr = u3qdb_get(pp_sut, uq_heg); // (unit {wain (unit twig)})
u3_noun tyr = u3qdb_get(pp_sut, uq_heg); // (unit (unit twig))
if ( u3_nul == tyr ) {
return _find_buck_face_next
(van, sut, q_sut, qp_sut, way, p_heg, q_heg, axe, lon, gil);
}
else {
u3_noun u_tyr = u3t(tyr); // (pair wain (unit twig))
u3_noun qu_tyr = u3t(u_tyr);
u3_noun u_tyr = u3t(tyr); // (unit twig)
if ( u3_nul == qu_tyr ) {
if ( u3_nul == u_tyr ) {
u3_noun nol = u3nc(u3_nul, u3k(lon));
u3_noun dep = u3qa_inc(p_heg);
u3_noun ret = _find_buck
@ -574,8 +572,8 @@
return ret;
}
else {
u3_noun uqu_tyr = u3t(qu_tyr);
u3_noun tor = u3qfu_fund(van, sut, way, uqu_tyr);
u3_noun uu_tyr = u3t(u_tyr);
u3_noun tor = u3qfu_fund(van, sut, way, uu_tyr);
if ( c3y == u3h(tor) ) {
u3_noun p_tor = u3t(tor); // (pair vein opal)
@ -728,6 +726,11 @@
if ( c3y == u3h(heg) ) {
u3_noun p_heg = u3t(heg); // axis
if ( c3n == u3ud(p_heg) ) {
u3m_p("weird p_heg", p_heg);
return u3m_bail(c3__fail);
}
ret = u3nt
(c3y,
u3nc(u3nc(u3_nul, u3k(p_heg)), u3k(lon)),
@ -874,7 +877,7 @@
u3_noun way,
u3_noun hyp)
{
c3_m fun_m = 144 + c3__find + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__find + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_3(fun_m, sut, way, hyp);
if ( u3_none != pro ) {
@ -912,7 +915,7 @@
u3_noun way,
u3_noun hyp)
{
c3_m fun_m = 144 + c3__fond + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__fond + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_3(fun_m, sut, way, hyp);
if ( u3_none != pro ) {

2
jets/f/ut_fish.c
View File

@ -166,7 +166,7 @@
u3_noun sut,
u3_noun axe)
{
c3_m fun_m = 144 + c3__fish + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__fish + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_2(fun_m, sut, axe);
if ( u3_none != pro ) {

2
jets/f/ut_fuse.c
View File

@ -201,7 +201,7 @@
u3_noun sut,
u3_noun ref)
{
c3_m fun_m = 144 + c3__fuse + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__fuse + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_2(fun_m, sut, ref);
if ( u3_none != pro ) {

4
jets/f/ut_mint.c
View File

@ -717,7 +717,7 @@
_mint_used();
{
c3_m fun_m = 144 + c3__blow;
c3_m fun_m = 141 + c3__blow;
u3_noun vrf = u3r_at(u3qfu_van_vrf, van);
u3_noun pro = u3z_find_4(fun_m, vrf, sut, gol, p_gen);
@ -856,7 +856,7 @@
u3_noun gol,
u3_noun gen)
{
c3_m fun_m = 144 + c3__mint;
c3_m fun_m = 141 + c3__mint;
u3_noun vrf = u3r_at(u3qfu_van_vrf, van);
u3_noun pro = u3z_find_4(fun_m, vrf, sut, gol, gen);

2
jets/f/ut_mull.c
View File

@ -788,7 +788,7 @@
u3_noun dox,
u3_noun gen)
{
c3_m fun_m = 144 + c3__mull + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__mull + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_4(fun_m, sut, gol, dox, gen);
if ( u3_none != pro ) {

57
jets/f/ut_nest.c
View File

@ -28,7 +28,7 @@
} else {
u3_noun n_dab, l_dab, r_dab;
u3_noun n_hem, l_hem, r_hem;
u3_noun pn_hem, pqn_hem, qqn_hem, pn_dab, pqn_dab, qqn_dab;
u3_noun pn_hem, qn_hem, pn_dab, qn_dab;
u3x_trel(dab, &n_dab, &l_dab, &r_dab);
u3x_trel(hem, &n_hem, &l_hem, &r_hem);
@ -38,37 +38,21 @@
{
return c3n;
}
u3x_trel(n_dab, &pn_dab, &pqn_dab, &qqn_dab);
u3x_trel(n_hem, &pn_hem, &pqn_hem, &qqn_hem);
u3x_cell(n_dab, &pn_dab, &qn_dab);
u3x_cell(n_hem, &pn_hem, &qn_hem);
if ( c3n == u3r_sing(pn_dab, pn_hem) ) {
return c3n;
} else {
if ( (c3n == u3du(qqn_dab)) || (c3n == u3du(qqn_hem)) ) {
return u3m_bail(c3__fail);
}
else switch ( u3h(qqn_dab) ) {
default: return u3m_bail(c3__exit);
case c3__ash: {
if ( c3__ash != u3h(qqn_hem) ) {
return c3n;
} else {
u3_noun qqqn_dab = u3t(qqn_dab);
u3_noun qqqn_hem = u3t(qqn_hem);
u3_noun vis = u3qfu_play(van, sut, qqqn_dab);
u3_noun lon = u3qfu_play(van, ref, qqqn_hem);
}
else {
u3_noun vis = u3qfu_play(van, sut, qn_dab);
u3_noun lon = u3qfu_play(van, ref, qn_hem);
u3_noun ret = _nest_dext(van, vis, tel, lon, u3_nul, u3_nul, gil);
u3_noun ret = _nest_dext(van, vis, tel, lon, u3_nul, u3_nul, gil);
u3z(vis);
u3z(lon);
return ret;
}
}
case c3__elm: {
return u3r_sing(qqn_dab, qqn_hem);
}
}
u3z(vis);
u3z(lon);
return ret;
}
}
}
@ -90,6 +74,7 @@
u3_noun n_dom, l_dom, r_dom;
u3_noun n_vim, l_vim, r_vim;
u3_noun pn_vim, qn_vim, pn_dom, qn_dom;
u3_noun pqn_vim, qqn_vim, pqn_dom, qqn_dom;
u3x_trel(dom, &n_dom, &l_dom, &r_dom);
u3x_trel(vim, &n_vim, &l_vim, &r_vim);
@ -102,10 +87,13 @@
u3x_cell(n_dom, &pn_dom, &qn_dom);
u3x_cell(n_vim, &pn_vim, &qn_vim);
u3x_cell(qn_dom, &pqn_dom, &qqn_dom);
u3x_cell(qn_vim, &pqn_vim, &qqn_vim);
if ( c3n == u3r_sing(pn_dom, pn_vim) ) {
return c3n;
} else {
return _nest_deep(van, sut, tel, ref, qn_dom, qn_vim, gil);
return _nest_deep(van, sut, tel, ref, qqn_dom, qqn_vim, gil);
}
}
}
@ -140,6 +128,9 @@
if ( c3y == u3r_sing(q_sut, q_ref) ) {
return _nest_dext(van, p_sut, tel, p_ref, u3_nul, u3_nul, gil);
}
else if ( c3n == u3r_sing(qpq_sut, qpq_ref) ) {
return c3n;
}
else if ( (c3n == _nest_dext
(van, qq_sut, tel, p_sut, u3_nul, u3_nul, gil)) ||
(c3n == _nest_dext
@ -156,6 +147,12 @@
{
return c3n;
}
else if ( c3__wet == qpq_sut ) {
return u3r_sing(qrq_sut, qrq_ref);
}
else if ( c3y == u3r_sing(qrq_sut, qrq_ref) ) {
return c3y;
}
else {
u3_noun hud = u3nc(u3k(sut), u3k(ref));
@ -400,7 +397,7 @@
}
{
c3_m fun_m = 144 + c3__nest + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__nest + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_2(fun_m, sut, ref);
if ( u3_none != pro ) {
@ -545,7 +542,7 @@
u3_noun ref)
{
#if 1
c3_m fun_m = 144 + c3__nest;
c3_m fun_m = 141 + c3__nest;
u3_noun vrf = u3r_at(u3qfu_van_vrf, van);
u3_noun pro = u3z_find_4(fun_m, vrf, sut, tel, ref);

2
jets/f/ut_peek.c
View File

@ -202,7 +202,7 @@
u3_noun way,
u3_noun axe)
{
c3_m fun_m = 144 + c3__peek + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__peek + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_3(fun_m, sut, way, axe);
if ( u3_none != pro ) {

2
jets/f/ut_play.c
View File

@ -608,7 +608,7 @@
u3_noun gen)
{
#if 1
c3_m fun_m = 144 + c3__play;
c3_m fun_m = 141 + c3__play;
u3_noun vrf = u3r_at(u3qfu_van_vrf, van);
u3_noun pro = u3z_find_3(fun_m, vrf, sut, gen);

2
jets/f/ut_rest.c
View File

@ -100,7 +100,7 @@
u3_noun sut,
u3_noun leg)
{
c3_m fun_m = 144 + c3__rest + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
c3_m fun_m = 141 + c3__rest + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun pro = u3z_find_2(fun_m, sut, leg);
if ( u3_none != pro ) {

2
meson.build
View File

@ -287,7 +287,7 @@ if osdet == 'linux'
elif osdet == 'darwin'
conf_data.set('U3_OS_osx', true)
os_c_flags = os_c_flags + ['-bind_at_load']
# os_c_flags = os_c_flags + ['-bind_at_load']
# os_link_flags = ['-framework CoreServices', '-framework CoreFoundation']
if(legacy_meson)
ncurses_dep = find_library('ncurses')