From d175c24a5733c64e4b544af0138bc39791aea043 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 17 Feb 2016 11:12:44 -0800 Subject: [PATCH] Fix a bug in deep axis handling. --- jets/f/ut_mint.c | 14 +++++--------- jets/f/ut_mull.c | 17 ++++++----------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/jets/f/ut_mint.c b/jets/f/ut_mint.c index 52101c283e..9ee6231026 100644 --- a/jets/f/ut_mint.c +++ b/jets/f/ut_mint.c @@ -96,20 +96,15 @@ static u3_noun _mint_coke(u3_noun nug) { - u3_atom axe; - if ( 0 == u3h(nug) ) { - axe = u3t(nug); - } else if ( 10 == u3h(nug) ) { - u3_noun xin = u3k(u3t(u3t(nug))); - - axe = _mint_coke(xin); + return u3k(u3t(nug)); + } + else if ( 10 == u3h(nug) ) { + return _mint_coke(u3t(u3t(nug))); } else { return u3m_error("mint-coke"); } - u3z(nug); - return axe; } static u3_noun @@ -411,6 +406,7 @@ u3qfu_fish(van, wam, axe)); u3z(axe); + u3z(vol); u3z(wam); u3z(nob); u3z(dok); diff --git a/jets/f/ut_mull.c b/jets/f/ut_mull.c index fcafb8ca93..b4b21f12c6 100644 --- a/jets/f/ut_mull.c +++ b/jets/f/ut_mull.c @@ -44,20 +44,15 @@ static u3_noun _mull_coke(u3_noun nug) { - u3_atom axe; - if ( 0 == u3h(nug) ) { - axe = u3t(nug); - } else if ( 10 == u3h(nug) ) { - u3_noun xin = u3k(u3t(u3t(nug))); - - axe = _mull_coke(xin); + return u3k(u3t(nug)); + } + else if ( 10 == u3h(nug) ) { + return _mull_coke(u3t(u3t(nug))); } else { - return u3m_error("mint-coke"); + return u3m_error("mull-coke"); } - u3z(nug); - return axe; } static u3_noun @@ -66,7 +61,7 @@ u3_noun gen) { u3_noun fug = u3qfu_mint(van, sut, c3__noun, gen); - u3_noun axe = _mull_coke(u3k(u3t(fug))); + u3_noun axe = _mull_coke(u3t(fug)); u3z(fug); return axe;