ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-05 22:03:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

gall: more cleanup to +ap arms

Browse Source
This commit is contained in:
Jared Tobin 2019-04-27 18:08:29 +12:00 committed by Jared Tobin
parent 953627cec3
commit ffae93ba1a
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
pkg/arvo/sys/vane/gall.hoon
View File

@ -113,8 +113,10 @@
ska=sley :: activate ska=sley :: activate
== :: opaque core == :: opaque core
~% %gall-top ..is ~ ~% %gall-top ..is ~
|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: state machine ::
:::::::::::::::::::::::::::::::::::::::::::::::::::::: :: state machine
::
|%
++ mo ++ mo
~% %gall-mo +> ~ ~% %gall-mo +> ~
:: ::
@ -854,6 +856,9 @@
:: ::
++ ap ++ ap
~% %gall-ap +> ~ ~% %gall-ap +> ~
::
:: FIXME refactor this into something sane
::
|_ $: $: dap=dude |_ $: $: dap=dude
pry=prey pry=prey
ost=bone ost=bone
@ -869,20 +874,24 @@
:: ::
++ ap-abed ++ ap-abed
~/ %ap-abed ~/ %ap-abed
|= [dap=dude pry=prey] |= [=dude =prey]
^+ ap-state ^+ ap-state
:: ::
=: ^dap dap =: dap dude
^pry pry pry prey
+>+<+ `seat`(~(got by bum.mas) dap) +>+<+ `seat`(~(got by bum.mas) dude) :: FIXME lark
== ==
=+ unt=(~(get by q.zam) hen) ::
=/ unt (~(get by q.zam) hen)
::
=: act.tyc +(act.tyc) =: act.tyc +(act.tyc)
eny.tyc (shaz (mix (add dap act.tyc) eny)) eny.tyc (shaz (mix (add dude act.tyc) eny))
lat.tyc now lat.tyc now
== ==
::
?^ unt ?^ unt
ap-state(ost u.unt) ap-state(ost u.unt)
::
%= ap-state %= ap-state
ost p.zam ost p.zam
p.zam +(p.zam) p.zam +(p.zam)
@ -910,16 +919,19 @@
|- |-
^+ ap-state ^+ ap-state
?^ pyz ?^ pyz
?. ?=({$give $diff *} q.i.pyz) ?. ?=([%give %diff *] q.i.pyz)
$(pyz t.pyz) $(pyz t.pyz)
=^ vad ap-state ap-fill(ost p.i.pyz) =^ vad ap-state ap-fill(ost p.i.pyz)
$(pyz t.pyz, ful ?:(vad ful (~(put in ful) p.i.pyz))) $(pyz t.pyz, ful ?:(vad ful (~(put in ful) p.i.pyz)))
=+ ded=~(tap in ful) ::
=/ ded ~(tap in ful)
|- |-
^+ ap-state ^+ ap-state
?~ ded ap-state ?~ ded ap-state
=> %*(. $(ded t.ded) ost i.ded) => %*(. $(ded t.ded) ost i.ded)
=+ tib=(~(get by sup.ged) ost) ::
=/ tib (~(get by sup.ged) ost)
::
?~ tib ~&([%ap-abut-bad-bone dap ost] ..ap-kill) ?~ tib ~&([%ap-abut-bad-bone dap ost] ..ap-kill)
ap-kill(q.q.pry p.u.tib) ap-kill(q.q.pry p.u.tib)
:: ::
@ -932,25 +944,25 @@
:: ::
:- (~(got by r.zam) p.cov) :- (~(got by r.zam) p.cov)
?- -.q.cov ?- -.q.cov
?($slip $sick) !! ?(%slip %sick) !!
$give %give
?< =(0 p.cov) ?< =(0 p.cov)
?. ?=($diff -.p.q.cov) ?. ?=(%diff -.p.q.cov)
[%give %unto p.q.cov] [%give %unto p.q.cov]
=+ cay=`cage`p.p.q.cov ::
=+ mar=(~(gut by pyl) p.cov p.cay) =/ cay=cage p.p.q.cov
=/ mar (~(gut by pyl) p.cov p.cay)
::
?: =(mar p.cay) [%give %unto p.q.cov] ?: =(mar p.cay) [%give %unto p.q.cov]
:+ %pass :+ %pass
[%sys %pel dap ~] [%sys %pel dap ~]
[%f %build live=%.n [%cast [p q]:(mo-beak dap) mar [%$ cay]]] [%f %build live=%.n [%cast [p q]:(mo-beak dap) mar [%$ cay]]]
:: ::
$pass %pass
:+ %pass `path`[%use dap p.q.cov] :+ %pass `path`[%use dap p.q.cov]
?- -.q.q.cov ?- -.q.q.cov
:: $hiss `note-arvo`[%e %hiss +.q.q.cov] %send `note-arvo`[%g %deal [our p.q.q.cov] q.q.q.cov]
$send `note-arvo`[%g %deal [our p.q.q.cov] q.q.q.cov] %meta `note-arvo`[`@tas`p.q.q.cov %meta `vase`q.q.q.cov]
$meta `note-arvo`[`@tas`p.q.q.cov %meta `vase`q.q.q.cov]
:: $response `note-arvo`[%i %response raw-http-response.q.q.cov]
== ==
:: ::
:: I'm sort of stumped on how to get a %give out of the above; it's :: I'm sort of stumped on how to get a %give out of the above; it's
@ -961,7 +973,10 @@
:: +ap-avid: onto results. :: +ap-avid: onto results.
:: ::
++ ap-avid ++ ap-avid
|=(a=(each suss tang) [hen %give %onto a]) |= a=(each suss tang)
^- move
::
[hen %give %onto a]
:: ::
:: +ap-call: call into server. :: +ap-call: call into server.
:: ::