Clean up ++load of vanes.

This commit is contained in:
Fang 2018-02-22 15:19:17 +01:00
parent f5cb07948f
commit 0d647de570
5 changed files with 13 additions and 124 deletions

View File

@ -3571,7 +3571,7 @@
::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
=| :: instrument state
$: $4 :: vane version
$: $0 :: vane version
ruf/raft :: revision tree
== ::
|= {now/@da eny/@ ski/sley} :: activate
@ -3832,72 +3832,12 @@
::
++ load
=> |%
+= wove-3 rove
++ cult-3 (jug wove-3 duct)
++ dojo-3
$: qyx/cult-3
dom/dome
dok/(unit dork)
mer/(unit mery)
==
++ rede-3
$: lim/@da
ref/(unit rind)
qyx/cult-3
dom/dome
dok/(unit dork)
mer/(unit mery)
==
++ room-3 (cork room |=(a/room a(dos (~(run by dos.a) dojo-3))))
++ rung-3 (cork rung |=(a/rung a(rus (~(run by rus.a) rede-3))))
++ raft-3
$: fat/(map ship room-3)
hoy/(map ship rung-3)
ran/rang
mon/(map term beam)
hez/(unit duct)
==
++ axle $%({$3 ruf/raft-3} {$4 ruf/raft})
++ axle $%({$0 ruf/raft})
--
|= old/axle
^+ ..^$
?- -.old
$4 ..^$(ruf ruf.old)
$3 |^
=- ^$(old [%4 -])
=+ ruf.old
:* (~(run by fat) rom)
(~(run by hoy) run)
ran mon hez ~
==
::
++ wov
|= a/wove-3 ^- wove
[~ a]
::
++ cul
|= a/cult-3 ^- cult
%- ~(gas by *cult)
%+ turn ~(tap by a)
|= {p/wove-3 q/(set duct)}
[(wov p) q]
::
++ rom
|= room-3
:- hun
%- ~(urn by dos)
|= {d/desk dojo-3}
=/ n/dojo [(cul qyx) dom dok mer ~ ~]
?. =(%kids d) n
n(per [[/ %black ~] ~ ~])
::
++ run
=/ red
|= rede-3
=+ [[/ %black ~] ~ ~]
[lim ref (cul qyx) dom dok mer - -]
|=(a/rung-3 a(rus (~(run by rus.a) red)))
--
$0 ..^$(ruf ruf.old)
==
::
++ scry :: inspect
@ -3929,7 +3869,7 @@
?: ?=($& -.u.u.-) ``p.u.u.-
~
::
++ stay [%4 ruf]
++ stay [%0 ruf]
++ take :: accept response
|= {tea/wire hen/duct hin/(hypo sign)}
^+ [p=*(list move) q=..^$]

View File

@ -7,15 +7,9 @@
++ gill (pair ship term) :: general contact
-- ::
=> |% :: console protocol
++ all-axle ?(old-axle axle) ::
++ old-axle :: all dill state
$: $2 ::
ore/(unit ship) :: identity once set
hey/(unit duct) :: default duct
dug/(map duct axon) :: conversations
== ::
++ all-axle ?(axle) ::
++ axle ::
$: $3 ::
$: $0 ::
ore/(unit ship) :: identity once set
hey/(unit duct) :: default duct
dug/(map duct axon) :: conversations
@ -520,8 +514,6 @@
::
++ load :: trivial
|= old/all-axle
?: ?=($2 -.old)
$(old [%3 ore hey dug ~ ~ ~ ~ ~ ~]:old)
..^$(all old)
:: |= old=* :: diable
:: ..^$(ore.all `~zod)

View File

@ -85,7 +85,7 @@
-- ::
|% :: models
++ bolo :: eyre state
$: $6 :: version
$: $0 :: version
gub/@t :: random identity
hov/(unit ship) :: master for remote
top/beam :: ford serve prefix
@ -2025,15 +2025,10 @@
~
::
++ load :: take previous state
=+ driv-5=_=>(*driv [cor=p req=req.q])
=+ bolo-5={$5 _=+(*bolo +.-(sec (~(run by sec.-) driv-5)))}
=+ bolo-4={$4 _%*(+ *bolo-5 lyv *(map duct ^))}
::|= * %. (bolo +<)
|= old/?(bolo bolo-5 bolo-4) ^+ ..^$
|= old/?(bolo) ^+ ..^$
?- -.old
$6 ..^$(+>- old)
$5 $(old [%6 +.old(sec (~(run by sec.old) |=(driv-5 [cor & req])))])
$4 $(old [%5 +.old(lyv ~)]) :: minor leak
$0 ..^$(+>- old)
==
::
++ scry

View File

@ -33,7 +33,7 @@
-- ::
|% :: structures
++ axle :: all %ford state
$: $2 :: version for update
$: $0 :: version for update
pol/(map ship baby) ::
== ::
++ baby :: state by ship

View File

@ -31,27 +31,11 @@
-- ::
|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: %gall state
::::::::::::::::::::::::::::::::::::::::::::::::::::::
++ axle-n ?(axle-1 axle-2 axle-3 axle-4) :: upgrade path
++ axle-1 {$1 pol/(map ship mast-1)} ::
++ mast-1 ::
(cork mast-2 |=(mast-2 +<(bum (~(run by bum) seat-1)))) ::
++ seat-1 ::
(cork seat-2 |=(seat-2 +<+)) ::
++ axle-2 {$2 pol/(map ship mast-2)} ::
++ mast-2 (cork mast-3 |=(mast-3 +<+)) ::
++ seat-2 seat-3 ::
++ axle-3 {$3 pol/(map ship mast-3)} ::
++ mast-3 ::
(cork mast-4 |=(mast-4 +<(bum (~(run by bum) seat-3)))) ::
++ seat-3 ::
(cork seat-4 |=(seat-4 +<+)) ::
++ axle-4 axle ::
++ mast-4 mast ::
++ seat-4 seat ::
++ axle-n ?(axle) :: upgrade path
:::::::::::::::::::::::::::::::::::::::::::::::::::::: state proper
::::::::::::::::::::::::::::::::::::::::::::::::::::::
++ axle :: all state
$: $4 :: state version
$: $0 :: state version
pol/(map ship mast) :: apps by ship
== ::
++ gest :: subscriber data
@ -1311,29 +1295,7 @@
|= old/axle-n
^+ ..^$
?- -.old
$4 ..^$(all old)
$3
%= $
old ^- axle-4
=> |=(seat-3 `seat-4`[*misvale-data +<])
=> |=(mast-3 +<(bum (~(run by bum) +>)))
old(- %4, pol (~(run by pol.old) .))
==
::
$2
%= $
old ^- axle-3
=> |=(mast-2 [*(unit duct) +<])
old(- %3, pol (~(run by pol.old) .))
==
::
$1
%= $
old ^- axle-2
=> |=(seat-1 `seat-2`[*worm +<])
=> |=(mast-1 +<(bum (~(run by bum) +>)))
old(- %2, pol (~(run by pol.old) .))
==
$0 ..^$(all old)
==
::
++ scry