Merge remote-tracking branch 'cgyarvin/newdeal' into newdeal

arvo/ford.hoon

@@ -1264,7 +1264,7 @@
       ^-  (bolt vase)
       %+  cope  (mail cof p.vax gen)
       |=  {cof/cafe typ/span fol/nock}
-      %+  (coup cof)  (mock [q.vax fol] (mole (slod save)))
+      %+  (coup cof)  (meck [q.vax fol] (myle (sloy syve)))
       |=(val/* `vase`[typ val])
     ::
     ++  make                                            ::  reduce silk
@@ -1457,7 +1457,7 @@
       ^-  (bolt vase)
       %+  cope  (malt cof p.gat p.sam)
       |=  {cof/cafe typ/span}
-      %+  (coup cof)  (mong [q.gat q.sam] (mole (slod save)))
+      %+  (coup cof)  (myng [q.gat q.sam] (myle (sloy syve)))
       |=(val/* `vase`[typ val])
     ::
     ++  meow                                            ::  assemble
@@ -1833,6 +1833,15 @@
       ?^  -
         ``u.-
       (ska +<.$)
+    ::
+    ++  syve
+      ^-  sley
+      |=  {* (unit (set monk)) tem/term bem/beam}
+      ^-  (unit (unit cage))
+      =+  (~(get by keg) tem bem)
+      ?^  -
+        ``u.-
+      (ska +<+.$)
     --
   --
 ::

arvo/hoon.hoon

@@ -4533,6 +4533,11 @@
   =+  ton=(mink [sub fol] |~(* ~))
   ?.(?=({$0 *} ton) ~ [~ p.ton])
 ::
+++  mick
+  ~/  %mick
+  |=  {{sub/* fol/*} sea/$+({* *} (unit))}
+  (mink [sub fol] |=(* (sea [151 %noun] +<)))
+::
 ++  mink
   ~/  %mink
   |=  {{sub/* fol/*} sky/$+(* (unit))}
@@ -4613,6 +4618,10 @@
   |=  {{sub/* fol/*} sky/$+(* (unit))}
   (mook (mink [sub fol] sky))
 ::
+++  meck
+  |=  {{sub/* fol/*} sea/$+({* *} (unit))}
+  (mook (mick [sub fol] sea))
+::
 ++  moop
   |=  pon/(list {@ta *})  ^+  pon
   ?~  pon  ~
@@ -4675,6 +4684,13 @@
   =+  ton=(mong [[gat sam] sky])
   ?.(?=({$0 *} ton) ~ [~ p.ton])
 ::
+++  myng
+  |=  {{gat/* sam/*} sea/$+({* *} (unit))}
+  ^-  toon
+  ?.  &(?=(^ gat) ?=(^ +.gat))
+    [%2 ~]
+  (meck [[-.gat [sam +>.gat]] -.gat] sea)
+::
 ++  mong
   |=  {{gat/* sam/*} sky/$+(* (unit))}
   ^-  toon
@@ -10372,9 +10388,14 @@
 ++  sink  (trel bone ship path)                         ::  subscription
 ++  sled  $+  {(unit (set monk)) term beam}             ::  namespace function
           (unit (unit cage))                            ::
-++  slad  $+  {(unit (set monk)) term beam}             ::  underspand
+++  sley  $+  {* (unit (set monk)) term beam}           ::  namespace function
+          (unit (unit cage))                            ::
+++  slad  $+  {(unit (set monk)) term beam}             ::  fully advanced
+          (unit (unit (cask)))                          ::
+++  slyd  $+  {* (unit (set monk)) term beam}           ::  super advanced
           (unit (unit (cask)))                          ::
 ++  slut  $+(* (unit (unit)))                           ::  old namespace
+++  slyt  $+({* *} (unit (unit)))                       ::  old namespace
 ++  vile                                                ::  reflexive constants
           $:  typ/span                                  ::  -:!>(*span)
               duc/span                                  ::  -:!>(*duct)
@@ -10406,6 +10427,30 @@
   ?~  bop  ~
   ?~  u.bop  [~ ~]
   [~ ~ +.q.u.u.bop]
+::
+++  sloy
+  |=  sod/slyd
+  ^-  slyt
+  |=  {ref/* raw/*}
+  =+  pux=((soft path) raw)
+  ?~  pux  ~
+  ?.  ?=({@ @ @ @ *} u.pux)  ~
+  =+  :*  hyr=(slay i.u.pux)
+          fal=(slay i.t.u.pux)
+          dyc=(slay i.t.t.u.pux)
+          ved=(slay i.t.t.t.u.pux)
+          tyl=t.t.t.t.u.pux
+      ==
+  ?.  ?=({$~ $$ $tas @} hyr)  ~
+  ?.  ?=({$~ $$ $p @} fal)  ~
+  ?.  ?=({$~ $$ $tas @} dyc)  ~
+  ?.  ?=(^ ved)  ~
+  =+  ron=q.p.u.hyr
+  =+  bed=[[q.p.u.fal q.p.u.dyc (case p.u.ved)] (flop tyl)]
+  =+  bop=(sod ref ~ ron bed)
+  ?~  bop  ~
+  ?~  u.bop  [~ ~]
+  [~ ~ +.q.u.u.bop]
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::                section 3bE, Arvo core                ::
 ::

arvo/zuse.hoon

@@ -1482,6 +1482,16 @@
   ?~  u.b  ~
   [~ u.u.b]
 ::
+++  myle                                                ::  new to old sky
+  |=  ska/$+({* *} (unit (unit)))
+  ^-  $+({* *} (unit))
+  |=  a/{* *}
+  ^-  (unit)
+  =+  b=(ska a)
+  ?~  b  ~
+  ?~  u.b  ~
+  [~ u.u.b]
+::
 ++  pack                                                ::  light path encoding
   |=  {a/term b/path}  ^-  knot
   %+  rap  3  :-  (wack a)