From fb74e61885202715a0743c6272a1ba4b23363b39 Mon Sep 17 00:00:00 2001
From: Philip C Monk <philip.monk@tlon.io>
Date: Thu, 30 Apr 2015 14:37:22 -0400
Subject: [PATCH] moved ford dependencies to new model

---
 base/arvo/ford.hoon     | 29 +++++++----------------------
 base/lib/talk/core.hook |  1 +
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/base/arvo/ford.hoon b/base/arvo/ford.hoon
index f6b70eb47..9bd785580 100644
--- a/base/arvo/ford.hoon
+++ b/base/arvo/ford.hoon
@@ -131,7 +131,7 @@
   ==                                                    ::
 ++  deps                                                ::  depend state
   $%  [%init p=(set beam)]                              ::  given out
-      [%sent p=(set duct) q=(map beam (unit ,@uv))]    ::  listener exists
+      [%sent p=(set duct) q=(set beam)]                 ::  listener exists
       [%done ~]                                         ::  change seen
   ==                                                    ::
 ++  task                                                ::  problem in progress
@@ -267,28 +267,19 @@
     ?-    -.+.sih
         %writ
       ?~  p.sih  +>.$ 
-      =+  ark=;;(arch |2.r.u.p.sih)
-      =+  [dap=(~(got by deh.bay) dep) bem=`beam`[bek sup] new=p.ark]
+      =+  [dap=(~(got by deh.bay) dep) bem=`beam`[bek sup]]
       =-  ?~(dop con con(deh.bay (~(put by deh.bay) dep dop)))
       ^-  [dop=$|(~ _dap) con=_+>.$]
       ?-    -.dap
           %done  `+>.$                ::  writ redundant
           %init  ~|(never-subscribed/dep !!)
           %sent
-        =+  old=(~(got by q.dap) bem)
-        ?:  |(=(old ~) =(old [~ new]))
-          :-  dap(q (~(put by q.dap) bem `new))
-          =.  r.bem  q.p.u.p.sih
-          ?>  ?=(%ud -.r.bem)
-          =-  +>.$(mow :_(mow [hen %pass tea noe]))
-          ^-  noe=note
-          [%c [%warp [our p.bem] q.bem ~ [%sing %y ud/+(p.r.bem) (flop s.bem)]]]
         =-  [[%done ~] +>.$(mow (weld - mow))]
         ^-  (list move)
         %+  weld  (turn (~(tap in p.dap)) |=(hen=duct [hen %give %news ~]))
-        =.  q.dap  (~(del by q.dap) bem)
-        %+  turn  (~(tap by q.dap))                     ::  cancel outstanding
-        |=  [bem=beam *]
+        =.  q.dap  (~(del in q.dap) bem)
+        %+  turn  (~(tap in q.dap))                     ::  cancel outstanding
+        |=  bem=beam
         =.  tea  [(scot %p our) (scot %uv dep) (tope bem)]
         [hen %pass tea %c %warp [our p.bem] q.bem ~]
       ==
@@ -308,19 +299,13 @@
       %init
         %_    +>.$
             deh.bay 
-          =+  (turn (~(tap in p.dap)) |=(a=beam [a ~]))
-          (~(put by deh.bay) dep [%sent [hen ~ ~] (mo `(list ,[beam ~])`-)])
+          (~(put by deh.bay) dep [%sent [hen ~ ~] p.dap])
         ::
             mow
           =<  (welp :_(mow (turn (~(tap in p.dap)) .)))
           |=  bem=beam 
           :^  hen  %pass  [(scot %p our) (scot %uv dep) (tope bem)]
-          =-  [%c [%warp [our p.bem] q.bem ~ [%sing %y ud/- (flop s.bem)]]]
-          ?.  ?=(%ud -.r.bem)
-            ;;(@ q.q:(need (need (ska ~ %cw -.bem /))))
-          ?:  =(0 p.r.bem)
-            ;;(@ q.q:(need (need (ska ~ %cw -.bem(r da/now) /))))
-          p.r.bem
+          [%c [%warp [our p.bem] q.bem ~ [%next %y r.bem (flop s.bem)]]]
     ==  ==
   ::
   ++  zo
diff --git a/base/lib/talk/core.hook b/base/lib/talk/core.hook
index 02e5434c9..8cde98c44 100644
--- a/base/lib/talk/core.hook
+++ b/base/lib/talk/core.hook
@@ -10,6 +10,7 @@
   ::
 |%
 ++  main                                                ::  main story
+
   |=  our=ship  ^-  cord
   =+  can=(clan our)
   ?+  can  %porch