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

This commit is contained in:
Galen Wolfe-Pauly 2016-02-05 10:54:25 -08:00
commit aebcc16adb
95 changed files with 210 additions and 112 deletions

View File

@ -1,6 +1,6 @@
:: There is no love that is not an echo :: There is no love that is not an echo
:: ::
:::: /hoon/echo/ape :::: /hoon/ask/app
:: ::
/? 314 /? 314
/+ sole /+ sole

View File

@ -1,5 +1,5 @@
!: !:
:::: :::: /hoon/curl/app
:: ::
|_ [[^ ^ ost=@ ^] ~] |_ [[^ ^ ost=@ ^] ~]
++ poke |*(a=[mark *] :_(+> [ost %hiss / %wain a]~)) ++ poke |*(a=[mark *] :_(+> [ost %hiss / %wain a]~))

View File

@ -1,5 +1,5 @@
:: :: :: :: :: ::
:::: /hoon/hood/ape :: :: :::: /hoon/hood/app :: ::
:: :: :: :: :: ::
/? 314 :: zuse version /? 314 :: zuse version
/+ sole, talk, helm, kiln, drum, write :: libraries /+ sole, talk, helm, kiln, drum, write :: libraries

View File

@ -2151,14 +2151,14 @@
=+ grams:(~(got by stories) man) =+ grams:(~(got by stories) man)
[ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])] [ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]
:: ::
++ poke-save ++ poke-talk-save
|= man=span |= man=span
^- (quip move +>) ^- (quip move +>)
=+ paf=/(scot %p our.hid)/home/(scot %da now.hid)/talk/[man]/talk-telegrams =+ paf=/(scot %p our.hid)/home/(scot %da now.hid)/talk/[man]/talk-telegrams
=+ grams:(~(got by stories) man) =+ grams:(~(got by stories) man)
[[ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]~ +>.$] [[ost.hid %info /jamfile our.hid (foal paf [%talk-telegrams !>(-)])]~ +>.$]
:: ::
++ poke-load ++ poke-talk-load
|= man=span |= man=span
=+ ^= grams =+ ^= grams
%- (hard (list telegram)) %- (hard (list telegram))
@ -2168,15 +2168,14 @@
=+ toy=(~(got by stories) man) =+ toy=(~(got by stories) man)
[~ +>.$(stories (~(put by stories) man toy(grams grams, count (lent grams))))] [~ +>.$(stories (~(put by stories) man toy(grams grams, count (lent grams))))]
:: ::
++ poke-log ++ poke-talk-log
|= man=span |= man=span
~& %poke-log ~& %poke-log
^- (quip move +>) ^- (quip move +>)
:- [(log-to-file man) ~] :- [(log-to-file man) ~]
+>.$(log (~(put by log) man count:(~(got by stories) man))) +>.$(log (~(put by log) man count:(~(got by stories) man)))
:: ::
++ poke-unlog ++ poke-talk-unlog
|= man=span |= man=span
^- (quip move +>) ^- (quip move +>)
:- ~ :- ~

View File

@ -1,5 +1,5 @@
:: ::
:::: :::: /hoon/work/app
:: ::
/? 314 /? 314
/- work /- work

View File

@ -210,7 +210,7 @@
:: ~& [%mo-boot dap how byk] :: ~& [%mo-boot dap how byk]
%+ mo-pass [%sys how dap (scot %p p.byk) q.byk (scot r.byk) ~] %+ mo-pass [%sys how dap (scot %p p.byk) q.byk (scot r.byk) ~]
^- note-arvo ^- note-arvo
[%f %exec our `[byk %core [byk [dap %ape ~]]]] [%f %exec our `[byk %core [byk [dap %app ~]]]]
:: ::
++ mo-away :: foreign request ++ mo-away :: foreign request
|= [him=ship caz=cush] :: |= [him=ship caz=cush] ::

View File

@ -1,6 +1,6 @@
:: %jael, secret storage :: %jael, secret storage
:: ::
:::: /hoon/jael :::: /hoon/jael/arvo
:: ::
!? 164 !? 164
:::: ::::

View File

@ -1,6 +1,6 @@
:: %kahn, social state :: %kahn, social state
:: ::
:::: /hoon/kahn :::: /hoon/kahn/arvo
:: ::
!? 164 !? 164
:::: ::::

View File

@ -1,6 +1,6 @@
:: %lunt, fleet job control :: %lunt, fleet job control
:: ::
:::: /hoon/lunt :::: /hoon/lunt/arvo
:: ::
!? 164 !? 164
:::: ::::

View File

@ -1,6 +1,6 @@
:: %musk, realm management :: %musk, realm management
:: ::
:::: /hoon/musk :::: /hoon/musk/arvo
:: ::
!? 164 !? 164
:::: ::::

View File

@ -1,6 +1,6 @@
:: ConCATenate file listings :: ConCATenate file listings
:: ::
:::: /hoon/gen/cat :::: /hoon/cat/gen
:: ::
// /%%/ls/subdir // /%%/ls/subdir
// /%/pretty // /%/pretty

View File

@ -1,3 +1,6 @@
::
:::: /hoon/pretty/cat/gen
::
!: !:
|% |%
++ pretty-noun ++ pretty-noun

View File

@ -1,3 +1,6 @@
::
:::: /hoon/curl/gen
::
/- sole /- sole
[sole] [sole]
:- %get |= [^ [a=tape ~] ~] :- %get |= [^ [a=tape ~] ~]

View File

@ -1,5 +1,5 @@
:: ::
:::: :::: /hoon/url/curl/gen
:: ::
/? 310 /? 310
:: ::

View File

@ -1,3 +1,6 @@
::
:::: /hoon/ask/hood/gen
::
:- %say :- %say
|= [^ [mel=cord ~] ~] |= [^ [mel=cord ~] ~]
=+ adr=(star ;~(less (mask "\"\\()[],:;<>@") prn)) =+ adr=(star ;~(less (mask "\"\\()[],:;<>@") prn))

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/begin/hood/gun :::: /hoon/begin/hood/gen
:: ::
/? 314 /? 314
/- sole /- sole

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/reload/hood/gen :::: /hoon/breload/hood/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,2 +1,5 @@
::
:::: /hoon/cp/hood/gen
::
:- %say :- %say
|=([^ [input=path output=path ~] ~] kiln-cp/[input output]) |=([^ [input=path output=path ~] ~] kiln-cp/[input output])

View File

@ -1,2 +1,5 @@
::
:::: /hoon/hi/hood/gen
::
:- %say :- %say
|=([^ [who=ship mez=$|(~ [a=tape ~])] ~] helm-send-hi/[who ?~(mez ~ `a.mez)]) |=([^ [who=ship mez=$|(~ [a=tape ~])] ~] helm-send-hi/[who ?~(mez ~ `a.mez)])

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/reload/hood/gen :::: /hoon/init/hood/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,2 +1,5 @@
::
:::: /hoon/mv/hood/gen
::
:- %say :- %say
|=([^ [input=path output=path ~] ~] kiln-mv/[input output]) |=([^ [input=path output=path ~] ~] kiln-mv/[input output])

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/reload/hood/gen :::: /hoon/rc/hood/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/reload/hood/gen :::: /hoon/reboot/hood/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/reload/hood/gen :::: /hoon/reload-desk/hood/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/reload/hood/gen :::: /hoon/rf/hood/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,2 +1,5 @@
::
:::: /hoon/rm/hood/gen
::
:- %say :- %say
|=([^ [input=path ~] ~] kiln-rm/input) |=([^ [input=path ~] ~] kiln-rm/input)

View File

@ -1,2 +1,5 @@
::
:::: /hoon/schedule/hood/gen
::
:- %say :- %say
|=([^ [where=path tym=@da eve=@t ~] ~] kiln-schedule/[where tym eve]) |=([^ [where=path tym=@da eve=@t ~] ~] kiln-schedule/[where tym eve])

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/link/hood/gen :::: /hoon/unlink/hood/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/mount/hood/gen :::: /hoon/unmount/hood/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/verb/hood/gun :::: /hoon/verb/hood/gen
:: ::
/? 314 /? 314
/- sole /- sole

View File

@ -1,3 +1,6 @@
::
:::: /hoon/subdir/ls/gen
::
|% |%
++ subdir ++ subdir
|= [pax=path des=(map ,@t ,~)] |= [pax=path des=(map ,@t ,~)]

View File

@ -1,2 +1,5 @@
::
:::: /hoon/make/gen
::
:- %say :- %say
|=([^ arg=(list ,@) foo=_`@`1 bar=_`@`2] noun/[arg foo bar]) |=([^ arg=(list ,@) foo=_`@`1 bar=_`@`2] noun/[arg foo bar])

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/ticket/gen :::: /hoon/moon/gen
:: ::
/? 314 /? 314
:: ::

View File

@ -1,3 +1,6 @@
::
:::: /hoon/pope/gen
::
:: Input twitter keys :: Input twitter keys
/- sole /- sole
!: !:

12
gen/talk/load.hoon Normal file
View File

@ -0,0 +1,12 @@
::
:::: /hoon/load/talk/gen
::
/? 314
::
::::
!:
:- %say
|= $: [now=@da eny=@uvI byk=beak]
[[man=span ~] ~]
==
[%talk-load man]

12
gen/talk/log.hoon Normal file
View File

@ -0,0 +1,12 @@
::
:::: /hoon/log/talk/gen
::
/? 314
::
::::
!:
:- %say
|= $: [now=@da eny=@uvI byk=beak]
[[man=span ~] ~]
==
[%talk-log man]

12
gen/talk/save.hoon Normal file
View File

@ -0,0 +1,12 @@
::
:::: /hoon/save/talk/gen
::
/? 314
::
::::
!:
:- %say
|= $: [now=@da eny=@uvI byk=beak]
[[man=span ~] ~]
==
[%talk-save man]

12
gen/talk/unlog.hoon Normal file
View File

@ -0,0 +1,12 @@
::
:::: /hoon/unlog/talk/gen
::
/? 314
::
::::
!:
:- %say
|= $: [now=@da eny=@uvI byk=beak]
[[man=span ~] ~]
==
[%talk-unlog man]

View File

@ -1,6 +1,6 @@
:: Core markdown parser, exposed as ++parse :: Core markdown parser, exposed as ++parse
:: ::
:::: :::: /hoon/parse/down-jet/lib
:: ::
=+ =~ =+ =~
|% |%

View File

@ -1,6 +1,6 @@
:: ++down rendering arms :: ++down rendering arms
!: !:
:::: :::: /hoon/rend/down-jet/lib
:: ::
|% |%
++ into-inner ++ into-inner

View File

@ -1,3 +1,6 @@
::
:::: /hoon/react/lib
::
!: !:
|% |%
++ react-elems :: XX /~ ++ react-elems :: XX /~

View File

@ -1,3 +1,6 @@
::
:::: /hoon/tree/lib
::
/- tree-include /- tree-include
!: !:
|% |%

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/md/pro :::: /hoon/coffee/mar
:: ::
/? 314 /? 314
|_ mud=@t |_ mud=@t

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/md/pro :::: /hoon/comment-md/mar
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/css/mar :::: /hoon/css/mar
:: ::
|_ mud=@t |_ mud=@t
++ grow :: convert to ++ grow :: convert to

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/dill-belt/mar :::: /hoon/belt/dill/mar
:: ::
/? 314 /? 314
/- kyev,sole /- kyev,sole

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/dill-blit/mar :::: /hoon/blit/dill/mar
:: ::
/? 314 /? 314
/- sole /- sole

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/elem/mar :::: /hoon/elem/mar
:: ::
/? 314 /? 314
|_ own=manx |_ own=manx

20
mar/front.hoon Normal file
View File

@ -0,0 +1,20 @@
::
:::: /hoon/front/mar
::
/? 314
!:
::::
::
|_ all=(map span cord)
::
++ grow :: convert to
|%
++ json
:- %o
%- ~(run by all)
|=(a=cord s/a)
--
++ grab |% :: convert from
++ noun (map span cord) :: clam from %noun
:: ++ elem ,~
-- --

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/hook/mar :::: /hoon/hoon/mar
:: ::
/? 314 /? 314
!: !:

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/html/mar :::: /hoon/html/mar
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/hymn/mar :::: /hoon/hymn/mar
:: ::
/? 314 /? 314
|_ own=manx |_ own=manx

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/jam/mar :::: /hoon/jam/mar
:: ::
!: !:
|_ mud=@ |_ mud=@

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/js/mar :::: /hoon/js/mar
:: ::
!: !:
|_ mud=@ |_ mud=@

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/json/mar :::: /hoon/json/mar
:: ::
/? 314 /? 314
:: ::

View File

@ -1,10 +0,0 @@
::
:::: /hoon/core/load/mar
::
!:
|_ man=span
++ grab
|% :: convert from
++ noun span :: clam from %noun
--
--

View File

@ -1,10 +0,0 @@
::
:::: /hoon/core/log/mar
::
!:
|_ man=span
++ grab
|% :: convert from
++ noun span :: clam from %noun
--
--

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/markdown/pro :::: /hoon/markdown/mar
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/md/pro :::: /hoon/md/mar
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/mime/mar :::: /hoon/mime/mar
:: ::
/? 314 /? 314
!: !:

View File

@ -1,10 +0,0 @@
::
:::: /hoon/core/save/mar
::
!:
|_ man=span
++ grab
|% :: convert from
++ noun span :: clam from %noun
--
--

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/elem/mar :::: /hoon/snip/mar
:: ::
/? 314 /? 314
!: !:

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/sole-action/mar :::: /hoon/action/sole/mar
:: ::
/? 314 /? 314
/- sole /- sole

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/sole-effect/mar :::: /hoon/effect/sole/mar
:: ::
/? 314 /? 314
/- sole /- sole

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/talk-command/mar :::: /hoon/command/talk/mar
:: ::
/? 314 /? 314
/- talk /- talk

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/talk-report/mar :::: /hoon/report/talk/mar
:: ::
/? 314 /? 314
/- talk /- talk

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/talk-telegrams/mar :::: /hoon/telegrams/talk/mar
:: ::
/? 314 /? 314
/- talk /- talk

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/tang/mar :::: /hoon/tang/mar
:: ::
/? 314 /? 314
!: !:

View File

@ -1,3 +1,6 @@
::
:::: /hoon/tree-include/mar
::
/- tree-include /- tree-include
|_ tree-include |_ tree-include
++ grab |% ++ noun tree-include ++ grab |% ++ noun tree-include

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/elem/mar :::: /hoon/elem/tree/mar
:: ::
/? 314 /? 314
|_ own=manx |_ own=manx

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/hymn/mar :::: /hoon/hymn/tree/mar
:: ::
/? 314 /? 314
|_ own=manx |_ own=manx

View File

@ -1,3 +1,6 @@
::
:::: /hoon/include/tree/mar
::
/- tree-include /- tree-include
|_ tree-include |_ tree-include
++ grab |% ++ noun tree-include ++ grab |% ++ noun tree-include

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/elem/mar :::: /hoon/index/tree/mar
:: ::
/? 314 /? 314
/+ tree,react /+ tree,react

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/json/mar :::: /hoon/json/tree/mar
:: ::
/? 314 /? 314
:: ::

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/term-line/mar :::: /hoon/txt-diff/mar
:: ::
/? 314 /? 314
|_ txt-diff=(urge cord) |_ txt-diff=(urge cord)

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/term-line/mar :::: /hoon/txt/mar
:: ::
/? 314 /? 314
!: !:

View File

@ -1,11 +0,0 @@
::
:::: /hoon/core/unlog/mar
::
!:
|_ man=span
++ grab
|% :: convert from
++ noun span :: clam from %noun
--
--

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/save/mar :::: /hoon/comment/write/mar
:: ::
!: !:
|_ [pax=path txt=@t] |_ [pax=path txt=@t]

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/save/mar :::: /hoon/paste/write/mar
:: ::
!: !:
|_ [typ=?(%hoon %md %txt) txt=@t] |_ [typ=?(%hoon %md %txt) txt=@t]

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/save/mar :::: /hoon/tree/write/mar
:: ::
!: !:
|_ [sup=spur mim=mime] |_ [sup=spur mim=mime]

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/save/mar :::: /hoon/wipe/write/mar
:: ::
!: !:
|_ spur |_ spur

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/core/html/mar :::: /hoon/xml/mar
:: ::
/? 314 /? 314
:: ::

View File

@ -1,21 +1,24 @@
/+ tree, react ::
:::: /hoon/combine/tree/ren
::
/- tree-include
/+ react
/= mime /mime/ /= mime /mime/
/= body /tree-elem/ /= body /tree-elem/
/= sect /tree-index/ /= sect /&json&/tree-index/
/= snip /&snip&elem&/tree-elem/ /= snip /&snip&elem&/tree-elem/
/= meta /^ (map span cord) /|(/front/ /~[~]) /= meta /&json&front&/|(/front/ /~[~])
/= comt /^ (list (pair time manx)) /= comt /^ (list (pair time manx))
/@ /&elem&md&mime&/comment-md/ /@ /&elem&md&mime&/comment-md/
!: !:
^- tree-include ^- tree-include
=+ rj=react-to-json:react =+ rj=react-to-json:react
=+ ij=(map-to-json:tree |=(a=path (crip (spud a))) |=(a=marl [%a (turn a rj)]))
=+ cj=|=([a=time b=manx] (jobe time/(jode a) body/(rj b) ~)) =+ cj=|=([a=time b=manx] (jobe time/(jode a) body/(rj b) ~))
:* mime :* mime
(rj body) (rj body)
(rj /h1 hed.snip) :: head (rj /h1 hed.snip) :: head
(rj /div tal.snip) :: snip (rj /div tal.snip) :: snip
[%o (~(run by meta) |=(a=span s/a))] meta
(ij sect) sect
[%a (turn (sort comt lor) cj)] [%a (turn (sort comt lor) cj)]
== ==

View File

@ -1,3 +1,6 @@
::
:::: /hoon/elem/tree/ren
::
/% /, /% /,
/web /|(/!elem/ /elem/) /web /|(/!elem/ /elem/)
/ /elem/ / /elem/

View File

@ -1,4 +1,7 @@
:: ::
:::: /hoon/hymn/tree/ren
::
::
/? 314 /? 314
/- tree-include /- tree-include
/= dat /% /tree-json/ :: default include /= dat /% /tree-json/ :: default include

View File

@ -1,3 +1,6 @@
::
:::: /hoon/include/tree/ren
::
/- tree-include /- tree-include
/| /tree-combine/ /| /tree-combine/
/:/===/web/404:/tree-combine/ :: XX merge into tree-elem? /:/===/web/404:/tree-combine/ :: XX merge into tree-elem?

View File

@ -1,3 +1,6 @@
::
:::: /hoon/index/tree/ren
::
/+ tree /+ tree
/, / /, /
/; (getall:tree /h1/h2/h3/h4/h5/h6) /tree-elem/ /; (getall:tree /h1/h2/h3/h4/h5/h6) /tree-elem/

View File

@ -1,5 +1,5 @@
:: ::
:::: /hook/json/tree :::: /hoon/json/tree/ren
:: ::
/? 314 /? 314
/+ tree /+ tree

View File

@ -1,3 +1,6 @@
::
:::: /hoon/urb/ren
::
/% /, /% /,
/talk/log /talklog-hymn/ /talk/log /talklog-hymn/
/web/app /|(/!hymn/ /tree-hymn/) /web/app /|(/!hymn/ /tree-hymn/)

View File

@ -1,5 +1,5 @@
:: ::
:::: /hoon/gate/down/sur :::: /hoon/down/sur
:: ::
/? 314 /? 314
/- markdown /- markdown

View File

@ -1,3 +1,6 @@
::
:::: /hoon/markdown/sur
::
|% |%
++ down (list elem) ++ down (list elem)
++ kids (list inline) ++ kids (list inline)

View File

@ -1,3 +1,6 @@
::
:::: /hoon/tree-include/sur
::
|- |-
$: mime=mime $: mime=mime
body=json body=json

View File

@ -1,6 +1,6 @@
:: Console front-end :: Console front-end
:: ::
:::: /hook/hymn/dojo/web :::: /hoon/dojo/web
:: ::
/? 310 /? 310
|% |%

View File

@ -1,3 +1,6 @@
::
:::: /hoon/talk/web
::
;module(nav_title "Talk", nav_no-dpad "", nav_no-sibs "", nav_subnav "talk-station") ;module(nav_title "Talk", nav_no-dpad "", nav_no-sibs "", nav_subnav "talk-station")
;script@"/~~/~/at/lib/urb.js"; ;script@"/~~/~/at/lib/urb.js";
;script@"/talk/main.js"; ;script@"/talk/main.js";