Merge commit '556b398' into HEAD

This commit is contained in:
C. Guy Yarvin 2015-12-20 15:48:44 -08:00
commit 9071f9e78a

View File

@ -7349,6 +7349,7 @@
%duck duck
%dune dune
%dunk dunk
%find find
%fire fire
%firm firm
%fish fish
@ -7498,7 +7499,7 @@
=+ ^= poz ^- post
?- -.i.peh
$& [p.i.peh %& (peek %both p.i.peh)]
$| (finq p.i.peh %both +.q.i.peh)
$| (finq p.i.peh %both q.i.peh)
==
|- ^- type
?: =(1 p.poz)
@ -7963,6 +7964,7 @@
[[%leaf (mesc (trip paz))] duck ~]
::
++ find
~/ %find
|= {dep/@ud way/?($read $rite $both $free) cug/(unit term)}
=+ gil=*(set type)
|- ^- {p/@ud q/(unit post)}
@ -8045,8 +8047,8 @@
$(gil (~(put in gil) sut), sut repo)
==
::
++ finc
~/ %finc
++ fink
~/ %fink
|= {dep/@ud way/?($read $rite $both $free) cug/(unit term)}
^- port
:: ~_ (dunk 'type')
@ -8057,11 +8059,11 @@
(flee u.q.hoq)
::
++ finq
|= {dep/@ud way/?($read $rite $both $free) cog/term}
|= {dep/@ud way/?($read $rite $both $free) cug/(unit term)}
^- post
:: ~_ (dunk 'type')
~_ (show [%c 'find-limb'] ?:(=(%$ cog) '$' [%a cog]))
=+ hoq=(find dep way `cog)
~_ (show [%c 'find-limb'] ?~(cug '*' ?:(=(%$ u.cug) '$' [%a u.cug])))
=+ hoq=(find dep way cug)
?~ q.hoq
~|(%find-none !!)
u.q.hoq
@ -8943,7 +8945,7 @@
::
{$| *}
=> .(sut syp)
=+ hud=(finc p.i.hyp way q.i.hyp)
=+ hud=(fink p.i.hyp way q.i.hyp)
[(peg p.zar p.hud) q.hud]
==
::