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

Merge branch 'master' of https://github.com/urbit/urbit

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
Philip C Monk 2014-12-09 18:02:38 -05:00
commit 5d927a6773
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arvo/hoon.hoon
View File

@ -8578,21 +8578,23 @@
++ hog :: tag head ++ hog :: tag head
%+ cook %+ cook
|= $: a=twig |= $: a=twig
b=(unit ,@tas) b=(list ,[@tas @tas])
c=(unit ,@tas) c=$|(~ [p=@tas q=twig])
d=(unit twig) d=(list twig)
e=(list twig)
== ==
^- [twig (list twig)] ^- [twig (list twig)]
=. e ?~(b e [[[%dtzz %tas %class] [%smdq (trip u.b)]] e]) =- [a (welp - ?~(c d [[[%dtzz %tas p.c] q.c] d]))]
=. e ?~(c e [[[%dtzz %tas %id] [%smdq (trip u.c)]] e]) =- (~(tap by -))
=. e ?~(d e [[[%dtzz %tas %href] u.d] e]) %. |=(e=(list tank) [%smdq ~(ram re %rose [" " `~] e)])
[a e] =< ~(run by f:(reel b .))
|= [e=[p=term q=term] f=(jar twig tank)]
(~(add ja f) [[%dtzz %tas p.e] [%leaf (trip q.e)]])
;~ plug ;~ plug
fry fry
;~(pose (stag ~ ;~(pfix dot sym)) (easy ~)) =- (star ;~(plug - sym))
;~(pose (stag ~ ;~(pfix hax sym)) (easy ~)) ;~(pose (cold %class dot) (cold %id hax))
;~(pose (stag ~ ;~(pfix fas (stag %smdq soil))) (easy ~)) =- ;~(pose ;~(plug - (stag %smdq soil)) (easy ~))
;~(pose (cold %href fas) (cold %src pat))
;~ pose ;~ pose
%+ ifix [pel per] %+ ifix [pel per]
%+ more ;~(plug com ace) %+ more ;~(plug com ace)

2
main/mar/down/parse.hoon
View File

@ -13,7 +13,7 @@
=- |= tub=nail ^- (like ,@t) %. tub :: export context =- |= tub=nail ^- (like ,@t) %. tub :: export context
=+(poxa enty(ent mapping)) =+(poxa enty(ent mapping))
^- mapping=(map span ,@tF) ^- mapping=(map span ,@tF)
=+ pax=/==18%%/html5-entities/json :: XX %%/ =+ pax=/==1%%/html5-entities/json :: XX %%/
=+ maf=%.(pax ;~(biff file (soft ,@) poja (om so):jo)) =+ maf=%.(pax ;~(biff file (soft ,@) poja (om so):jo))
?^ maf u.maf ?^ maf u.maf
~& no-enty/pax ~& no-enty/pax