From 9747d41e9ac1c4dcd22b095172ef7a39461a02c8 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Fri, 29 May 2015 15:05:01 -0700 Subject: [PATCH] reverst %cast ++lion usage until further notice --- base/arvo/clay.hoon | 19 ++++++------------- base/arvo/ford.hoon | 14 ++++++++------ base/arvo/hoon.hoon | 14 +++++++++++++- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/base/arvo/clay.hoon b/base/arvo/clay.hoon index a58d9970e2..4923ad0b24 100644 --- a/base/arvo/clay.hoon +++ b/base/arvo/clay.hoon @@ -175,19 +175,10 @@ :: ~& [%aver-mun nao [%from syd lim q.mun]] ?~(nao ~ (read-at-aeon:ze u.nao mun)) :: - ++ ford-fail - |= tan=tang - ~| %ford-fail - |- - ?~ tan !! - ~> %mean.|.(i.tan) :: interpolate into stack trace - $(tan t.tan) - :: + ++ ford-fail |=(tan=tang ~|(%ford-fail (mean tan))) ++ unwrap-tang |* res=(each ,* tang) - ?: ?=(%& -.res) - p.res - (ford-fail p.res) + ?:(?=(%& -.res) p.res (mean p.res)) :: ++ gage-to-cages |= gag=gage ^- (list (pair cage cage)) @@ -196,8 +187,9 @@ ++ gage-to-tage |= gag=gage ^- (each (list (pair cage cage)) tang) + ?: ?=(%| -.gag) (mule |.(`~`(ford-fail p.gag))) ?. ?=(%tabl -.gag) - (mule |.(`~`(ford-fail >%strange-gage< ~))) + (mule |.(`~`(ford-fail >%strange-gage p.p.gag< ~))) =< ?+(. [%& .] [@ *] .) |- ^- ?((list ,[cage cage]) (each ,~ tang)) ?~ p.gag ~ @@ -1481,7 +1473,8 @@ ~ =+ yak=(tako-to-yaki u.tak) =+ len=(lent pax) - :^ ~ ~ %arch + :^ ~ ~ %arch + :: ~& cy/pax :- -:!>(*arch) ^- arch =+ ^- descendants=(list (pair path lobe)) diff --git a/base/arvo/ford.hoon b/base/arvo/ford.hoon index 417de9b3ac..ab041ee8ee 100644 --- a/base/arvo/ford.hoon +++ b/base/arvo/ford.hoon @@ -936,6 +936,7 @@ =+ gav=((soft (list ,@tas)) q:(slap vax [%cnzy %garb])) ?~(gav ~ u.gav) ?. (slob %grow p.vax) ~ + :: ~& f/lily/for =+ gow=(slap vax [%cnzy %grow]) (sloe p.gow) :: @@ -1122,11 +1123,12 @@ |= [cof=cafe cay=cage] ^- (bolt gage) %+ cool |.(leaf/"ford: casting {} to {}") - %+ cope (lion cof p.kas p.cay ~) - |= [cof=cafe wuy=(list ,@tas)] + :: %+ cope (lion cof p.kas p.cay ~) :: XX lion efficiency + :: |= [cof=cafe wuy=(list ,@tas)] %+ cope - ?~ wuy (link cof p.kas p.cay q.cay) - (lope cof i.wuy t.wuy q.cay) + :: ?~ wuy + (link cof p.kas p.cay q.cay) + :: (lope cof i.wuy t.wuy q.cay) |= [cof=cafe vax=vase] (fine cof [%& p.kas vax]) :: @@ -1345,8 +1347,8 @@ %+ cope `(bolt (map ,@ vase))`^$(cof cof, r.arc r.r.arc) |= [cof=cafe rig=(map ,@ vase)] =+ nod=(chap(s.how [p.n.r.arc s.how]) cof bax hon) - ::?: ?=(%2 -.q.nod) - :: (fine cof (~(uni by lef) rig)) + ?: ?=(%2 -.q.nod) + (fine cof (~(uni by lef) rig)) %+ cope nod |= [cof=cafe nod=vase] (fine cof [[p.n.r.arc nod] lef rig]) diff --git a/base/arvo/hoon.hoon b/base/arvo/hoon.hoon index 6706839d12..ee41d38339 100644 --- a/base/arvo/hoon.hoon +++ b/base/arvo/hoon.hoon @@ -1849,7 +1849,19 @@ |= fud=* ^- (unit han) =+ gol=(han fud) ?.(=(gol fud) ~ [~ gol]) - +:: +++ slog :: deify printf + |= [a=?(~ @u) b=tang] ^+ same :: .= ~&(%a 1) + ?~(b same ~>(%slog.[a i.b] $(b t.b))) :: ((slog `~[>%a<]) 1) +:: +++ mean |=(a=tang (fear a |.(!!))) :: deify stack trace +++ fear :: insert user mean + |* [a=tang _|?(**)] + ^+ (+<+) + => .(a `tang`a) + ?~ a (+<+) + ~> %mean.|.(i.a) + $(a t.a) :::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :::: chapter 2d, containers :::: :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::