urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-04 18:43:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve $-() defaulting.

Browse Source
This commit is contained in:
C. Guy Yarvin 2017-12-13 18:44:18 -08:00
parent 77e364e79f
commit 51e0505fbd
1 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
sys/hoon.hoon
View File

@ -4505,10 +4505,12 @@
(next tub)
::
++ knee :: callbacks
|* {gar/* sef/_|.(*rule)}
|= tub/nail
^- (like _gar)
((sef) tub)
=| {gar/* sef/_|.(*rule)}
|% +- $
|= tub/nail
^- (like _gar)
((sef) tub)
--
::
++ mask :: match char in set
~/ %mask
@ -4639,7 +4641,7 @@
$(hel r.hel)
::
++ slug ::
|* raq/_|*({a/* b/*} [a b])
|* raq/_=>(~ |*({a/* b/*} [a b]))
|* {bus/rule fel/rule}
;~((comp raq) fel (stir +<+.raq raq ;~(pfix bus fel)))
::
@ -4649,7 +4651,7 @@
::
++ stir
~/ %stir
|* {rud/* raq/_|*({a/* b/*} [a b]) fel/rule}
|* {rud/* raq/_=>(~ |*({a/* b/*} [a b])) fel/rule}
~/ %fun
|= tub/nail
^- (like _rud)
@ -4968,7 +4970,7 @@
::
:::: 4k: atom printing
::
++ co !.
++ co
~% %co ..co ~
=< |_ lot/coin
++ rear |=(rom/tape =>(.(rep rom) rend))
@ -5478,6 +5480,8 @@
(mook (mink [sub fol] gul))
::
++ musk :: nock with block set
=> :: keep soft core out of models
+
=> |%
++ block
:: identity of resource awaited
@ -5537,7 +5541,7 @@
::
|+~(tap in blocks)
::
++ apex
++ araw
:: execute nock on partial subject
::
|= $: :: bus: subject, a partial noun
@ -5546,10 +5550,6 @@
bus/seminoun
fol/noun
==
^- output
:: simplify result
::
%- abet
:: interpreter loop
::
|- ^- result
@ -5741,6 +5741,20 @@
$(fol d.fol)
==
::
++ apex
:: execute nock on partial subject
::
|= $: :: bus: subject, a partial noun
:: fol: formula, a complete noun
::
bus/seminoun
fol/noun
==
^- output
:: simplify result
::
(abet (araw bus fol))
::
++ combine
:: combine a pair of seminouns
::
@ -5897,7 +5911,7 @@
--
::
++ mute :: untyped virtual
|= taq/_^?(|.(**))
|= taq/_=>(~ ^?(|.(**)))
^- (each * (list tank))
=+ ton=(mock [taq 9 2 0 1] |=({* *} ~))
?- -.ton
@ -6179,7 +6193,6 @@
{$help p/writ q/type} :: description
{$hold p/type q/hoon} :: lazy evaluation
== ::
++ tyro $-(type type) :: type converter
++ tone $% {$0 p/*} :: success
{$1 p/(list)} :: blocks
{$2 p/(list {@ta *})} :: error ~_s
@ -6869,28 +6882,7 @@
:: probe for cell or default
::
^- hoon
:: ~& [%probe axe mod]
::
:: old subject is wrapped by trap
::
=: axe (peg 3 axe)
dom (peg 3 dom)
==
:: guarded trap
::
:+ %tsgr
:: construct within trap
::
:+ %brdt ~^~
:: trap is only kicked if sample is cell
::
:: :+ %sgbc
:: %run-deep
construct(top [& &])
:: boc: call constructor
:: but: default
::
=/ boc/hoon [%limb %$]
=/ boc/hoon construct(top [& &])
=/ but/hoon default
:: :+ %sgbc
:: %run-probing
@ -7543,11 +7535,12 @@
:- %weed
:- %cold
:+ %tsgr
[p.gen q.gen]
:- [%tsgr p.gen [%limb %$]]
[%tsgr q.gen [%limb %$]]
:- %ktbr
:^ %brcl [~ ~]
[%tsgr [%$ 2] [%limb %$]]
[%tsgr [%$ 15] [%limb %$]]
[%$ 2]
[%$ 15]
::
{$halo *} [%plow p.gen boil(gen q.gen)]
{$bcts *} [%bark p.gen boil(gen q.gen)]
@ -8252,18 +8245,21 @@
:: ~> %slog.[%0 (dunk 'blow-subject')]
=+ bus=bran
:: ~| mask.bus
=+ jon=(apex:musk bus q.pro)
=+ jon=?:(fab (apex:musk bus q.pro) (apex:musk bus q.pro))
?~ jon
?: fab
[p.pro [%10 [%live %1 %constant-stop] q.pro]]
:: [p.pro [%10 [%live %1 %constant-stop-fab] q.pro]]
:: ~_ (dunk '%constant-blocked-type')
:: ~| [%constant-stopped-gene gen]
:: ~| [%constant-stopped-mask mask.bus]
:: ~| [%constant-stopped-formula `@p`(mug q.pro) q.pro]
~| %constant-folding-stopped
!!
?: ?=($| -.u.jon)
?: fab
[p.pro [%10 [%live %1 %constant-block] q.pro]]
:: [p.pro [%10 [%live %1 %constant-block-fab] q.pro]]
~& %constant-blocked
~_ (dunk '%constant-blocked-type')
~| [%constant-blocked-gene gen]
~| [%constant-blocked-mask mask.bus]
@ -9898,7 +9894,7 @@
==
::
++ take
|= {vit/vein duz/tyro}
|= {vit/vein duz/$-(type type)}
^- (pair axis type)
:- (tend vit)
=. vit (flop vit)