From 1d6e199d65d49f382738d8c2e67ecae1ddd7590a Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Fri, 6 Mar 2015 17:28:55 -0500
Subject: [PATCH] merging across network tentatively works

---
 arvo/clay.hoon          |  1 +
 arvo/ford.hoon          | 10 +++++++++-
 main/mar/eot/door.hook  |  1 +
 main/mar/hoon/door.hook | 10 +++++-----
 main/mar/mime/door.hook |  1 +
 main/mar/otf/door.hook  |  1 +
 main/mar/styl/door.hook |  1 +
 main/mar/woff/door.hook |  1 +
 8 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/arvo/clay.hoon b/arvo/clay.hoon
index 67bce3c95..bf1209ce4 100644
--- a/arvo/clay.hoon
+++ b/arvo/clay.hoon
@@ -807,6 +807,7 @@
           ~|  %plop-strange-coy
           !!
         =+  bob=((hard blob) -.q.coy)
+        ~&  [%taking p.coy]
         ?-  -.bob
           %delta      [-.bob p.bob q.bob q.i.p.p.cay (slot 3 coy)]
           %direct     [-.bob p.bob q.i.p.p.cay (slot 3 coy)]
diff --git a/arvo/ford.hoon b/arvo/ford.hoon
index 4a18ad3bc..083ae23e9 100644
--- a/arvo/ford.hoon
+++ b/arvo/ford.hoon
@@ -747,9 +747,14 @@
       |=  [cof=cafe sam=vase]
       ^-  (bolt vase)
       %+  cool  |.(leaf/"ford: check {<[for bek `@p`(mug q.sam)]>}")
-      ?:  ?=(?(%gate %core %door %hoon %hook) for)
+      ?:  ?=(?(%gate %core %door) for)
         ::  ~&  [%lake-easy for bek]
         (fine cof sam)
+      ?:  ?=(?(%hoon %hook) for)
+        =+  mas=((soft ,@t) q.sam)
+        ?~  mas
+          (flaw cof [leaf/"ford: bad hoon or hook: {<[for bek]>}"]~)
+        (fine cof [%atom %t] u.mas)
       %+  cope  (fang cof for bek)
       |=  [cof=cafe tux=vase]
       =+  bob=(slot 6 tux)
@@ -867,8 +872,10 @@
       %+  cope  (fang cof for bek)
       |=  [cof=cafe pro=vase]
       ?:  &((slob %grow p.pro) (slob too p:(slap pro [%cnzy %grow])))
+        ~&  [%herep-a -.vax]
         %+  cope  (keel cof pro [[%& 6]~ vax]~)
         |=  [cof=cafe pox=vase]
+        ~&  %herep-b
         (maim cof pox [%tsgr [%cnzy %grow] [%cnzy too]])
       %+  cope  (fang cof too bek)
       |=  [cof=cafe pro=vase]
@@ -1062,6 +1069,7 @@
         %+  cool  |.(leaf/"ford: vale {<p.kas>} {<q.kas>} {<`@p`(mug r.kas)>}")
         %+  cope  (lave cof p.kas q.kas r.kas)
         |=  [cof=cafe vax=vase]
+        ~&  [%valing p.kas p.vax]
         (fine cof `cage`[p.kas vax])
       ==
     ::
diff --git a/main/mar/eot/door.hook b/main/mar/eot/door.hook
index 8e851ef87..dac090e86 100644
--- a/main/mar/eot/door.hook
+++ b/main/mar/eot/door.hook
@@ -15,6 +15,7 @@
 ++  grab
   |%
   ++  mime  |=([p=mite q=octs] q.q)
+  ++  noun  ,@
   --
 ++  grad
   |%
diff --git a/main/mar/hoon/door.hook b/main/mar/hoon/door.hook
index 46a6f0283..374f377fa 100644
--- a/main/mar/hoon/door.hook
+++ b/main/mar/hoon/door.hook
@@ -6,19 +6,19 @@
 |_  own=@t
 ::
 ++  grow                                                ::  convert to
+  ~&  hoon=(met 3 own)
   |%
-  ++  mime  [/text/hoon (taco own)]                     ::  convert to %mime
+  ++  mime  `^mime`[/text/hoon (taco own)]              ::  convert to %mime
   ++  psal  ;div:(pre:"{(trip own)}")                   ::  convert to %html
   ++  hymn  ;html:(head:title:"Source" "+{psal}")
   ++  txt
     (lore (cat 3 own '\0a'))
   --
 ++  grab
-  =>  v=.
   |%                                            ::  convert from
-  ++  mime  =>  v  |=([p=mite q=octs] q.q)
-  ++  noun  =>  v  ,@t                                 ::  clam from %noun
-  ++  txt   =>  v
+  ++  mime  |=([p=mite q=octs] q.q)
+  ++  noun  ,@t                                 ::  clam from %noun
+  ++  txt
     |=  wan=wain
     ^-  @t
     =+  (role wan)
diff --git a/main/mar/mime/door.hook b/main/mar/mime/door.hook
index c796d8b43..e7e52af92 100644
--- a/main/mar/mime/door.hook
+++ b/main/mar/mime/door.hook
@@ -2,6 +2,7 @@
 ::::  /hoon/core/mime/mar
   ::
 /?  314
+!:
 |_  own=mime
 ++  grab                                                ::  convert from
   |% 
diff --git a/main/mar/otf/door.hook b/main/mar/otf/door.hook
index 90da852db..202f49b67 100644
--- a/main/mar/otf/door.hook
+++ b/main/mar/otf/door.hook
@@ -15,6 +15,7 @@
 ++  grab
   |%
   ++  mime  |=([p=mite q=octs] q.q)
+  ++  noun  ,@
   --
 ++  grad
   |%
diff --git a/main/mar/styl/door.hook b/main/mar/styl/door.hook
index c6c11d9be..34d7ac51d 100644
--- a/main/mar/styl/door.hook
+++ b/main/mar/styl/door.hook
@@ -11,6 +11,7 @@
 ++  grab
   |%
   ++  mime  |=([p=mite q=octs] q.q)
+  ++  noun  ,@t
   --
 ++  grad
   |%
diff --git a/main/mar/woff/door.hook b/main/mar/woff/door.hook
index 43cc4c585..627e20641 100644
--- a/main/mar/woff/door.hook
+++ b/main/mar/woff/door.hook
@@ -15,6 +15,7 @@
 ++  grab
   |%
   ++  mime  |=([p=mite q=octs] q.q)
+  ++  noun  ,@
   --
 ++  grad
   |%