From a608e99ce0067556b8f2db7d9b464b1160a77290 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 9 Jul 2014 17:48:53 -0700 Subject: [PATCH] Various fixes and improvements. --- arvo/ames.hoon | 6 +++--- arvo/eyre.hoon | 2 +- arvo/ford.hoon | 5 +++++ arvo/zuse.hoon | 9 +++------ main/doc/synth/down.hoon | 2 -- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index aacf33777c..d11d4fb14f 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -435,7 +435,7 @@ vix=(bex +((cut 0 [25 2] mag))) :: width of sender tay=(cut 0 [27 5] mag) :: message type == - ?> =(2 vez) + ?> =(3 vez) ?> =(chk (end 0 20 (mug bod))) :+ [(end 3 wix bod) (cut 3 [wix vix] bod)] (kins tay) @@ -455,7 +455,7 @@ =+ tay=(ksin q.kec) %+ mix %+ can 0 - :~ [3 2] + :~ [3 3] [20 (mug bod)] [2 yax] [2 qax] @@ -1043,7 +1043,7 @@ ++ gnaw :: gnaw:am |= [kay=cape ryn=lane pac=rock] :: process packet ^- [p=(list boon) q=fort] - ?. =(2 (end 0 3 pac)) [~ fox] + ?. =(3 (end 0 3 pac)) [~ fox] =+ kec=(bite pac) ?: (goop p.p.kec) [~ fox] ?. (~(has by urb.ton.fox) q.p.kec) diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index 4a1aacba5e..2341166af7 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -1260,7 +1260,7 @@ |= [for=logo toe=tube] ^- seam :^ %fun for - toe(s (weld s.toe `path`~[~(rent co (flux [nep ~] quy))])) + toe(s (weld s.toe `path`[~(rent co (flux [nep ~] quy)) %web ~])) ?. won ~ :_ ~ =- =+ pey=(cat 3 (end 3 2 nep) %v) diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 6ee2c64400..da543cae0c 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -518,6 +518,11 @@ ?: =(too for) (fine cof vax) ?: &(=(%hoot too) =(%hoon for)) (fine cof !>(ream)) + ?: |(=(%noun for) =(%$ for)) + %+ cope ((lake too bek) cof vax) + |= [cof=cafe vux=(unit vase)] + ?~ vux (flaw cof [%leaf "ford: link {}"]~) + (fine cof u.vux) %+ cope (make cof %boil %gate [[p.bek %main r.bek] /[too]/tan/[for]/sys] ~) |= [cof=cafe cay=cage] diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index eb909b5006..22fdb4ceb9 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -1465,7 +1465,6 @@ :: ++ fain :: path restructure |= [hom=path raw=path] - ~& [%fain hom raw] =+ bem=(need (tome raw)) =+ [mer=(flop s.bem) moh=(flop hom)] |- ^- (pair beam path) @@ -1476,7 +1475,6 @@ :: ++ fest :: web synthesizer |= [hom=path raw=path] - ~& %fest |* yax=$+(epic *) (yax (fuel (fain hom raw))) :: @@ -1488,9 +1486,8 @@ ++ fuel :: parse fcgi |= [bem=beam but=path] ^- epic - ~& %fuel - ?> ?=([@ *] but) - =+ dyb=(slay i.but) + ?> ?=([%web @ *] but) + =+ dyb=(slay i.t.but) ?> ?& ?=([~ %many *] dyb) ?=([* * *] p.u.dyb) :: ?=([%$ %tas *] i.p.u.dyb) @@ -1517,7 +1514,7 @@ :* (~(gas by *(map cord cord)) quy) ced -.bem - t.but + t.t.but nyp == diff --git a/main/doc/synth/down.hoon b/main/doc/synth/down.hoon index ae5468bcbb..62ce33081c 100644 --- a/main/doc/synth/down.hoon +++ b/main/doc/synth/down.hoon @@ -25,8 +25,6 @@ :: %- (fest /synth/doc %) |= pic=epic -~& [%synth-cen %] -~& [%synth-beam (tome %)] =+ unt=|=(a=cord (biff (~(get by qix.pic) a) |=(b=cord (slaw %ud b)))) ~! unt =+ moo=(both (unt %foo) (unt %bar))