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

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

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-07-17 13:56:22 -07:00
commit 2260d31b1c
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
arvo/zuse.hoon
View File

@ -883,45 +883,47 @@
++ xmlp :: xml parser ++ xmlp :: xml parser
|% |%
++ apex ++ apex
=+ spa=;~(pose comt whit)
%+ knee *manx |. ~+ %+ knee *manx |. ~+
%+ sear %+ ifix [(star spa) (star spa)]
|=([a=marx b=marl c=mane] ?.(=(c n.a) ~ (some [a b]))) ;~ pose
%+ ifix [(star whit) (star whit)] %+ sear
;~ pose |=([a=marx b=marl c=mane] ?.(=(c n.a) ~ (some [a b])))
;~(plug head (star ;~(pose apex chrd)) tail) ;~(plug head (more (star comt) ;~(pose apex chrd)) tail)
empt empt
== ==
:: ::
++ attr :: attribute ++ attr :: attribute
%+ knee *mart |. ~+ %+ knee *mart |. ~+
%- star %- star
;~ pfix ace ;~ pfix (plus whit)
;~ plug name ;~ plug name
;~ pfix tis ;~ pfix tis
;~ pose ;~ pose
(ifix [doq doq] (star ;~(less pam gal gar doq prn))) (ifix [doq doq] (star ;~(less doq escp)))
(ifix [soq soq] (star ;~(less pam gal gar soq prn))) (ifix [soq soq] (star ;~(less soq escp)))
== == == ==
== == == ==
:: ::
++ chrd :: chracter data ++ chrd :: character data
%+ knee *manx |. ~+ %+ knee *manx |. ~+
%+ cook |=(a=* ((hard mars) :/(a))) %+ cook |=(a=tape :/(a))
%- plus (plus ;~(less soq doq ;~(pose (just `@`10) escp)))
;~ less pam gal gar soq doq
;~ pose
(cold 62 (jest '>'))
(cold 60 (jest '<'))
(cold 38 (jest '&'))
(cold 39 (jest '''))
(cold 34 (jest '"'))
prn
==
==
:: ::
++ comt %+ ifix [(jest '<!--') (jest '-->')] :: comments
(star ;~(less (jest '-->') ;~(pose whit prn)))
::
++ escp
;~ pose
;~(less gal gar pam prn)
(cold '>' (jest '&gt;'))
(cold '<' (jest '&lt;'))
(cold '&' (jest '&amp;'))
(cold '"' (jest '&quot;'))
(cold '\'' (jest '&apos;'))
==
++ empt :: self-closing tag ++ empt :: self-closing tag
%+ cook |=(a=marx `[marx marl mane]`[a ~ n.a]) (ifix [gal (jest '/>')] ;~(plug ;~(plug name attr) (cold ~ (star whit))))
(ifix [gal (jest '/>')] ;~(plug name attr))
:: ::
++ head :: opening tag ++ head :: opening tag
%+ knee *marx |. ~+ %+ knee *marx |. ~+

13
try/bin/klay.hoon
View File

@ -5,9 +5,9 @@
+ +
=> + => +
|% |%
++ blob $% [%delta p=@ q=blob r=udon] ++ blob $% [%delta q=blob r=udon]
[%direct p=@ q=* r=umph] [%direct q=* r=umph]
[%indirect p=@ q=* r=udon] [%indirect q=* r=udon]
== ==
++ yaki ,[p=(list yaki) q=(map path blob) r=@ t=@ud] :: later t=@da ++ yaki ,[p=(list yaki) q=(map path blob) r=@ t=@ud] :: later t=@da
:: ::
@ -16,11 +16,11 @@
++ hash-blob ++ hash-blob
|= p=* |= p=*
^- blob ^- blob
[%direct (mug p) p %c] [%direct p %c]
++ hash-yaki ++ hash-yaki
|= [p=(list yaki) q=(map path blob) t=@ud] :: later t=@da |= [p=(list yaki) q=(map path blob) t=@ud] :: later t=@da
^- yaki ^- yaki
[p q (mug [p q]) t] [p q (mug [(roll (turn p |=(p=yaki r.p)) add) q t]) t] :: later quicksort?
++ grab ++ grab
|= p=blob |= p=blob
?- -.p ?- -.p
@ -265,4 +265,5 @@
::(zeal n6 n7) ::(zeal n6 n7)
::(zerg n1 n2) ::(zerg n1 n2)
::(mate n2 n3) ::(mate n2 n3)
[%result ((hard ,@t) (grab (need (~(get by q:(merge n3 n2 8 mate)) ~['test'])))) (merge n2 n3 9 forge)] :- [%result ((hard ,@t) (grab (need (~(get by q:(merge n3 n2 8 mate)) ~['test'])))) (merge n2 n3 9 forge)]
[%result ((hard ,@t) (grab (need (~(get by q:(merge n3 n2 8 mate)) ~['test'])))) (merge n3 n2 9 forge)]