ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-03 14:37:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix doubly included structures not being denamespaced

Browse Source 
Within the other structures they're being doubly included from. Close #373
This commit is contained in:
Anton Dyudin 2015-07-27 16:24:31 -07:00
parent d3ed3553f7
commit 9a0ecc53b0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arvo/ford.hoon
View File

@ -1391,7 +1391,7 @@
++ able :: assemble preamble ++ able :: assemble preamble
^- twig ^- twig
:+ %tsgr :+ %tsgr
?:(=(~ rop) [%$ 1] [%brcn (~(run by rop) |=([* a=twig] [%ash a]))]) ?:(=(~ rop) [%$ 1] [%brcn (~(run by rop) |=([^ a=twig] [%ash a]))])
[%tssg (turn (flop lot) |=(a=term q:(~(got by bil) a)))] [%tssg (turn (flop lot) |=(a=term q:(~(got by bil) a)))]
:: ::
++ ably :: naked structure ++ ably :: naked structure
@ -1570,8 +1570,11 @@
++ head :: consume structures ++ head :: consume structures
|= [cof=cafe bir=(list hoot)] |= [cof=cafe bir=(list hoot)]
^- (bolt ,_..head) ^- (bolt ,_..head)
?~ bir ?~ bir
(fine cof ..head) (fine cof ..head)
=. boy
?: p.i.bir boy
(welp boy [[[%cnzy p.q.i.bir] [%$ 1]] ~])
=+ byf=(~(get by rop) p.q.i.bir) =+ byf=(~(get by rop) p.q.i.bir)
?^ byf ?^ byf
?. =(`hoof`q.i.bir `hoof`p.u.byf) ?. =(`hoof`q.i.bir `hoof`p.u.byf)
@ -1585,9 +1588,7 @@
|= [cof=cafe sel=_..head] |= [cof=cafe sel=_..head]
=. ..head =. ..head
%= sel %= sel
boy ?: p.i.bir boy boy
boy
(welp boy [[[%cnzy p.q.i.bir] [%$ 1]] ~])
zeg zeg zeg zeg
how how how how
rop %+ ~(put by (~(uni by rop) rop.sel)) rop %+ ~(put by (~(uni by rop) rop.sel))