Merge pull request #6878 from urbit/develop

Merge develop to next/kelvin/411
This commit is contained in:
Pyry Kovanen 2023-12-19 14:28:28 +02:00 committed by GitHub
commit 13b495bea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -77,6 +77,7 @@
:: +hunt: door used for refining the type while searching for doccords :: +hunt: door used for refining the type while searching for doccords
:: ::
++ hunt ++ hunt
=| gil=(set type)
|_ [topics=(lest term) sut=type] |_ [topics=(lest term) sut=type]
+* this . +* this .
:: ::
@ -255,7 +256,8 @@
^- (unit item) ^- (unit item)
?> ?=([%face *] sut) ?> ?=([%face *] sut)
:: TODO: handle tune case :: TODO: handle tune case
?> ?=(term p.sut) ?. ?=(term p.sut)
return-item:this(sut q.sut)
=* compiled-against return-item:this(sut q.sut) =* compiled-against return-item:this(sut q.sut)
`[%face (trip p.sut) *what compiled-against] `[%face (trip p.sut) *what compiled-against]
:: ::
@ -318,7 +320,14 @@
[%face *] return-face [%face *] return-face
[%fork *] return-fork [%fork *] return-fork
[%hint *] return-hint [%hint *] return-hint
[%hold *] return-item:this(sut (~(play ut p.sut) q.sut)) [%hold *]
?: (~(has in gil) sut)
~
=< return-item
%= this
gil (~(put in gil) sut)
sut (~(play ut p.sut) q.sut)
==
== ==
:: ::
++ return-hint-core ++ return-hint-core