diff --git a/bin/brass.pill b/bin/brass.pill index f50e6598de..06b5973421 100644 --- a/bin/brass.pill +++ b/bin/brass.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1825ad5db5c696f36b7333ca906401a505ecc3244ec19f5dcf80cf7857a79065 -size 11221938 +oid sha256:7bf18a0a70e3eb66edf08c49ee57de7551c6894cf2e04a7b93a46109e31d7c73 +size 11254785 diff --git a/bin/ivory.pill b/bin/ivory.pill index 1ff4b80f22..c8de502e85 100644 --- a/bin/ivory.pill +++ b/bin/ivory.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baf4d3f4c74ad190a3548232cf9caa40c1433cc29070136ceeeea5fa7b99a004 -size 6212767 +oid sha256:0b34cfea64cdaf45ef0206cbed7909d1c54979a17eeb01306b850bb8b62ecb5c +size 6222454 diff --git a/bin/solid.pill b/bin/solid.pill index fda0debb6b..5ea3d84abb 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3595404052bad183ac0be94bf46deec4a14c16c7ed4fd8aa6159eb24ad21a8cb -size 13839902 +oid sha256:ccd7237c1f0b36490f3444f2b6a7ea9b10ae3395659c9527d3aa03b9370fabc5 +size 13874028 diff --git a/pkg/arvo/app/talk.hoon b/pkg/arvo/app/talk.hoon index e0433c8ff3..bbfcea76e6 100644 --- a/pkg/arvo/app/talk.hoon +++ b/pkg/arvo/app/talk.hoon @@ -1331,10 +1331,19 @@ :: executes {exe} and sends both its code and :: result. :: - |= {txt/cord exe/hoon} - => |.([(sell (slap (slop hoon-head seed) exe))]~) - =+ tan=p:(mule .) - (say [%exp txt tan] ~) + |= [txt=cord exe=hoon] + :: XX revisit + :: + :: this double-virtualizes and clams to disable .^ + :: + =; tan=(list tank) + (say [%exp txt tan] ~) + ;; (list tank) + =< +> + %+ mong + :- mute + |.([(sell (slap (slop hoon-head seed) exe))]~) + |=(^ ~) :: ++ target :: %target diff --git a/pkg/arvo/lib/hall-json.hoon b/pkg/arvo/lib/hall-json.hoon index 58e146883e..792d1217c6 100644 --- a/pkg/arvo/lib/hall-json.hoon +++ b/pkg/arvo/lib/hall-json.hoon @@ -577,7 +577,17 @@ :+ ~ u.exp =+ res=((ot res+(ar dank) ~) a) ?^ res u.res - p:(mule |.([(sell (slap !>(..^zuse) (ream u.exp)))]~)) ::TODO oldz + :: XX revisit + :: + :: this double-virtualizes and clams to disable .^ + :: the subject of the eval should include [our now eny] + :: + ;; (list tank) + =< +> + %+ mong + :- mute + |.([(sell (slap !>(..^zuse) (ream u.exp)))]~) + |=(^ ~) :: ++ atta ::: attache ^- $-(json (unit attache)) diff --git a/pkg/arvo/sys/arvo.hoon b/pkg/arvo/sys/arvo.hoon index 6e74ffabe4..159a7c7819 100644 --- a/pkg/arvo/sys/arvo.hoon +++ b/pkg/arvo/sys/arvo.hoon @@ -64,7 +64,7 @@ ++ sley $- {* (unit (set monk)) term beam} :: namespace function (unit (unit cage)) :: ++ slyd $- {* (unit (set monk)) term beam} :: super advanced - (unit (unit (cask))) :: + (unit (unit (cask milt))) :: ++ slyt $-({* *} (unit (unit))) :: old namespace +$ vane [=vase =worm] ++ vile :: reflexive constants @@ -112,10 +112,18 @@ ?~ dyc ~ ?. ?=(^ ved) ~ =/ ron=@tas u.hyr - =+ bed=[[u.fal u.dyc (case p.u.ved)] (flop tyl)] - =+ bop=(sod ref ~ ron bed) + =/ bed=beam + [[u.fal u.dyc (case p.u.ved)] (flop tyl)] + =/ bop=(unit (unit (cask milt))) + (sod ref ~ ron bed) ?~ bop ~ ?~ u.bop [~ ~] + :: XX figure out wth to do about hoon-version + :: + ?. ?& ?=([?(%151 %141) *] ref) + -:(~(nets wa *worm) +.ref -.q.u.u.bop) + == + ~>(%slog.[0 leaf+"arvo: scry-lost"] ~) [~ ~ +.q.u.u.bop] :: +sloy-light: minimal parsing version of sloy :: @@ -135,10 +143,18 @@ |= [ref=* ron=@tas fal=@p dyc=@tas ved=case tyl=path] :: we do not flop tyl because tyl wouldn't have been flopped by +en-beam :: - =+ bed=[[fal dyc ved] tyl] - =+ bop=(sod ref ~ ron bed) + =/ bed=beam + [[fal dyc ved] tyl] + =/ bop=(unit (unit (cask milt))) + (sod ref ~ ron bed) ?~ bop ~ ?~ u.bop [~ ~] + :: XX figure out wth to do about hoon-version + :: + ?. ?& ?=([?(%151 %141) *] ref) + -:(~(nets wa *worm) +.ref -.q.u.u.bop) + == + ~>(%slog.[0 leaf+"arvo: scry-dark"] ~) [~ ~ +.q.u.u.bop] :: ++ symp :: symbol or empty @@ -350,7 +366,7 @@ ren/@t bed/beam == - ^- (unit (unit (cask))) + ^- (unit (unit (cask milt))) :: ~& [%arvo-scry ren bed] =/ old=scry-sample :* fur @@ -360,10 +376,10 @@ `coin`[%$ r.bed] (flop s.bed) == - ^- (unit (unit (cask))) + ^- (unit (unit (cask milt))) =+ fun=-:(~(slap wa worm.vane) rig [%limb %scry]) :: - %- (unit (unit (cask))) + %- (unit (unit (cask milt))) (slum q.fun old) :: ++ soar :: scrub vane @@ -441,12 +457,12 @@ |_ now/@da ++ beck ^- slyd - |= {* fur/(unit (set monk)) ron/term bed/beam} - ^- (unit (unit (cask))) + |= {typ/* fur/(unit (set monk)) ron/term bed/beam} + ^- (unit (unit (cask milt))) => .(fur ?^(fur fur `[[%& p.bed] ~ ~])) :: XX heinous =+ lal=(end 3 1 ron) =+ ren=(@t (rsh 3 1 ron)) - |- ^- (unit (unit (cask))) + |- ^- (unit (unit (cask milt))) ?~ vanes ~ ?. =(lal label.i.vanes) $(vanes t.vanes) ~| [%failed-scry ron bed] diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 77e62a5de9..9ca4b92d39 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -6470,7 +6470,7 @@ ++ mute :: untyped virtual |= taq/_=>(~ ^?(|.(**))) ^- (each * (list tank)) - =+ ton=(mock [taq %9 2 %0 1] |=({* *} ~)) + =/ ton (mock [taq %9 2 %0 1] |=((pair) ``.*(~ [%12 1+p 1+q]))) ?- -.ton $0 [%& p.ton] $1 [%| (turn p.ton |=(a/* (smyt (path a))))] diff --git a/pkg/arvo/sys/vane/ford.hoon b/pkg/arvo/sys/vane/ford.hoon index 23b81fa159..e425d7cfe5 100644 --- a/pkg/arvo/sys/vane/ford.hoon +++ b/pkg/arvo/sys/vane/ford.hoon @@ -5570,7 +5570,7 @@ %- sloy ^- slyd ~/ %intercepted-scry |= [ref=* (unit (set monk)) =term =beam] - ^- (unit (unit (cask))) + ^- (unit (unit (cask milt))) :: if the actual scry produces a value, use that value; otherwise use local :: =/ scry-response (scry +<.$) @@ -5606,7 +5606,7 @@ ?. -:(nets:wa +.ref `type`p.q.local-cage) [~ ~] :: - [~ ~ `(cask)`local-cage] + [~ ~ local-cage] :: +unblock-clients-on-duct: unblock and produce clients blocked on :build :: ++ unblock-clients-on-duct