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

Merge branch 'test' of https://github.com/urbit/urbit into test

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2015-01-26 12:55:52 -08:00
commit cc07287e80
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arvo/hoon.hoon
View File

@ -3653,9 +3653,9 @@
|= pax=path ^- tape |= pax=path ^- tape
=- ~(ram re %rose ["/" "/" ~] -) =- ~(ram re %rose ["/" "/" ~] -)
(turn pax |=(a=span [%leaf (trip a)])) (turn pax |=(a=span [%leaf (trip a)]))
++ stab :: parse span to path ++ stab :: parse cord to path
|= zep=@ta ^- path =+ fel=;~(pfix fas (more fas urs:ab))
(rash zep ;~(pfix fas (more fas urs:ab))) |=(zep=@t `path`(rash zep fel))
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: section 2eM, regular-expressions :: :: section 2eM, regular-expressions ::
:: ::

4
arvo/zuse.hoon
View File

@ -2655,8 +2655,8 @@
(turn b |=(c=span (cat 3 '_' (wack c)))) (turn b |=(c=span (cat 3 '_' (wack c))))
:: ::
++ pick :: light path decoding ++ pick :: light path decoding
|= a=span ^- (unit ,[p=term q=path]) =+ fel=(most cab (sear wick urt:ab))
(rush a (most cab (sear wick urt:ab))) |=(a=span `(unit ,[p=term q=path])`(rush a fel))
++ saxo :: autocanon ++ saxo :: autocanon
|= who=ship |= who=ship
^- (list ship) ^- (list ship)