From cf3e0f826a43ca5747043d8d6163470c5a6437ff Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Wed, 6 Jan 2016 14:40:40 -0800
Subject: [PATCH] remove .hook processing

---
 arvo/clay.hoon | 12 ++++--------
 arvo/ford.hoon | 47 +++++++++++++++++------------------------------
 2 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/arvo/clay.hoon b/arvo/clay.hoon
index d56432fc0..5ea1a9907 100644
--- a/arvo/clay.hoon
+++ b/arvo/clay.hoon
@@ -566,7 +566,7 @@
       %+  skid  `(list (pair path miso))`ins
       |=  [pax=path mis=miso]
       ?>  ?=(%ins -.mis)
-      ?&  ?=([?(%hoon %hook) *] (flop pax))
+      ?&  ?=([%hoon *] (flop pax))
           ?=(%mime p.p.mis)
       ==
     =.  +>.$
@@ -1367,8 +1367,6 @@
         ?:  (~(has by hat) pax)  !!                     ::
         %+  ~(put by bar)  pax
         %-  make-direct
-        ?:  &(?=(%mime -.p.mys) =([%hook ~] (slag (dec (lent pax)) pax)))
-          `page`[%hook +.+.q.q.p.mys]
         ?:  &(?=(%mime -.p.mys) =([%hoon ~] (slag (dec (lent pax)) pax)))
           `page`[%hoon +.+.q.q.p.mys]
         [p q.q]:p.mys
@@ -1611,7 +1609,7 @@
       ?~  lob
         [~ ~]
       =+  mar=(lobe-to-mark u.lob)
-      ?.  ?=(?(%hoon %hook) mar)
+      ?.  ?=(%hoon mar)
         [~ ~ %| u.lob]
       :^  ~  ~  %&
       :+  mar  [%atom %t]
@@ -2611,10 +2609,8 @@
           |=  [a=path b=miso]
           ?&  ?=(%ins -.b)
               ?=(%mime p.p.b)
-              =+  (slag (dec (lent a)) a)
-              ?|  =([%hook ~] -)
-                  =([%hoon ~] -)
-          ==  ==
+              ?=([%hoon ~] (slag (dec (lent a)) a))
+          ==
       :~  [hen %pass /one %c %info p.bem q.bem %& one]
           [hen %pass /two %c %info p.bem q.bem %& two]
       ==
diff --git a/arvo/ford.hoon b/arvo/ford.hoon
index e52dc58f4..a8aa8ac5b 100644
--- a/arvo/ford.hoon
+++ b/arvo/ford.hoon
@@ -889,45 +889,33 @@
       |=  [cof=cafe bem=beam]
       %^  lash  cof  bem
       |=  [cof=cafe for=mark]
-      ^-  (bolt (unit ,?))
+      ^-  (bolt (unit ,~))
       ?.  ((sane %tas) for)  (flue cof)
       =.  s.bem  [for s.bem]
       %+  cope  (lend cof bem)
       |=  [cof=cafe arc=arch]
-      ?^  fil.arc  (fine cof (some &))
-      ?.  (~(has by dir.arc) %hook)
-        (flue cof)
-      %+  cope  (lend cof bem(s [%hook s.bem]))
-      |=  [cof=cafe arc=arch]
-      ?~  fil.arc
-        (flue cof)
-      (fine cof (some |))
+      (fine cof (bind fil.arc ,~))
     ::
     ++  lace                                            ::  load real or virtual
-      |=  [cof=cafe for=mark arg=coin bem=beam lit=?]
+      |=  [cof=cafe for=mark arg=coin bem=beam]
       ^-  (bolt vase)
+      %+  cool  |.(leaf/"ford: load {<for>} {<(tope bem)>}")
       =.  s.bem  [for s.bem]
-      ?:  lit
-        %+  cool  |.(leaf/"ford: load {<for>} {<(tope bem)>}")
-        %+  cope  (liar cof bem)
-        |=  [cof=cafe cay=cage]
-        ?.  =(for p.cay)
-          (flaw cof leaf/"unexpected mark {<p.cay>}" ~)
-        ((lake for) cof q.cay)
-      %+  cool  |.(leaf/"ford: hook {<for>} {<(tope bem)>}")
-      %+  cope  (fade cof %hook bem)
-      |=  [cof=cafe hyd=hood]
-      (cope (abut:(meow bem arg) cof hyd) (lake for))
+      %+  cope  (liar cof bem)
+      |=  [cof=cafe cay=cage]
+      ?.  =(for p.cay)
+        (flaw cof leaf/"unexpected mark {<p.cay>}" ~)
+      ((lake for) cof q.cay)
     ::
     ++  lake                                            ::  check/coerce
       |=  for=mark
       |=  [cof=cafe sam=vase]
       ^-  (bolt vase)
       %+  cool  |.(leaf/"ford: check {<[for bek `@p`(mug q.sam)]>}")
-      ?:  ?=(?(%hoon %hook) for)
+      ?:  ?=(%hoon for)
         =+  mas=((soft ,@t) q.sam)
         ?~  mas
-          (flaw cof [leaf/"ford: bad hoon or hook: {<[for bek]>}"]~)
+          (flaw cof [leaf/"ford: bad hoon: {<[for bek]>}"]~)
         (fine cof [%atom %t] u.mas)
       %+  cope  (fang cof for)
       |=  [cof=cafe tux=vase]
@@ -1079,16 +1067,15 @@
       |=  [cof=cafe for=mark arg=coin bem=beam]
       ^-  (bolt (unit vase))
       %+  cope  (laze cof bem)
-      |=  [cof=cafe mal=(map mark ,?)]
-      =+  lit=(~(get by mal) for)
-      ?^  lit
-        (cope (lace cof for arg bem u.lit) (flux some))
+      |=  [cof=cafe mal=(map mark ,~)]
+      ?:  (~(has by mal) for)
+        (cope (lace cof for arg bem) (flux some))
       =+  opt=(sa (turn (~(tap by mal)) head))          ::  XX asymptotics  
       %+  cope  (lion cof for opt)
       |=  [cof=cafe wuy=(list ,@tas)]
       ?~  wuy  (flue cof)
       %+  cope  
-        (lace cof i.wuy arg bem (~(got by mal) i.wuy))
+        (lace cof i.wuy arg bem)
       |=  [cof=cafe hoc=vase]
       (cope (lope cof i.wuy t.wuy hoc) (flux some))
     ::
@@ -1231,7 +1218,7 @@
       ::
           %bunt
         %+  cool  |.(leaf/"ford: bunt {<p.kas>}")
-        ?:  ?=(?(%hoon %hook) p.kas)
+        ?:  ?=(%hoon p.kas)
           (fine cof %& p.kas [%atom %t] '')
         %+  cope  (fang cof p.kas)
         |=  [cof=cafe tux=vase]
@@ -1662,7 +1649,7 @@
           |=([cof=cafe p=silk q=silk] (cope (make cof q) furl))
         ==
         |=  [cof=cafe cay=cage coy=cage]  ^-  (bolt gage)
-        ?:  ?=(?(%hoon %hook) p.cay)
+        ?:  ?=(%hoon p.cay)
           ?.  ?=(%txt-diff p.coy)
             (flaw cof leaf/"{<p.cay>} mark with bad diff type: {<p.coy>}" ~)
           =+  txt=((soft ,@t) q.q.cay)