aqua: refine pill types

Introduces a %boot-pill mark and associated types, to distinguish pills
that can be used to boot a ship and the ivory pill. Changes aqua to
receive this new %boot-pill mark
This commit is contained in:
Liam Fitzgerald 2021-06-17 14:33:11 +10:00
parent 74ad9fbb12
commit 61845e605e
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
5 changed files with 35 additions and 19 deletions

View File

@ -38,11 +38,7 @@
==
:: XX temporarily shadowed, fix and remove
::
+$ pill
$: boot-ova=*
kernel-ova=(list unix-event)
userspace-ova=(list unix-event)
==
+$ pill boot-pill:pill-lib
::
+$ fleet [ships=(map ship pier) azi=az-state]
+$ pier
@ -86,7 +82,7 @@
=^ cards state
?+ mark ~|([%aqua-bad-mark mark] !!)
%aqua-events (poke-aqua-events:ac !<((list aqua-event) vase))
%pill (poke-pill:ac !<(pill vase))
%boot-pill (poke-pill:ac !<(pill vase))
%noun (poke-noun:ac !<(* vase))
%azimuth-action (poke-azimuth-action:ac !<(azimuth-action vase))
==
@ -411,10 +407,11 @@
::
?+ val ~|(%bad-noun-arg !!)
[%swap-vanes vs=*]
?> ?=([[%7 * %1 installed=*] ~] boot-ova.pil)
=. installed.boot-ova.pil
?> ?=(^ boot-ova.pil)
?> ?=([%7 * %1 installed=*] i.boot-ova.pil)
=. installed.i.boot-ova.pil
%+ roll (,(list term) vs.val)
|= [v=term =_installed.boot-ova.pil]
|= [v=term =_installed.i.boot-ova.pil]
%^ slum installed now.hid
=/ vane
?+ v ~|([%unknown-vane v] !!)

View File

@ -12,8 +12,8 @@
arg=$@(~ [top=path ~])
~
==
:- %noun
^- pill:pill
:- %boot-pill
^- boot-pill:pill
::
:: sys: root path to boot system, `/~me/[desk]/now/sys`
::

View File

@ -15,8 +15,8 @@
arg=$@(~ [top=path ~])
dub=_|
==
:- %pill
^- pill:pill
:- %boot-pill
^- boot-pill:pill
:: sys: root path to boot system, `/~me/[desk]/now/sys`
::
=/ sys=path

View File

@ -5,12 +5,16 @@
::
+$ pill
$% [%ivory p=(list)]
$: %pill
nam=term
boot-ova=(list)
kernel-ova=(list unix-event)
userspace-ova=(list unix-event)
== ==
boot-pill
==
::
+$ boot-pill
$: %pill
nam=term
boot-ova=(list)
kernel-ova=(list unix-event)
userspace-ova=(list unix-event)
==
::
+$ unix-event
%+ pair wire

View File

@ -0,0 +1,15 @@
::
:::: /hoon/pill/mar
::
/+ *pill
|_ pil=boot-pill
++ grow
|%
++ noun pil
--
++ grab
|%
++ noun boot-pill
--
++ grad %mime
--