mirror of
https://github.com/urbit/shrub.git
synced 2024-12-20 09:21:42 +03:00
Merge branch 'philip/trie' into philip/tomb
This commit is contained in:
commit
3096bc8991
@ -25,7 +25,7 @@
|
|||||||
+$ arch (axil @uvI)
|
+$ arch (axil @uvI)
|
||||||
++ axal
|
++ axal
|
||||||
|$ [item]
|
|$ [item]
|
||||||
[fil=(unit item) dir=(map @ta $)]
|
[fil=(unit item) dir=(map @ta (axal item)]
|
||||||
++ axil
|
++ axil
|
||||||
|$ [item]
|
|$ [item]
|
||||||
[fil=(unit item) dir=(map @ta ~)]
|
[fil=(unit item) dir=(map @ta ~)]
|
||||||
@ -458,7 +458,7 @@
|
|||||||
::
|
::
|
||||||
++ has
|
++ has
|
||||||
|= pax=path
|
|= pax=path
|
||||||
!=(~ fil:(dip pax))
|
!=(~ (get pax))
|
||||||
:: Delete subtree
|
:: Delete subtree
|
||||||
::
|
::
|
||||||
++ lop
|
++ lop
|
||||||
@ -470,11 +470,6 @@
|
|||||||
=/ kid (~(get by dir.fat) i.pax)
|
=/ kid (~(get by dir.fat) i.pax)
|
||||||
?~ kid fat
|
?~ kid fat
|
||||||
fat(dir (~(put by dir.fat) i.pax $(fat u.kid, pax t.pax)))
|
fat(dir (~(put by dir.fat) i.pax $(fat u.kid, pax t.pax)))
|
||||||
:: Serialize to map
|
|
||||||
::
|
|
||||||
++ tar
|
|
||||||
^- (map path _?>(?=(^ fil.fat) u.fil.fat))
|
|
||||||
(~(gas by *(map path _?>(?=(^ fil.fat) u.fil.fat))) tap)
|
|
||||||
::
|
::
|
||||||
++ put
|
++ put
|
||||||
|* [pax=path dat=*]
|
|* [pax=path dat=*]
|
||||||
@ -496,6 +491,10 @@
|
|||||||
dir t.dir
|
dir t.dir
|
||||||
out ^$(pax (weld pax /[p.i.dir]), fat q.i.dir)
|
out ^$(pax (weld pax /[p.i.dir]), fat q.i.dir)
|
||||||
==
|
==
|
||||||
|
:: Serialize to map
|
||||||
|
::
|
||||||
|
++ tar
|
||||||
|
(~(gas by *(map path _?>(?=(^ fil.fat) u.fil.fat))) tap)
|
||||||
--
|
--
|
||||||
::
|
::
|
||||||
++ wa :: cached compile
|
++ wa :: cached compile
|
||||||
|
Loading…
Reference in New Issue
Block a user