Merge commit 'b98362' into cc-merge

This commit is contained in:
C. Guy Yarvin 2016-11-13 19:38:46 -08:00
commit 84b993c3a3
2 changed files with 6 additions and 5 deletions

View File

@ -451,10 +451,10 @@
?~ pax (err "blocking empty")
=+ ren=((soft care:^clay) (rsh 3 1 i.pax))
?~ ren
(err "blocking not care")
(err "blocking not care: {<i.pax>}")
=+ zis=(tome t.pax)
?~ zis
(err "blocking not beam")
(err "blocking not beam: {<t.pax>}")
?: ?=($g (end 3 1 i.pax))
?- -.nex
$& [%& [%g u.ren u.zis] p.nex]

View File

@ -1149,15 +1149,16 @@
|= {cog/term gat/vase arg/vase}
^- {(each vase tang) _+>}
=+ ^= wyz %- mule |.
(~(play wa vel) [%cell p.gat p.arg] [%open [%$ ~] [%$ 2] [%$ 3] ~])
(~(mint wa vel) [%cell p.gat p.arg] [%open [%$ ~] [%$ 2] [%$ 3] ~])
?: ?=($| -.wyz)
%- =+ sam=(~(peek ut p.gat) %free 6)
(slog >%ap-slam-mismatch< ~(duck ut p.arg) ~(duck ut sam) ~)
:_(+>.$ [%| (ap-suck "call: {<cog>}: type mismatch")])
:_ +>.$(vel +>.wyz)
=+ ton=(mong [q.gat q.arg] ap-sled)
=+ [typ nok]=+<.wyz
=+ ton=(mock [[q.gat q.arg] nok] ap-sled)
?- -.ton
$0 [%& +<.wyz p.ton]
$0 [%& typ p.ton]
$1 [%| (turn p.ton |=(a/* (smyt (path a))))]
$2 [%| p.ton]
==