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 'master' into newbreach

Browse Source 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
This commit is contained in:
Steve Dee 2014-04-29 17:43:30 -07:00
commit 8b0a6c1742
3 changed files with 23 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.markdown
View File

@ -25,8 +25,8 @@ Urbit depends on the following packages:
Building Urbit Building Urbit
-------------- --------------
See the [documentation][3] for instructions on building and running Urbit. See the [website][3] for instructions on building and running Urbit.
[1]: http://vimeo.com/75312418 [1]: http://vimeo.com/75312418
[2]: http://www.urbit.org/ [2]: http://www.urbit.org/
[3]: http://www.urbit.org/doc/ [3]: http://www.urbit.org/setup/

75
f/coal.c
View File

@ -957,84 +957,11 @@ u2_ckd_in_tap(u2_noun a, u2_noun b)
/* u2_cke_cue(): expand saved pill. /* u2_cke_cue(): expand saved pill.
*/ */
static u2_noun // produce
_cue_in(u2_wire wir_r,
u2_atom a, // retain
u2_atom b, // retain
u2_ray t_r) // retain
{
u2_noun p, q;
if ( _0 == j2_mbc(Pt3, cut)(wir_r, 0, b, 1, a) ) {
u2_noun x = j2_mbc(Pt1, inc)(wir_r, b);
u2_noun c = j2_mby(Pt5, rub)(wir_r, x, a);
p = j2_mbc(Pt1, inc)(wir_r, u2_h(c));
q = u2_rx(wir_r, u2_t(c));
q = u2_cs_save(wir_r, t_r, 0, b, q);
u2_rz(wir_r, c);
u2_rz(wir_r, x);
}
else {
u2_noun c = j2_mbc(Pt1, add)(wir_r, _2, b);
u2_noun l = j2_mbc(Pt1, inc)(wir_r, b);
if ( _0 == j2_mbc(Pt3, cut)(wir_r, 0, l, 1, a) ) {
u2_noun u, v, w;
u2_noun x, y;
u = _cue_in(wir_r, a, c, t_r);
x = j2_mbc(Pt1, add)(wir_r, u2_h(u), c);
v = _cue_in(wir_r, a, x, t_r);
w = u2_bc(wir_r, u2_rx(wir_r, u2_t(u)),
u2_rx(wir_r, u2_t(v)));
y = j2_mbc(Pt1, add)(wir_r, u2_h(u), u2_h(v));
p = j2_mbc(Pt1, add)(wir_r, _2, y);
q = u2_cs_save(wir_r, t_r, 0, b, w);
u2_rz(wir_r, u); u2_rz(wir_r, v); u2_rz(wir_r, x); u2_rz(wir_r, y);
}
else {
u2_noun d = j2_mby(Pt5, rub)(wir_r, c, a);
u2_weak x = u2_cs_find(wir_r, t_r, 0, u2_t(d));
p = j2_mbc(Pt1, add)(wir_r, _2, u2_h(d));
if ( u2_none == x ) {
return u2_bl_bail(wir_r, c3__fail);
}
q = u2_rx(wir_r, x);
u2_rz(wir_r, d);
}
u2_rz(wir_r, l);
u2_rz(wir_r, c);
}
return u2_bc(wir_r, p, q);
}
u2_noun // transfer
_cue_internal(u2_wire wir_r,
u2_atom a) // retain
{
u2_ray t_r = u2_cs_make(wir_r);
u2_noun x = _cue_in(wir_r, a, _0, t_r);
u2_noun y = u2_rx(wir_r, u2_t(x));
u2_rz(wir_r, x);
u2_cs_free(wir_r, t_r);
return y;
}
u2_noun u2_noun
u2_cke_cue(u2_atom a) u2_cke_cue(u2_atom a)
{ {
u2_noun b = _cue_internal(u2_Wire, a); u2_noun b = _coal_cue(u2_Wire, a);
u2_cz(a); u2_cz(a);
return b; return b;

48
gen164/5/cue.c
View File

@ -4,18 +4,17 @@
*/ */
#include "all.h" #include "all.h"
#include "../pit.h" #include "../pit.h"
#include "f/nash.h"
/* functions /* functions
*/ */
u2_ray T_r; struct u2_nash* T_r;
static u2_noun // produce static u2_noun // produce
_cue_in(u2_wire wir_r, _cue_in(u2_wire wir_r,
u2_atom a, // retain u2_atom a, // retain
u2_atom b, // retain u2_atom b) // retain
u2_noun m) // retain
{ {
u2_noun p, q, r; u2_noun p, q;
if ( _0 == j2_mbc(Pt3, cut)(wir_r, 0, b, 1, a) ) { if ( _0 == j2_mbc(Pt3, cut)(wir_r, 0, b, 1, a) ) {
u2_noun x = j2_mbc(Pt1, inc)(wir_r, b); u2_noun x = j2_mbc(Pt1, inc)(wir_r, b);
@ -23,8 +22,7 @@
p = j2_mbc(Pt1, inc)(wir_r, u2_h(c)); p = j2_mbc(Pt1, inc)(wir_r, u2_h(c));
q = u2_rx(wir_r, u2_t(c)); q = u2_rx(wir_r, u2_t(c));
// q = u2_cs_save(wir_r, T_r, 0, b, q); u2_na_put(T_r, b, q);
r = j2_mcc(Pt4, by, put)(wir_r, m, b, u2_t(c));
u2_rz(wir_r, c); u2_rz(wir_r, c);
u2_rz(wir_r, x); u2_rz(wir_r, x);
@ -37,9 +35,9 @@
u2_noun u, v, w; u2_noun u, v, w;
u2_noun x, y; u2_noun x, y;
u = _cue_in(wir_r, a, c, m); u = _cue_in(wir_r, a, c);
x = j2_mbc(Pt1, add)(wir_r, u2_h(u), c); x = j2_mbc(Pt1, add)(wir_r, u2_h(u), c);
v = _cue_in(wir_r, a, x, u2_t(u2_t(u))); v = _cue_in(wir_r, a, x);
w = u2_bc(wir_r, u2_rx(wir_r, u2_h(u2_t(u))), w = u2_bc(wir_r, u2_rx(wir_r, u2_h(u2_t(u))),
u2_rx(wir_r, u2_h(u2_t(v)))); u2_rx(wir_r, u2_h(u2_t(v))));
@ -48,55 +46,43 @@
p = j2_mbc(Pt1, add)(wir_r, _2, y); p = j2_mbc(Pt1, add)(wir_r, _2, y);
q = w; q = w;
// q = u2_cs_save(wir_r, T_r, 0, b, w); u2_na_put(T_r, b, q);
r = j2_mcc(Pt4, by, put)(wir_r, u2_t(u2_t(v)), b, w);
u2_rz(wir_r, u); u2_rz(wir_r, v); u2_rz(wir_r, x); u2_rz(wir_r, y); u2_rz(wir_r, u); u2_rz(wir_r, v); u2_rz(wir_r, x); u2_rz(wir_r, y);
} }
else { else {
u2_noun d = j2_mby(Pt5, rub)(wir_r, c, a); u2_noun d = j2_mby(Pt5, rub)(wir_r, c, a);
u2_noun x = j2_mcc(Pt4, by, get)(wir_r, m, u2_t(d)); u2_noun x = u2_na_get(T_r, u2_t(d));
// u2_weak T = u2_cs_find(wir_r, T_r, 0, u2_t(d));
p = j2_mbc(Pt1, add)(wir_r, _2, u2_h(d)); p = j2_mbc(Pt1, add)(wir_r, _2, u2_h(d));
if ( u2_nul == x ) { if ( u2_nul == x ) {
return u2_bl_bail(wir_r, c3__exit); return u2_bl_bail(wir_r, c3__exit);
} }
#if 0 q = u2_rx(wir_r, x);
else if ( (u2_none == T) || (u2_no == u2_sing(T, x)) ) {
printf("fail!\n");
return u2_bl_bail(wir_r, c3__fail);
}
#endif
q = u2_rx(wir_r, u2_t(x));
r = u2_rx(wir_r, m);
u2_rz(wir_r, x);
u2_rz(wir_r, d); u2_rz(wir_r, d);
} }
u2_rz(wir_r, l); u2_rz(wir_r, l);
u2_rz(wir_r, c); u2_rz(wir_r, c);
} }
return u2_bt(wir_r, p, q, r); return u2_bt(wir_r, p, q, 0);
} }
u2_noun // transfer u2_noun // transfer
j2_mby(Pt5, cue)(u2_wire wir_r, j2_mby(Pt5, cue)(u2_wire wir_r,
u2_atom a) // retain u2_atom a) // retain
{ {
#if 0 T_r = u2_na_make();
if ( 0 == T_r ) {
T_r = u2_cs_make(wir_r); u2_noun x = _cue_in(wir_r, a, _0);
}
#endif
{
u2_noun x = _cue_in(wir_r, a, _0, u2_nul);
u2_noun y = u2_rx(wir_r, u2_h(u2_t(x))); u2_noun y = u2_rx(wir_r, u2_h(u2_t(x)));
u2_na_take(T_r);
T_r = 0;
u2_rz(wir_r, x); u2_rz(wir_r, x);
return y; return y;
} }
}
u2_noun // transfer u2_noun // transfer
j2_mb(Pt5, cue)(u2_wire wir_r, j2_mb(Pt5, cue)(u2_wire wir_r,
u2_noun cor) // retain u2_noun cor) // retain