urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-13 16:03:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up ++prep of hall and talk.

Browse Source
This commit is contained in:
Fang 2018-02-22 15:17:12 +01:00
parent 35d3b04d21
commit f5cb07948f
2 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/hall.hoon
View File

@ -117,7 +117,7 @@
:> #
:> functional cores and arms.
::
|_ {bol/bowl:gall $2 state}
|_ {bol/bowl:gall $0 state}
::
:> # %transition
:> prep transition
@ -127,15 +127,7 @@
::
=> |%
++ states
?(state $%({$1 s/state-1} {$2 s/state}))
::
++ state-1
(cork state |=(a/state a(stories (~(run by stories.a) story-1))))
++ story-1
%+ cork story
|=(a/story a(shape *config-1, mirrors (~(run by mirrors.a) config-1)))
++ config-1
{src/(set source) cap/cord tag/(set knot) fit/filter con/control}
$%({$0 s/state})
--
=| mos/(list move)
|= old/(unit states)
@ -144,18 +136,8 @@
%- pre-bake
ta-done:ta-init:ta
?- -.u.old
$2
$0
[mos ..prep(+<+ u.old)]
::
$1
=- $(old `[%2 s.u.old(stories -)])
%- ~(run by stories.s.u.old)
|= soy/story-1
^- story
(story soy(shape [src cap fit con]:shape.soy))
::
?($~ ^) :: $0
$(old `[%2 u.old])
==
::
:> # %engines

26
app/talk.hoon
View File

@ -112,7 +112,7 @@
:> #
:> functional cores and arms.
::
|_ {bol/bowl:gall $2 state}
|_ {bol/bowl:gall $0 state}
::
:> # %transition
:> prep transition
@ -123,32 +123,16 @@
::
=> |%
++ states
?(state $%({$1 s/state-1} {$2 s/state}))
::
++ state-1
(cork state |=(a/state a(mirrors (~(run by mirrors.a) config-1))))
++ config-1
{src/(set source) cap/cord tag/(set knot) fit/filter con/control}
$%({$0 s/state})
--
=| mos/(list move)
|= old/(unit states)
^- (quip move _..prep)
?~ old
ta-done:ta-init:ta
?+ -.u.old
:: $0
$(old `[%2 u.old])
::
$2
[mos ..prep(+<+ [%2 (state +.u.old)])]
::
$1
:: we hard-cast here because it find-errors on s.u.old otherwise?
=+ ole=(state-1 +.u.old)
=- $(old `[%2 ole(mirrors -)])
%- ~(run by mirrors.ole)
|= config-1
[src cap fit con]
?- -.u.old
$0
[mos ..prep(+<+ u.old)]
==
::
:> #