From 03834e67f021b98c0f0121ad34cf00327c2d255f Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 30 Nov 2016 17:43:14 -0800 Subject: [PATCH] use ++hunt directly --- arvo/ames.hoon | 6 +++--- arvo/clay.hoon | 4 ++-- arvo/hoon.hoon | 4 ++-- arvo/xmas.hoon | 4 ++-- arvo/zuse.hoon | 4 +--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 5d11e6d05b..05911d66f7 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -1385,10 +1385,10 @@ [out fox] :: ++ doze - %+ hunt:chrono:behn `(add now ~s32) + %^ hunt lth `(add now ~s32) |- ^- (unit @da) ?~ zac.fox ~ - ;: hunt:chrono:behn + ;: (cury hunt lth) $(zac.fox l.zac.fox) $(zac.fox r.zac.fox) doze:(um p.n.zac.fox) @@ -1466,7 +1466,7 @@ ++ doze :: doze:um:am |- ^- (unit @da) :: wakeup time ?~ wab.weg ~ - ;: hunt:chrono:behn + ;: (cury hunt lth) $(wab.weg l.wab.weg) $(wab.weg r.wab.weg) doze:(ho p.n.wab.weg) diff --git a/arvo/clay.hoon b/arvo/clay.hoon index d936ea8e5e..3a05dbc335 100644 --- a/arvo/clay.hoon +++ b/arvo/clay.hoon @@ -1622,11 +1622,11 @@ :: $next ~ $many - %+ hunt:chrono:behn + %^ hunt lth ?. ?=($da -.p.q.rov) ~ ?.((lth now p.p.q.rov) ~ [~ p.p.q.rov]) ?. ?=($da -.q.q.rov) ~ - ?.((lth now p.q.q.rov) [~ now] [~ p.q.q.rov]) + (hunt gth [~ now] [~ p.q.q.rov]) == fun +>.$ diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 1525586a22..3b0cf95b7d 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -254,10 +254,10 @@ :: ++ hunt :: first of units |* {ord/$-({* *} ?) one/(unit) two/(unit)} - ^- (unit ?(_(need one) _(need two))) + ^- (unit ?(_,.+.one _,.+.two)) ?~ one two ?~ two one - ?:((ord u.one u.two) one two) + ?:((ord ,.+.one ,.+.two) one two) :: ++ lift :: lift mold (fmap) |* a/mold :: flipped diff --git a/arvo/xmas.hoon b/arvo/xmas.hoon index 6d4f4afed1..5d55edccd4 100644 --- a/arvo/xmas.hoon +++ b/arvo/xmas.hoon @@ -163,7 +163,7 @@ ++ doze :: sleep until |- ^- (unit @da) ?~ pol ~ - ;: hunt + ;: (cury hunt lth) $(pol l.pol) $(pol r.pol) ~(to-wait et p.n.pol q.n.pol) @@ -332,7 +332,7 @@ ++ to-wait |- ^- (unit @da) ?~ sal.bah ~ - ;: hunt + ;: (cury hunt lth) $(sal.bah l.sal.bah) $(sal.bah r.sal.bah) wait:(to-rail p.n.sal.bah q.n.sal.bah) diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 271c27e322..2adda31a8f 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -4403,9 +4403,7 @@ -- ++ behn ^? |% - ++ chrono - :- chrono:userlib - hunt=|=({a/(unit @da) b/(unit @da)} (hunt lth a b)) + ++ chrono chrono:userlib -- ++ clay ^? |%