This commit is contained in:
Paul Driver 2018-04-27 09:33:33 -07:00
parent d997f035ae
commit 48eb2fee9b
4 changed files with 30 additions and 23 deletions

View File

@ -3,6 +3,25 @@
*/
#include "all.h"
static u3_noun
_roll_in(u3j_site* sit_u, u3_noun a, u3_noun b)
{
if ( 0 == a ) {
return u3k(b);
}
else if ( c3n == u3du(a) ) {
return u3m_bail(c3__exit);
}
else {
u3_noun gim = u3k(u3h(a));
u3_noun zor = u3k(b);
u3_noun daz = u3j_gate_slam(sit_u, u3nc(gim, zor));
u3_noun hox = _roll_in(sit_u, u3t(a), daz);
u3z(daz);
return hox;
}
}
/* functions
*/
@ -10,27 +29,12 @@
u3qb_roll(u3_noun a,
u3_noun b)
{
if ( 0 == a ) {
return u3k(u3r_at(u3x_sam_3, b));
}
else if ( c3n == u3du(a) ) {
return u3m_bail(c3__exit);
}
else {
u3_noun gim = u3k(u3h(a));
u3_noun zor = u3k(u3r_at(u3x_sam_3, b));
u3_noun daz = u3n_slam_on(u3k(b), u3nc(gim, zor));
u3_noun vel = u3i_molt(u3k(b), u3x_sam_3, daz, 0);
if ( u3_none == vel ) {
return u3m_bail(c3__exit);
} else {
u3_noun hox = u3qb_roll(u3t(a), vel);
u3z(vel);
return hox;
}
}
u3_noun pro;
u3j_site sit_u;
u3j_gate_prep(&sit_u, b);
pro = _roll_in(&sit_u, a, u3r_at(u3x_sam_3, b));
u3j_gate_lose(&sit_u);
return pro;
}
u3_noun
u3wb_roll(u3_noun cor)

View File

@ -3,7 +3,7 @@
*/
#include "all.h"
u3_noun
static u3_noun
_skip_in(u3j_site* sit_u, u3_noun a)
{
if ( 0 == a ) {

View File

@ -3,7 +3,7 @@
*/
#include "all.h"
u3_noun
static u3_noun
_turn_in(u3j_site* sit_u, u3_noun a)
{
if ( u3_nul == a ) {

View File

@ -1271,6 +1271,9 @@ u3j_gate_prep(u3j_site* sit_u, u3_noun cor)
{
u3_noun loc;
u3t_on(glu_o);
if ( c3n == u3du(cor) || c3n == u3du(u3t(cor)) ) {
u3m_bail(c3__exit);
}
sit_u->axe = 2;
sit_u->bat = u3k(cor); // a lie, this isn't really the battery!
sit_u->pog_u = u3n_find(u3h(cor));