From 7dab136dc92cd6680ad41f3fb869d87e3eaf9e2d Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Fri, 25 Dec 2015 20:09:27 -0500
Subject: [PATCH] Now only one descent mechanism.

---
 arvo/hoon.hoon | 65 ++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon
index 9f2082a3e..d96c722c3 100644
--- a/arvo/hoon.hoon
+++ b/arvo/hoon.hoon
@@ -7491,30 +7491,6 @@
       ==
     --
   ::
-  ++  cola
-    |=  {pol/? hyp/wing ref/type}
-    ^-  type
-    =<  q
-    (tuck %both hyp |=(a/type ?:(pol (fuse(sut a) ref) (crop(sut a) ref))))
-  ::
-  ++  colo
-    |=  {pol/? hyp/wing ref/type}
-    ^-  type
-    =+  old=(cool pol hyp ref)
-    =+  new=(cola pol hyp ref)
-    ?.  ?|  =(old new)
-            ?&  (nest(sut old) | new)
-                (nest(sut new) | old)                
-            ==
-        ==  
-      ~&  [%colo pol hyp]
-      ~&  [%colo-sut sut]
-      ~&  [%colo-ref ref]
-      ~&  [%colo-old old]
-      ~&  [%colo-new new]
-      !!
-    old
-  ::
   ++  cool
     |=  {pol/? hyp/wing ref/type}
     ^-  type
@@ -8357,12 +8333,12 @@
   ::
   ++  chip
     ~/  %chip
-    |=  {way/? gen/twig}  ^-  type
+    |=  {how/? gen/twig}  ^-  type
     ?:  ?=({$wtts *} gen)  
-      (cola way q.gen (play ~(bunt al [%herb p.gen])))
-    ?:  ?&(way ?=({$wtpm *} gen))
+      (cool how q.gen (play ~(bunt al [%herb p.gen])))
+    ?:  ?&(how ?=({$wtpm *} gen))
       |-(?~(p.gen sut $(p.gen t.p.gen, sut ^$(gen i.p.gen))))
-    ?:  ?&(!way ?=({$wtbr *} gen))
+    ?:  ?&(!how ?=({$wtbr *} gen))
       |-(?~(p.gen sut $(p.gen t.p.gen, sut ^$(gen i.p.gen))))
     =+  neg=~(open ap gen)
     ?:(=(neg gen) sut $(gen neg))
@@ -9033,6 +9009,30 @@
     ^-  axis
     ?~(vit 1 (peg $(vit t.vit) ?~(i.vit 1 u.i.vit)))
   ::
+  ++  cola
+    |=  {pol/? hyp/wing ref/type}
+    ^-  type
+    =<  q
+    (tuck %both hyp |=(a/type ?:(pol (fuse(sut a) ref) (crop(sut a) ref))))
+  ::
+  ++  colo
+    |=  {pol/? hyp/wing ref/type}
+    ^-  type
+    =+  old=(cool pol hyp ref)
+    =+  new=(cola pol hyp ref)
+    ?.  ?|  =(old new)
+            ?&  (nest(sut old) | new)
+                (nest(sut new) | old)                
+            ==
+        ==  
+      ~&  [%colo pol hyp]
+      ~&  [%colo-sut sut]
+      ~&  [%colo-ref ref]
+      ~&  [%colo-old old]
+      ~&  [%colo-new new]
+      !!
+    old
+  ::
   ++  tuck
     |=  {way/?($read $rite $both $free) hyp/wing duz/$+(type type)}
     ~|  [%tuck hyp]
@@ -9051,25 +9051,22 @@
         {$fork *}  (fork $(sut p.sut) $(sut q.sut))
         {$hold *}  $(sut repo) 
       ==
-    =|  vil/(set type)
     |-  ^-  type
     ?:  =(1 u.i.vit)
       ^$(vit t.vit)
     =+  [now lat]=(cap u.i.vit)^(mas u.i.vit)
     ?-  sut
       $noun      $(sut [%cell %noun %noun])
-      $void      ^$(vit t.vit)
+      $void      %void
       {$atom *}  %void
       {$bull *}  (bull p.sut $(sut q.sut))
       {$cell *}  ?:  =(2 now)
                    (cell $(sut p.sut, u.i.vit lat) q.sut)
                   (cell p.sut $(sut q.sut, u.i.vit lat))
       {$core *}  ?>(=(3 now) (core $(sut p.sut, u.i.vit lat) q.sut))
-      {$cube *}  ^$(vit t.vit, sut q.sut)
+      {$cube *}  $(sut q.sut)
       {$face *}  (face p.sut $(sut q.sut))
-      {$fork *}  ::  ?:  (~(has in vil) sut)  %void
-                 =.  vil  (~(put in vil) sut)
-                 (fork $(sut p.sut) $(sut q.sut))
+      {$fork *}  (fork $(sut p.sut) $(sut q.sut))
       {$hold *}  $(sut repo)
     ==
   ::