ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-13 08:38:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'translation-fspm' into factor

Browse Source
This commit is contained in:
Anton Dyudin 2016-02-01 16:54:25 -08:00
commit 423b065bbc
10 changed files with 78 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
arvo/ford.hoon
View File

@ -677,10 +677,10 @@
(stag %fan ;~(pfix dot fan:read))
(stag %for ;~(pfix com for:read))
(stag %hel ;~(pfix cen day:read))
(stag %hub ;~(pfix pat day:read))
(stag %lin ;~(pfix pam lin:read))
(stag %man ;~(pfix tar man:read))
(stag %nap ;~(pfix cab day:read))
(stag %now ;~(pfix pam day:read))
(stag %now ;~(pfix pat day:read))
(stag %saw ;~(pfix sem saw:read))
(stag %see ;~(pfix col see:read))
(stag %sic ;~(pfix ket sic:read))
@ -721,6 +721,12 @@
%+ rail fail
=- ;~(sfix (star -) gap duz)
;~(pfix gap fas ;~(plug hath day))
::
++ lin
%+ rail
;~(plug (plus ;~(sfix sym pam)) day)
=+ (cook |=(a=term [a ~]) sym)
;~(pfix gap ;~(plug - day))
::
++ man
%+ rail fail
@ -1343,7 +1349,7 @@
%+ cope (maim cof pit able)
|= [cof=cafe bax=vase]
%+ cope (chap cof bax [%fan fan.hyd])
|= [cof=cafe gox=vase]
|= [cof=cafe mar=mark gox=vase]
%+ cope (maim cof (slop gox bax) [%tssg (flop boy)])
|= [cof=cafe fin=vase]
(fine cof fin)
@ -1384,7 +1390,7 @@
%+ cope $(poy t.poy)
|= [cof=cafe nex=(list (pair ,@ vase))]
%+ cope (chap(s.how [p.i.poy s.how]) cof bax hon)
(flux |=(elt=vase [[q.i.poy elt] nex]))
(flux |=([mar=mark elt=vase] [[q.i.poy elt] nex]))
%- flux
|= yal=(list (pair ,@ vase)) ^- vase
?~ yal [[%cube 0 [%atom %n]] 0]
@ -1402,40 +1408,42 @@
(flue cof)
(cope nod (flux some))
%- flux
|= doy=(map ,@ vase) ^- vase
|= doy=(map ,@ cage) ^- vase
?~ doy [[%cube 0 [%atom %n]] 0]
%+ slop
(slop [[%atom %ta] p.n.doy] q.n.doy)
(slop [[%atom %ta] p.n.doy] q.q.n.doy)
(slop $(doy l.doy) $(doy r.doy))
::
++ chap :: produce resources
|= [cof=cafe bax=vase hon=horn]
^- (bolt vase)
^- (bolt cage)
?- -.hon
%ape (maim cof bax p.hon)
%ape (cope (maim cof bax p.hon) (flux |=(a=vase [%noun a])))
%arg
%+ cope (maim cof bax p.hon)
|= [cof=cafe gat=vase]
%+ cope (maim cof !>(~) ((jock |) arg))
|= [cof=cafe val=vase]
(maul cof gat (slop !>(how) val))
%+ cope (maul cof gat (slop !>(how) val))
(flux |=(a=vase noun/a))
::
%alt
%. cof
|= cof=cafe ^- (bolt vase)
|= cof=cafe ^- (bolt cage)
?~ p.hon (flaw cof leaf/"ford: out of options" ~)
(coop ^$(cof cof, hon i.p.hon) ..$(p.hon t.p.hon))
::
%dub
%+ cope $(hon q.hon)
(flux |=(vax=vase [[%face p.hon p.vax] q.vax]))
(flux |=([mar=mark vax=vase] [mar [%face p.hon p.vax] q.vax]))
::
%fan
%- cope :_ (flux |=(a=vase noun/a))
%+ cope
|- ^- (bolt (list vase))
?~ p.hon (flue cof)
%+ cope ^$(cof cof, hon i.p.hon)
|= [cof=cafe vax=vase]
|= [cof=cafe mar=mark vax=vase]
%+ cope ^$(cof cof, p.hon t.p.hon)
(flux |=(tev=(list vase) [vax tev]))
|= [cof=cafe tev=(list vase)]
@ -1446,15 +1454,23 @@
::
%for
=+ opt=|.(>(turn p.hon |=([a=path ^] a))<)
|- ^- (bolt vase)
|- ^- (bolt cage)
?~ p.hon (flaw cof leaf/"ford: no match" >(tope how)< *opt ~)
?: =(p.i.p.hon (scag (lent p.i.p.hon) (flop s.how)))
^$(hon q.i.p.hon)
$(p.hon t.p.hon)
::
%hel $(hon p.hon, lit |)
%hub (chad cof bax %ud p.hon)
%lin
%+ cope $(hon q.hon)
|= [cof=cafe cay=cage] ^- (bolt cage)
?~ p.hon (fine cof cay)
%+ cope $(p.hon t.p.hon)
|= [cof=cafe cay=cage]
(cope (make cof %cast i.p.hon `cay) furl)
::
%man
%- cope :_ (flux |=(a=vase noun/a))
|- ^- (bolt vase)
?~ p.hon (fine cof [[%cube 0 [%atom %n]] 0])
%+ cope $(p.hon l.p.hon)
@ -1462,42 +1478,50 @@
%+ cope ^$(cof cof, p.hon r.p.hon)
|= [cof=cafe rig=vase]
%+ cope ^^^$(cof cof, hon q.n.p.hon)
|= [cof=cafe vax=vase]
|= [cof=cafe mar=mark vax=vase]
%+ fine cof
%+ slop
(slop [[%atom %tas] p.n.p.hon] vax)
(slop lef rig)
::
%now (chad cof bax %da p.hon)
%nap (chai cof bax p.hon)
%now
%+ cope (chad cof bax %da p.hon)
(flux |=(a=vase noun/a))
::
%nap
%+ cope (chai cof bax p.hon)
(flux |=(a=vase noun/a))
::
%saw
%+ cope $(hon q.hon)
|= [cof=cafe mar=mark sam=vase]
%+ cope (maim cof bax p.hon)
|= [cof=cafe gat=vase]
%+ cope (maul cof gat sam)
(flux |=(a=vase noun/a))
::
%see
=. r.p.hon ?:(?=([%ud 0] r.p.hon) r.how r.p.hon)
$(hon q.hon, how p.hon)
::
%saw
%+ cope $(hon q.hon)
|= [cof=cafe sam=vase]
%+ cope (maim cof bax p.hon)
|= [cof=cafe gat=vase]
(maul cof gat sam)
::
%sic
%+ cope $(hon q.hon)
|= [cof=cafe vax=vase]
|= [cof=cafe mar=mark vax=vase]
%+ cope (maim cof bax [%bctr p.hon])
|= [cof=cafe tug=vase]
?. (~(nest ut p.tug) | p.vax)
(flaw cof [%leaf "type error: {<p.hon>} {<q.hon>}"]~)
(fine cof [p.tug q.vax])
(fine cof [mar p.tug q.vax])
::
%toy
?: p.hon
=. arg ?.(lit arg many/~)
(cope (cope (make cof %bake q.hon arg how) furl) feel)
(cope (make cof %bake q.hon arg how) furl)
%+ cool |.(leaf/"ford: hook {<q.hon>} {<(tope how)>}")
%+ cope (fade cof %hoon how)
|= [cof=cafe hyd=hood]
(cope (abut:(meow how arg) cof hyd) (lake q.hon))
%+ cope (abut:(meow how arg) cof hyd)
;~(cope (lake q.hon) (flux |=(a=vase [q.hon a])))
==
::
++ head :: consume structures

5
arvo/zuse.hoon
View File

@ -2493,15 +2493,14 @@
$% [%ape p=twig] :: /~ twig by hand
[%arg p=twig] :: /$ argument
[%alt p=(list horn)] :: /| options
:: [%day p=horn] :: list by @dr
[%dub p=term q=horn] :: /= apply face
[%fan p=(list horn)] :: /. list
[%for p=(list (pair path:spur horn))] :: /, switch by path
[%hel p=horn] :: /% propagate args
[%hub p=horn] :: /@ list by @ud
[%lin p=(list mark) q=horn] :: /& translates
[%man p=(map span horn)] :: /* hetero map
[%nap p=horn] :: /_ homo map
[%now p=horn] :: /& list by @da
[%now p=horn] :: /@ list by @da
[%saw p=twig q=horn] :: /; operate on
[%see p=beam q=horn] :: /: relative to
[%sic p=tile q=horn] :: /^ cast

8
mar/tree/elem.hoon Normal file
View File

@ -0,0 +1,8 @@
::
:::: /hoon/core/elem/mar
::
/? 314
|_ own=manx
::
++ grow |% ++ elem own :: alias
-- --

2
ren/paste-new.hoon
View File

@ -1,3 +1,3 @@
/= all /; flop /^ (list (pair time ,*)) /& /mime/
/= all /; flop /^ (list (pair time ,*)) /@ /mime/
^- json
?~(all ~ (joba %u s/(scot %da p.i.all)))

2
ren/talklog/hymn.hoon
View File

@ -6,7 +6,7 @@
/= mez
/; pojo
/; |=(a=(list ,[@ p=json]) =.(a (flop a) ?~(a [%a ~] p.i.a)))
/& /json/
/@ /json/
|%
++ cdnj |=(a=tape ;script(src "//cdnjs.cloudflare.com/ajax/libs/{a}");)
--

8
ren/tree/combine.hoon
View File

@ -1,9 +1,9 @@
/+ tree, react
/= mime /mime/
/= body /elem/
/= snip /snip/
/= meta /front/
/= sect /index/
/= body /tree-elem/
/= sect /tree-index/
/= snip /&snip&elem&/tree-elem/
/= meta /&front&elem&/tree-elem/
!:
^- tree-include
=+ rj=react-to-json:react

5
ren/tree/elem.hoon Normal file
View File

@ -0,0 +1,5 @@
/% /,
/web/modules /|(/!elem/ /elem/)
/ /elem/
==
`manx`-.-

2
ren/tree/include.hoon
View File

@ -1,5 +1,5 @@
/- tree-include
/| /tree-combine/
/:/===/web/404:/tree-combine/
/:/===/web/404:/tree-combine/ :: XX merge into tree-elem?
==
`tree-include`-<

6
ren/index.hoon → ren/tree/index.hoon
View File

@ -1,12 +1,12 @@
/+ tree
/, /
/; (getall:tree /h1/h2/h3/h4/h5/h6) /elem/
/; (getall:tree /h1/h2/h3/h4/h5/h6) /tree-elem/
::
/pub/docs/dev/hoon/runes
/; |= [tip=marl sub=(map span marl) ~]
(zing `(list marl)`[tip (turn (~(tap by sub)) tail)])
/. /; (getall:tree %h1 ~) /elem/
/_ /; (getall:tree %h1 ~) /elem/
/. /; (getall:tree %h1 ~) /tree-elem/
/_ /; (getall:tree %h1 ~) /tree-elem/
== ==
::
::::

2
web/paste.hoon
View File

@ -1,4 +1,4 @@
/= all /; flop /^ (list (pair time ,*)) /& /mime/
/= all /; flop /^ (list (pair time ,*)) /@ /mime/
;html
;head:title:"Pastebin"
;body