Merge branch 'master' of http://github.com/urbit/arvo

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 $~})}

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"]]

gen/hood/merge.hoon

@@ -3,6 +3,8 @@
 ::::  /hoon/merge/hood/gen
   ::
 /?    310
+/+  *old-zuse
+=,  old-zuse
 ::
 |%
 ++  beaky  {knot knot knot $~}

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)

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))
+::
+--
+::
 ::::
   ::
 |%

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)

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

sys/zuse.hoon

@@ -3335,7 +3335,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))