From 1f713896c4e04beee1e51eeb9d86a5c3bbcacf74 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 23 Oct 2017 14:41:07 -0700 Subject: [PATCH 1/4] fix various generators --- gen/hood/init-oauth2/google.hoon | 3 +++ gen/hood/invite.hoon | 2 +- gen/hood/merge.hoon | 2 ++ gen/womb/balances.hoon | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gen/hood/init-oauth2/google.hoon b/gen/hood/init-oauth2/google.hoon index 16f3f59a62..3d52e394ec 100644 --- a/gen/hood/init-oauth2/google.hoon +++ b/gen/hood/init-oauth2/google.hoon @@ -4,11 +4,14 @@ :: /? 314 /- sole +/+ old-zuse +=, old-zuse :: :::: :: =, sole =, html +=, format :- %ask |= $: {now/@da eny/@uvJ bec/beak} {arg/$@($~ {jon/json $~})} diff --git a/gen/hood/invite.hoon b/gen/hood/invite.hoon index 0815e65d93..464ac77cee 100644 --- a/gen/hood/invite.hoon +++ b/gen/hood/invite.hoon @@ -12,6 +12,6 @@ {{who/@t $~} sta/@} == :- %womb-invite -^- {cord invite}:womb +^- {cord invite:womb} =+ inv=(scot %uv (end 7 1 eny)) [inv [who 10 sta "You have been invited to Urbit: {(trip inv)}" "This is an invite of 10 planets"]] diff --git a/gen/hood/merge.hoon b/gen/hood/merge.hoon index 192ed6e305..95a52253a2 100644 --- a/gen/hood/merge.hoon +++ b/gen/hood/merge.hoon @@ -3,6 +3,8 @@ :::: /hoon/merge/hood/gen :: /? 310 +/+ *old-zuse +=, old-zuse :: |% ++ beaky {knot knot knot $~} diff --git a/gen/womb/balances.hoon b/gen/womb/balances.hoon index 03a42f0711..ef9711146d 100644 --- a/gen/womb/balances.hoon +++ b/gen/womb/balances.hoon @@ -11,4 +11,4 @@ == :- %womb-balance-all =+ [him=(scot %p ?^(who u.who p.bec)) cas=(scot %da now)] -.^((set {passhash mail}:womb) %gx /[him]/hood/[cas]/womb/balance/womb-balance-all) +.^((set {passhash mail}):womb %gx /[him]/hood/[cas]/womb/balance/womb-balance-all) From b7193da15880a55326b04395a6bc8860df76d99d Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 23 Oct 2017 14:52:06 -0700 Subject: [PATCH 2/4] fix core pretty-printing --- sys/hoon.hoon | 13 +++---------- sys/vane/eyre.hoon | 6 +++--- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/sys/hoon.hoon b/sys/hoon.hoon index db29ede8bb..193287c36e 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -9212,16 +9212,9 @@ %^ cat 3 %~ rent co :+ %$ %ud - |- ^- @ - ?- q.s.q.sut - $~ 0 - {* $~ $~} 1 - {* $~ *} +($(q.s.q.sut r.q.s.q.sut)) - {* * $~} +($(q.s.q.sut l.q.s.q.sut)) - {* * *} .+ %+ add - $(q.s.q.sut l.q.s.q.sut) - $(q.s.q.sut r.q.s.q.sut) - == == + %- ~(rep by (~(run by q.s.q.sut) |=(tomb ~(wyt by q)))) + |=([[@ a=@u] b=@u] (add a b)) + == %^ cat 3 ?-(p.q.sut $gold '.', $iron '|', $lead '?', $zinc '&') =+ gum=(mug q.s.q.sut) diff --git a/sys/vane/eyre.hoon b/sys/vane/eyre.hoon index 62be8eac16..021bea5c00 100644 --- a/sys/vane/eyre.hoon +++ b/sys/vane/eyre.hoon @@ -231,7 +231,7 @@ %+ rap 3 :- (wack a) (turn b |=(c/knot (cat 3 '_' (wack c)))) :: -++ puck :: light path decoding +++ pick :: light path decoding =+ fel=(most cab (sear wick urt:ab)) |=(a/knot `(unit {p/term q/path})`(rush a fel)) :: @@ -1045,7 +1045,7 @@ (give-thou 307 [location+(crip url)]~ ~) :: (give-html:abet 200 ~ (redir:xml url)) ?. ?=($mime p.cay) - =+ bek=(norm-beak -:(need (de-beam (need (puck p.tee))))) + =+ bek=(norm-beak -:(need (de-beam (need (pick p.tee))))) (exec-live ac+q.tee bek [%flag [p.sih `~] %cast %mime [%$ cay]]) (give-mime q.tee p.sih cay) :: @@ -1403,7 +1403,7 @@ ?~ in-quy (slav %ta i.t.but) =+ src=~|(no+u.in-quy (~(got by (malt quy)) u.in-quy)) - p:(need (puck src)) :: allow state=usr_other-data + p:(need (pick src)) :: allow state=usr_other-data :: $at [%auth %at pok(q but)] $as From dbc802a99b540c0c67176535613620a322f3905d Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Mon, 23 Oct 2017 15:06:38 -0700 Subject: [PATCH 3/4] oauth2 names --- lib/oauth2.hoon | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/oauth2.hoon b/lib/oauth2.hoon index 8a640aeeff..8ddeefacaf 100644 --- a/lib/oauth2.hoon +++ b/lib/oauth2.hoon @@ -2,10 +2,12 @@ :: :::: /hoon/oauth2/lib :: -/+ hep-to-cab, interpolate +/+ hep-to-cab, interpolate, old-zuse +=, old-zuse =, eyre =, mimes:html =, html +=, format |% ++ parse-url parse-url:interpolate ++ join @@ -32,6 +34,21 @@ (need (;~(biff de-json b) q:(need r.a))) -- :: +:::: + :: +:: XX belongs back in zuse +|% +++ pack :: light path encoding + |= {a/term b/path} ^- knot + %+ rap 3 :- (wack a) + (turn b |=(c/knot (cat 3 '_' (wack c)))) +:: +++ pick :: light path decoding + =+ fel=(most cab (sear wick urt:ab)) + |=(a/knot `(unit {p/term q/path})`(rush a fel)) +:: +-- +:: :::: :: |% From 684ae0b3dc8e0388e7b33860872c3c8144c28b18 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 25 Oct 2017 00:16:26 +0200 Subject: [PATCH 4/4] Fix small issue in ++op:dejs-soft:format when calling ++my:nl Fixes #444 --- sys/zuse.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/zuse.hoon b/sys/zuse.hoon index 60a24c2cb9..e48dd9d2ca 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -3334,7 +3334,7 @@ ++ op :: parse keys of map |* {fel/rule wit/fist} %+ cu - |= a/(list _[(wonk *fel) (need *wit)]) + |= a/(list (pair _(wonk *fel) _(need *wit))) (my:nl a) %- ci :_ (om wit) |= a/(map cord _(need *wit))