1
0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 12:22:10 +03:00

Merge changes

This commit is contained in:
Gavin Whelan 2014-05-28 16:34:05 -07:00
commit 13686b7780
3 changed files with 13 additions and 8 deletions

View File

@ -16,23 +16,22 @@
return u2_bl_bail(wir_r, c3__fail); return u2_bl_bail(wir_r, c3__fail);
} }
else { else {
u2_noun acc;
c3_w i_w = a; c3_w i_w = a;
u2_noun acc_w;
if ( a == 0 ) if ( !i_w )
return u2_nul; return u2_nul;
while ( i_w ) { while ( i_w ) {
if ( u2_no == u2_dust(b) ) { if ( u2_no == u2_dust(b) ) {
return u2_nul; return u2_nul;
} }
acc_w = u2_cn_cell( u2_h(b), acc_w ); acc = u2_cn_cell( u2_h(b), acc );
b = u2_t(b); b = u2_t(b);
i_w--; i_w--;
} }
acc_w = j2_mbc(Pt2, flop)(wir_r, acc_w);
return u2_rx(wir_r, acc_w); return u2_ckb_flop(acc);
} }
} }
u2_noun // transfer u2_noun // transfer
@ -52,6 +51,12 @@
/* structures /* structures
*/ */
/* u2_ho_jet */
/* j2_mbj(Pt2, scag)[] = { */
/* { ".2", c3__lite, j2_mb(Pt2, scag), u2_jet_dead, u2_none, u2_none }, */
/* { } */
/* }; */
u2_ho_jet u2_ho_jet
j2_mbj(Pt2, scag)[] = { j2_mbj(Pt2, scag)[] = {
{ ".2", c3__lite, j2_mb(Pt2, scag), u2_jet_dead, u2_none, u2_none }, { ".2", c3__lite, j2_mb(Pt2, scag), u2_jet_dead, u2_none, u2_none },

View File

@ -1,4 +1,4 @@
/* gen164/5/ed_sign.c /* gen164/5/ed_puck.c
** **
** This file is in the public domain. ** This file is in the public domain.
*/ */

View File

@ -1,4 +1,4 @@
/* gen164/5/ed_sign.c /* gen164/5/ed_veri.c
** **
** This file is in the public domain. ** This file is in the public domain.
*/ */