Merge pull request #1029 from urbit/jael-mass

Handle |mass in Jael
This commit is contained in:
Ted Blackman 2019-01-29 17:17:13 -08:00 committed by GitHub
commit 29df37b5ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 62 additions and 40 deletions

View File

@ -1537,8 +1537,7 @@
::
++ wegh
^- mass
:- %ames
:- %|
:~ fox+[%& fox]
:+ %ames %|
:~ dot+&+fox
==
--

View File

@ -81,9 +81,9 @@
%wegh
:_ state :_ ~
:^ hen %give %mass
:- %behn
:- %|
:~ timers+[%& timers]
:+ %behn %|
:~ timers+&+timers
dot+&+state
==
==
::

View File

@ -3928,14 +3928,14 @@
$wegh
:_ ..^$ :_ ~
:^ hen %give %mass
:- %clay
:- %|
:~ domestic+[%& rom.ruf]
foreign+[%& hoy.ruf]
:- %object-store :- %|
:~ commits+[%& hut.ran.ruf]
blobs+[%& lat.ran.ruf]
:+ %clay %|
:~ domestic+&+rom.ruf
foreign+&+hoy.ruf
:+ %object-store %|
:~ commits+&+hut.ran.ruf
blobs+&+lat.ran.ruf
==
dot+&+ruf
==
==
::

View File

@ -1,4 +1,4 @@
::
!:
:: dill (4d), terminal handling
::
|= pit/vase
@ -19,6 +19,7 @@
e/(unit mass) ::
f/(unit mass) ::
g/(unit mass) ::
j/(unit mass) ::
== ::
== ::
++ axon :: dill per duct
@ -77,7 +78,7 @@
snap=(unit snapshot:jael) :: head start
== ::
[%fake our=ship] :: boot fake
:: XX wegh ::
[%wegh ~]
== ::
++ note :: out request $->
$% {$a note-ames} ::
@ -120,6 +121,7 @@
== ::
++ sign-jael ::
$% [%init p=ship] ::
[%mass p=mass]
== ::
++ sign :: in result $<-
$% {$a sign-ames} ::
@ -280,6 +282,7 @@
[hen %pass /heft/eyre %e %wegh ~]
[hen %pass /heft/ford %f %wegh ~]
[hen %pass /heft/gall %g %wegh ~]
[hen %pass /heft/jael %j %wegh ~]
moz
==
==
@ -374,7 +377,7 @@
|= sih/sign
^+ +>
?- sih
{?($a $b $c $e $f $g) $mass *}
{?($a $b $c $e $f $g $j) $mass *}
(wegt -.sih p.sih)
::
{$a $nice *}
@ -428,13 +431,14 @@
::
++ wegh
^- mass
:- %dill
:- %|
:~ all+[%& [hey dug]:all]
:+ %dill %|
:~ hey+&+hey.all
dug+&+dug.all
dot+&+all
==
::
++ wegt
|= {lal/?($a $b $c $e $f $g) mas/mass}
|= {lal/?($a $b $c $e $f $g $j) mas/mass}
^+ +>
=. hef.all
?- lal
@ -444,6 +448,7 @@
$e ~?(?=(^ e.hef.all) %double-mass-e hef.all(e `mas))
$f ~?(?=(^ f.hef.all) %double-mass-f hef.all(f `mas))
$g ~?(?=(^ g.hef.all) %double-mass-g hef.all(g `mas))
$j ~?(?=(^ j.hef.all) %double-mass-j hef.all(j `mas))
==
?. ?& ?=(^ a.hef.all)
?=(^ b.hef.all)
@ -451,12 +456,13 @@
?=(^ e.hef.all)
?=(^ f.hef.all)
?=(^ g.hef.all)
?=(^ j.hef.all)
==
+>.$
%+ done(hef.all [~ ~ ~ ~ ~ ~])
%+ done(hef.all [~ ~ ~ ~ ~ ~ ~])
%mass
=> [hef.all d=wegh]
[%vanes %| ~[u.a u.c d u.e u.f u.g u.b]]
[%vanes %| ~[u.a u.b u.c d u.e u.g u.f u.j]]
--
::
++ ax :: make ++as

View File

@ -2296,12 +2296,13 @@
?: ?=($wegh -.task)
:_ ..^$ :_ ~
:^ hen %give %mass
:- %eyre
:- %|
:~ dependencies+[%& liz] sessions+[%& wup] views+[%& wix]
ducts+[%| ~[dead+[%& ded] proxy+[%& pox] outgoing+[%& ask]]]
hosts+[%& dop]
misc+[%& bol]
:+ %eyre %|
:~ dependencies+&+liz
sessions+&+wup
views+&+wix
ducts+[%| ~[dead+&+ded proxy+&+pox outgoing+&+ask]]
hosts+&+dop
dot+&+bol
==
=+ ska=(sloy ski)
=+ sky=|=({* *} `(unit)`=+(a=(ska +<) ?~(a ~ ?~(u.a ~ [~ u.u.a]))))

View File

@ -6196,14 +6196,11 @@
:_ ~
:^ duct %give %mass
^- mass
:- %ford
:- %|
:~ ^- mass
:+ (scot %p our) %|
::
:~ [%builds [%& builds.state.ax]]
[%compiler-cache [%& compiler-cache.state.ax]]
== ==
:+ %ford %|
:~ builds+&+builds.state.ax
compiler-cache+&+compiler-cache.state.ax
dot+&+ax
==
==
:: +take: receive a response from another vane
::

View File

@ -1331,15 +1331,15 @@
::
$wegh
=/ =mass
=* mas mast.all
:+ (scot %p our) %|
:~ [%foreign [%& sap.mast.all]]
:+ %gall %|
:~ foreign+&+sap.mast.all
:+ %blocked %|
(sort ~(tap by (~(run by wub.mast.all) |=(sofa [%& +<]))) aor)
:+ %active %|
(sort ~(tap by (~(run by bum.mast.all) |=(seat [%& +<]))) aor)
dot+&+all
==
=/ =move [hen %give %mass %gall %| [mass ~]]
=/ =move [hen %give %mass mass]
[[move ~] ..^$]
==
::

View File

@ -889,6 +889,23 @@
::
$vine
+>(yen (~(put in yen) hen))
::
%wegh
%_ +>
moz
:_ moz
^- move
:^ hen %give %mass
^- mass
:+ %jael %|
:~ yen+&+yen
urb+&+urb
sub+&+sub
etn+&+etn
sap+&+sap
dot+&+lex
==
==
::
:: authenticated remote request
:: {$west p/ship q/path r/*}

View File

@ -1786,6 +1786,7 @@
== == ::
++ gift :: out result <-$
$% [%init p=ship] :: report install unix
[%mass p=mass] :: memory usage report
[%mack p=(unit tang)] :: message n/ack
[%pubs public] :: public keys
[%turf turf=(list turf)] :: domains
@ -1862,6 +1863,7 @@
[%vent ~] :: view ethereum events
[%vest ~] :: view public balance
[%vine ~] :: view secret history
[%wegh ~] :: memory usage request
[%west p=ship q=path r=*] :: remote request
[%wind p=@ud] :: rewind before block
== ::