urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 22:33:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

|merge better spacing, desk ovverides

Browse Source
This commit is contained in:
Anton Dyudin 2016-02-11 11:20:50 -08:00
parent 934babecc7
commit 1e328f3d1f
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gen/hood/merge.hoon
View File

@ -14,17 +14,26 @@
|= $: {now/@da eny/@uvI bek/beak} |= $: {now/@da eny/@uvI bek/beak}
{arg/{?(sorc {syd/$@(desk beaky) sorc})} cas/case gem/?($auto germ)} {arg/{?(sorc {syd/$@(desk beaky) sorc})} cas/case gem/?($auto germ)}
== ==
=. cas ?:(=(*case cas) da+now cas)
=* our p.bek =* our p.bek
|^ :- %kiln-merge |^ :- %kiln-merge
^- {syd/desk her/ship sud/desk cas/case gem/?($auto germ)} ^- {syd/desk her/ship sud/desk cas/case gem/?($auto germ)}
?- arg ?- arg
{@ @ $~} =+(arg [sud ?.(=(our her) her (sein her)) sud cas gem]) {@ @ $~}
{^ $~} =+ (pars bek.arg) =+(arg [sud ?.(=(our her) her (sein her)) sud (opt-case da+now) gem])
[dez ?.(=(our who) who (sein who)) dez caz gem] ::
{* @ @ $~} [(pars-src syd.arg) =+(arg [her sud cas gem])] {^ $~}
{* ^ $~} [(pars-src syd.arg) =+((pars bek.arg) [who dez caz gem])] =+ (pars bek.arg)
[dez ?.(=(our who) who (sein who)) dez (opt-case caz) gem]
::
{* @ @ $~}
:- (pars-src syd.arg)
=+(arg [her sud (opt-case da+now) gem])
::
{* ^ $~}
:- (pars-src syd.arg)
=+((pars bek.arg) [who dez (opt-case caz) gem])]
== ==
++ opt-case |=(a=case ?:(=(*case cas) a cas)) :: override
++ pars |=(a/beaky `{{who/ship dez/desk caz/case} *}`(need (tome a))) ++ pars |=(a/beaky `{{who/ship dez/desk caz/case} *}`(need (tome a)))
++ pars-src ++ pars-src
|= syd/$@(desk beaky) |= syd/$@(desk beaky)