From 2e8e02779c3007336597f35822d100339e0765b3 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Thu, 14 Jan 2016 01:41:32 -0800
Subject: [PATCH] Forgot to change dojo.  Also, clean burn.

---
 jets/f/ut_burn.c | 135 +++++++----------------------------------------
 1 file changed, 20 insertions(+), 115 deletions(-)

diff --git a/jets/f/ut_burn.c b/jets/f/ut_burn.c
index 5d03662e7c..c98b37d2bc 100644
--- a/jets/f/ut_burn.c
+++ b/jets/f/ut_burn.c
@@ -7,18 +7,18 @@
 /* logic
 */
   static u3_noun
-  _bran_in(u3_noun van, u3_noun sut, u3_noun gil);
+  _burn_in(u3_noun van, u3_noun sut, u3_noun gil);
 
   static u3_noun
-  _bran_frog(u3_noun van,
+  _burn_frog(u3_noun van,
              u3_noun yed,
              u3_noun gil)
   {
     if ( u3_nul == yed ) {
       return u3_nul;
     } else {
-      u3_noun dis = _bran_in(van, u3h(yed), gil);
-      u3_noun mor = _bran_frog(van, u3t(yed), gil);
+      u3_noun dis = _burn_in(van, u3h(yed), gil);
+      u3_noun mor = _burn_frog(van, u3t(yed), gil);
 
       if ( u3_nul == dis ) return mor;
       if ( u3_nul == mor ) return dis;
@@ -49,7 +49,7 @@
   }
 
   static u3_noun
-  _bran_in(u3_noun van,
+  _burn_in(u3_noun van,
            u3_noun sut,
            u3_noun gil)
   {
@@ -76,13 +76,13 @@
       }
       case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
-        u3_noun hed = _bran_in(van, p_sut, gil);
+        u3_noun hed = _burn_in(van, p_sut, gil);
 
         if ( u3_nul == hed ) {
           return u3_nul;
         }
         else {
-          u3_noun tal = _bran_in(van, q_sut, gil);
+          u3_noun tal = _burn_in(van, q_sut, gil);
 
           if ( u3_nul == tal ) {
             u3z(hed);
@@ -101,7 +101,7 @@
                      u3x_trel(q_sut, &pq_sut, &qq_sut, &rq_sut);
                      u3x_cell(rq_sut, &prq_sut, &qrq_sut);
       {
-        u3_noun pay = _bran_in(van, p_sut, gil);
+        u3_noun pay = _burn_in(van, p_sut, gil);
 
         if ( u3_nul == pay ) {
           return u3_nul;
@@ -115,117 +115,25 @@
       }
       case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
-        return _bran_in(van, q_sut, gil);
+        return _burn_in(van, q_sut, gil);
       }
       case c3__fork: p_sut = u3t(sut);
       {
         u3_noun yed = u3qdi_tap(p_sut, u3_nul);
-        u3_noun ret = _bran_frog(van, yed, gil);
+        u3_noun ret = _burn_frog(van, yed, gil);
 
         u3z(yed);
         return ret;
       }
       case c3__frog: p_sut = u3t(sut);
       {
-        return _bran_in(van, u3h(p_sut), gil);
+        return _burn_in(van, u3h(p_sut), gil);
       }
       case c3__hold:
       {
         if ( (c3y == u3qdi_has(gil, sut)) ) {
           return u3_nul;
         }
-        else {
-          u3_noun zoc = u3qdi_put(gil, sut);
-          u3_noun fop = u3qfu_repo(van, sut);
-          u3_noun pro = _bran_in(van, fop, zoc);
-
-          u3z(fop);
-          u3z(zoc);
-
-          return pro;
-        }
-      }
-    }
-  }
-
-  u3_noun
-  _cqfu_bran(u3_noun van,
-             u3_noun sut)
-  {
-    u3_noun unt = _bran_in(van, sut, u3_nul);
-
-    if ( u3_nul == unt ) {
-      return u3m_error("bran");
-    } 
-    else {
-      u3_noun ret = u3k(u3t(unt));
-
-      u3z(unt);
-      return ret;
-    }
-  }
-
-#if 0
-  static u3_noun
-  _burn_in(u3_noun van,
-           u3_noun sut,
-           u3_noun gil)
-  {
-    u3_noun p_sut, q_sut, pq_sut, qq_sut, rq_sut, prq_sut, qrq_sut;
-
-    if ( c3n == u3du(sut) ) switch ( sut ) {
-      default: return u3m_bail(c3__fail);
-
-      case c3__noun: return 0;
-      case c3__void: {
-        return u3m_error("burn-void");
-      }
-    }
-    else switch ( u3h(sut) ) {
-      default: return u3m_bail(c3__fail);
-
-      case c3__atom: u3x_cell(u3t(sut), &p_sut, &q_sut);
-      {
-        if ( c3y == u3du(q_sut) ) {
-          return u3k(u3t(q_sut));
-        } else {
-          return 0;
-        }
-      }
-      case c3__cell: u3x_cell(u3t(sut), &p_sut, &q_sut);
-      {
-        return u3nc
-          (_burn_in(van, p_sut, gil),
-                  _burn_in(van, q_sut, gil));
-      }
-      case c3__core: u3x_cell(u3t(sut), &p_sut, &q_sut);
-                     u3x_trel(q_sut, &pq_sut, &qq_sut, &rq_sut);
-                     u3x_cell(rq_sut, &prq_sut, &qrq_sut);
-      {
-        return u3nc
-          (u3k(prq_sut),
-                  _burn_in(van, p_sut, gil));
-      }
-      case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut);
-      {
-        return _burn_in(van, q_sut, gil);
-      }
-      case c3__fork: p_sut = u3t(sut);
-      {
-        return _burn_in(van, u3h(p_sut), gil);
-      }
-      case c3__frog: p_sut = u3t(sut);
-      {
-        return _burn_in(van, u3h(p_sut), gil);
-      }
-      case c3__hold:
-      {
-        if ( (c3y == u3qdi_has(gil, sut)) ) {
-          u3_noun sux = u3qfu_dunq(van, "type", sut);
-
-          u3t_push(u3nc(c3__mean, sux));
-          return u3m_error("burn-loop");
-        }
         else {
           u3_noun zoc = u3qdi_put(gil, sut);
           u3_noun fop = u3qfu_repo(van, sut);
@@ -239,25 +147,22 @@
       }
     }
   }
-#endif
 
   u3_noun
   _cqfu_burn(u3_noun van,
              u3_noun sut)
   {
-#if 1
-    return _cqfu_bran(van, sut);
-#else
-    u3_noun old = _burn_in(van, sut, u3_nul);
-    u3_noun new = _cqfu_bran(van, sut);
+    u3_noun unt = _burn_in(van, sut, u3_nul);
 
-    if ( c3n == u3r_sing(old, new) ) {
-      u3m_p("burn: old", u3r_mug(old));
-      u3m_p("burn: new", u3r_mug(new));
+    if ( u3_nul == unt ) {
+      return u3m_error("burn");
+    } 
+    else {
+      u3_noun ret = u3k(u3t(unt));
+
+      u3z(unt);
+      return ret;
     }
-    u3z(old);
-    return new;
-#endif
   }
 
   u3_noun