From 2c8513177dcd68b0a48852b6aea7bf7fc6fc517b Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Tue, 29 Apr 2014 08:54:45 -0700 Subject: [PATCH 1/2] point people to /setup not /doc in the README --- README.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index 5da33605d..ae029a390 100644 --- a/README.markdown +++ b/README.markdown @@ -25,8 +25,8 @@ Urbit depends on the following packages: 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 [2]: http://www.urbit.org/ -[3]: http://www.urbit.org/doc/ +[3]: http://www.urbit.org/setup/ From 61c0a6ed2ced6570abe128258bf63c53e02b2ef8 Mon Sep 17 00:00:00 2001 From: ~hatteb-mitlyd Date: Mon, 28 Apr 2014 17:13:57 -0700 Subject: [PATCH 2/2] use nash for cue --- f/coal.c | 75 +------------------------------------------------- gen164/5/cue.c | 54 ++++++++++++++---------------------- 2 files changed, 21 insertions(+), 108 deletions(-) diff --git a/f/coal.c b/f/coal.c index afb9ee0a0..4c98643f1 100644 --- a/f/coal.c +++ b/f/coal.c @@ -957,84 +957,11 @@ u2_ckd_in_tap(u2_noun a, u2_noun b) /* 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_cke_cue(u2_atom a) { - u2_noun b = _cue_internal(u2_Wire, a); + u2_noun b = _coal_cue(u2_Wire, a); u2_cz(a); return b; diff --git a/gen164/5/cue.c b/gen164/5/cue.c index a93f0fd3f..0d7308884 100644 --- a/gen164/5/cue.c +++ b/gen164/5/cue.c @@ -4,18 +4,17 @@ */ #include "all.h" #include "../pit.h" - +#include "f/nash.h" /* functions */ - u2_ray T_r; + struct u2_nash* T_r; static u2_noun // produce _cue_in(u2_wire wir_r, u2_atom a, // retain - u2_atom b, // retain - u2_noun m) // retain + u2_atom b) // retain { - u2_noun p, q, r; + 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); @@ -23,8 +22,7 @@ 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); - r = j2_mcc(Pt4, by, put)(wir_r, m, b, u2_t(c)); + u2_na_put(T_r, b, q); u2_rz(wir_r, c); u2_rz(wir_r, x); @@ -37,9 +35,9 @@ u2_noun u, v, w; 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); - 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))), u2_rx(wir_r, u2_h(u2_t(v)))); @@ -48,54 +46,42 @@ p = j2_mbc(Pt1, add)(wir_r, _2, y); q = w; - // q = u2_cs_save(wir_r, T_r, 0, b, w); - r = j2_mcc(Pt4, by, put)(wir_r, u2_t(u2_t(v)), b, w); + u2_na_put(T_r, b, q); 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_noun x = j2_mcc(Pt4, by, get)(wir_r, m, u2_t(d)); - // u2_weak T = u2_cs_find(wir_r, T_r, 0, u2_t(d)); + u2_noun x = u2_na_get(T_r, u2_t(d)); p = j2_mbc(Pt1, add)(wir_r, _2, u2_h(d)); if ( u2_nul == x ) { return u2_bl_bail(wir_r, c3__exit); } -#if 0 - 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); + q = u2_rx(wir_r, x); - u2_rz(wir_r, x); u2_rz(wir_r, d); } u2_rz(wir_r, l); u2_rz(wir_r, c); } - return u2_bt(wir_r, p, q, r); + return u2_bt(wir_r, p, q, 0); } u2_noun // transfer j2_mby(Pt5, cue)(u2_wire wir_r, u2_atom a) // retain { -#if 0 - if ( 0 == T_r ) { - T_r = u2_cs_make(wir_r); - } -#endif - { - u2_noun x = _cue_in(wir_r, a, _0, u2_nul); - u2_noun y = u2_rx(wir_r, u2_h(u2_t(x))); + T_r = u2_na_make(); - u2_rz(wir_r, x); - return y; - } + u2_noun x = _cue_in(wir_r, a, _0); + 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); + return y; } u2_noun // transfer j2_mb(Pt5, cue)(u2_wire wir_r,