From 626b7026b9ee4190a90e40cca3a5050978e3cba9 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <curtis@tlon.io>
Date: Thu, 23 Nov 2017 14:18:16 -0800
Subject: [PATCH] Initial testing configuration.

---
 sys/hoon.hoon | 36 +++++++-----------------------------
 sys/zuse.hoon |  4 ++--
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/sys/hoon.hoon b/sys/hoon.hoon
index 30f208a32..0dd8eecc6 100644
--- a/sys/hoon.hoon
+++ b/sys/hoon.hoon
@@ -5543,28 +5543,6 @@
     ::
     [&+(~(uni in blocks.mask.hed) blocks.mask.tal) ~]
   ::
-  ++  combine
-    ::  combine a pair of seminouns
-    ::
-    |=  $:  ::  hed: head of pair
-            ::  tal: tail of pair
-            ::
-            hed/seminoun 
-            tal/seminoun
-        ==
-    ^-  seminoun
-    ?:  &(?=($& -.mask.hed) ?=($& -.mask.tal))
-      ::  yin: merged block set
-      ::
-      =/  yin  (~(uni in blocks.mask.hed) blocks.mask.tal)
-      :-  &+yin
-      ::  don't accumulate stubs
-      ::
-      ?~(yin [data.hed data.tal] ~)
-    ::  partial cell
-    ::
-    [|+[mask.hed mask.tal] [data.hed data.tal]]
-  ::
   ++  fragment
     ::  seek to an axis in a seminoun
     ::
@@ -6876,7 +6854,7 @@
         {$bcsm *}  p.gen
     ::
         {$brcb *}  [%tsls [%bunt q.gen] [%brcn p.gen r.gen]]
-        {$brcl *}  [%tsls [%ktsg q.gen] [%brdt p.gen r.gen]]
+        {$brcl *}  [%tsls [%ktcn q.gen] [%brdt p.gen r.gen]]
         {$brdt *}  :+  %brcn  p.gen
                    =-  [[0 [~ ~] -] ~ ~]
                    (~(put by *(map term (pair what foot))) %$ ~ [%ash q.gen])
@@ -6915,7 +6893,7 @@
         i.p.gen
       [i.p.gen $(p.gen t.p.gen)]
     ::
-        {$bunt *}  [%ktsg ~(bunt al %herb p.gen)]
+        {$bunt *}  [%ktcn ~(bunt al %herb p.gen)]
         {$cncb *}  [%ktls [%wing p.gen] %cnts p.gen q.gen]
         {$cndt *}  [%cnhp q.gen [p.gen ~]]
         {$cnkt *}  [%cnhp p.gen q.gen r.gen s.gen ~]
@@ -7481,16 +7459,16 @@
     |=  {gol/type gen/hoon}
     ^-  {type nock}
     =+  pro=(mint gol gen)
-    ~>  %slog.[%0 (dunk 'blow-subject')]
+    ::  ~>  %slog.[%0 (dunk 'blow-subject')]
     =+  bus=bran
-    ~|  mask.bus
+    ::  ~|  mask.bus
     =+  jon=(apex:musk bus q.pro)
     ?~  jon
       ~&  %constant-stopped
-      !!
-    ?.  ?=($& -.u.jon)
+      pro
+    ?:  ?=($| -.u.jon)
       ~&  %constant-blocked
-      !!
+      pro
     [p.pro [%1 p.u.jon]]
   ::
   ++  burn
diff --git a/sys/zuse.hoon b/sys/zuse.hoon
index 448efbebc..977db3be0 100644
--- a/sys/zuse.hoon
+++ b/sys/zuse.hoon
@@ -29,7 +29,7 @@
 ::  it's important to keep %zuse minimal.  models and
 ::  engines not used outside a vane should stay inside
 ::  that vane.
-::
+!:
 ~%  %zuse  +>  ~
 =>
 ::                                                      ::  ::
@@ -59,7 +59,7 @@
   $_  =|  mind
   ^|  |%
   ++  load  |~(seed ^|(+>))
-  ++  stay  *mind                                       ::  preserve
+  ++  stay  $:mind                                      ::  preserve
   ++  plow                                              ::  work in time
     =|  $:  now/@da                                     ::  date
             eny/@e                                      ::  entropy