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

Reorganize ++markup to ++eyre.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-10-31 17:12:56 -07:00
parent c66ac763d6
commit 35e20fcca6
20 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/dojo.hoon
View File

@ -488,7 +488,7 @@
$http $http
?> ?=($mime p.cay) ?> ?=($mime p.cay)
=+ mim=;;(mime q.q.cay) =+ mim=;;(mime q.q.cay)
=+ maf=(~(add ja *math) %content-type (moon:markup p.mim)) =+ maf=(~(add ja *math) %content-type (moon:bytes:eyre p.mim))
(dy-eyre /show q.p.mad [r.p.mad p.p.mad maf ~ q.mim]) (dy-eyre /show q.p.mad [r.p.mad p.p.mad maf ~ q.mim])
:: ::
$show $show

2
app/talk.hoon
View File

@ -5,7 +5,7 @@
/- talk, sole /- talk, sole
/+ talk, sole, time-to-id, twitter /+ talk, sole, time-to-id, twitter
/= seed /~ !>(.) /= seed /~ !>(.)
=, markup =, js:eyre
:: ::
:::: ::::
:: ::

16
arvo/ames.hoon
View File

@ -588,7 +588,7 @@
^- $& ^- $&
?> (melt new old) ?> (melt new old)
?> .= (shaf %meld (sham q.new)) ?> .= (shaf %meld (sham q.new))
(need (sure:as:(haul:test r.q.old) *code p.new)) (need (sure:as:(haul:suite r.q.old) *code p.new))
%& %&
:: ::
++ melt :: proper connect ++ melt :: proper connect
@ -624,7 +624,7 @@
|= wed/deyd |= wed/deyd
^- $& ^- $&
?> =+ rac=(clan r.p.q.wed) ?> =+ rac=(clan r.p.q.wed)
=+ loy=(haul:test r.q.wed) =+ loy=(haul:suite r.q.wed)
?: &(r.wed =(rac %czar)) %& ?: &(r.wed =(rac %czar)) %&
?> =(0 p.p.q.wed) ?> =(0 p.p.q.wed)
?> =(fig:ex:loy ?+(rac !! $czar (zeno r.p.q.wed), $pawn r.p.q.wed)) ?> =(fig:ex:loy ?+(rac !! $czar (zeno r.p.q.wed), $pawn r.p.q.wed))
@ -639,7 +639,7 @@
?> ?& ?=(^ law) ?> ?& ?=(^ law)
(lth p.p.q.i.law 9) :: 9-lives rule (lth p.p.q.i.law 9) :: 9-lives rule
=(p.p.q.i.law p.i.mac) =(p.p.q.i.law p.i.mac)
=(r.q.i.law pub:ex:(weur:test q.i.mac)) =(r.q.i.law pub:ex:(weur:suite q.i.mac))
== ==
$(mac t.mac, law t.law) $(mac t.mac, law t.law)
== ==
@ -1004,7 +1004,7 @@
?. =(fak.ton r.i.lew.wod.dur) ~|([%client-wrong-fake her] !!) ?. =(fak.ton r.i.lew.wod.dur) ~|([%client-wrong-fake her] !!)
:+ p.p.q.i.lew.wod.dur :+ p.p.q.i.lew.wod.dur
q.q.i.lew.wod.dur q.q.i.lew.wod.dur
(haul:test r.q.i.lew.wod.dur) (haul:suite r.q.i.lew.wod.dur)
:: ::
++ clon ++ clon
^- life ^- life
@ -1257,7 +1257,7 @@
|- ^- (list ship) |- ^- (list ship)
?:((lth our 256) ~ =+(seg=(sein our) [seg $(our seg)])) ?:((lth our 256) ~ =+(seg=(sein our) [seg $(our seg)]))
:: ::
(turn mac |=({p/life q/ring} [p q (weur:test q)])) (turn mac |=({p/life q/ring} [p q (weur:suite q)]))
wil wil
~ ~
~ ~
@ -1323,13 +1323,13 @@
:- p :- p
%= q %= q
val val
(turn val.q |=({p/life q/ring r/acru} [p q (weur:test q)])) (turn val.q |=({p/life q/ring r/acru} [p q (weur:suite q)]))
== ==
== ==
++ come :: come:am ++ come :: come:am
|= {ges/(unit @t) wid/@ bur/@ fak/?} :: instantiate pawn |= {ges/(unit @t) wid/@ bur/@ fak/?} :: instantiate pawn
^- {p/{p/ship q/@uvG} q/fort} ^- {p/{p/ship q/@uvG} q/fort}
=+ loy=(bruw:test wid bur) =+ loy=(bruw:suite wid bur)
=+ rig=sec:ex:loy =+ rig=sec:ex:loy
=+ our=`@p`fig:ex:loy =+ our=`@p`fig:ex:loy
=+ syp=[[0 ~ our now] [%en %pawn ges] pub:ex:loy] =+ syp=[[0 ~ our now] [%en %pawn ges] pub:ex:loy]
@ -1351,7 +1351,7 @@
:: ::
:: fake uses carrier # :: fake uses carrier #
:: ::
=+ loy=?:(fak (bruw:test 2.048 her) (bruw:test 2.048 ger)) =+ loy=?:(fak (bruw:suite 2.048 her) (bruw:suite 2.048 ger))
=+ fim==(fig:ex:loy (zeno her)) =+ fim==(fig:ex:loy (zeno her))
?: &(!fak !fim) !! :: not fake & bad fig ?: &(!fak !fim) !! :: not fake & bad fig
=+ mac=`mace`[[0 sec:ex:loy] ~] =+ mac=`mace`[[0 sec:ex:loy] ~]

4
arvo/eyre.hoon
View File

@ -4,7 +4,9 @@
|= pit/vase |= pit/vase
=, ^gall =, ^gall
=, crypto:ames =, crypto:ames
=, markup =, bytes:eyre
=, js:eyre
=, xml:eyre
=> =~ => =~
|% :: interfaces |% :: interfaces
++ gift gift-eyre :: out result <-$ ++ gift gift-eyre :: out result <-$

2
arvo/jael.hoon
View File

@ -16,10 +16,10 @@
:: - task for converting invites to tickets :: - task for converting invites to tickets
:: ::
|= pit/vase |= pit/vase
=, crypto
=, pki:^jael =, pki:^jael
=, rights:^jael =, rights:^jael
=, moves:^jael =, moves:^jael
=, crypto:ames
=, jael =, jael
:: :::: :: ::::
:::: # models :: data structures :::: # models :: data structures

13
arvo/zuse.hoon
View File

@ -1793,12 +1793,12 @@
:: XX: ++bruw, ++haul and ++weur are obsolete crua interfaces; :: XX: ++bruw, ++haul and ++weur are obsolete crua interfaces;
:: delete or restructure :: delete or restructure
|% |%
:: :: ++trsa:test:crypto :: :: ++trua:test:crypto
++ trua :: test rsa ++ trua :: test crua
|= msg/@tas |= msg/@tas
^- @ ^- @
=+ ali=(bruw 1.024 (shax 'ali')) =+ ali=(bruw:suite 1.024 (shax 'ali'))
=+ bob=(bruw 1.024 (shax 'bob')) =+ bob=(bruw:suite 1.024 (shax 'bob'))
=+ tef=(sign:as.ali [0 msg]) =+ tef=(sign:as.ali [0 msg])
=+ lov=(sure:as.ali [0 tef]) =+ lov=(sure:as.ali [0 tef])
?. &(?=(^ lov) =(msg u.lov)) ?. &(?=(^ lov) =(msg u.lov))
@ -1863,7 +1863,8 @@
=+ [mag=(end 3 1 a) bod=(rsh 3 1 a)] =+ [mag=(end 3 1 a) bod=(rsh 3 1 a)]
?> =('A' mag) ?> =('A' mag)
(nol:nu:crua bod) (nol:nu:crua bod)
-- -- :: suite
-- :: crypto
:: :: :: ::
:::: ## number:ames :: misc number theory :::: ## number:ames :: misc number theory
:: :::: :: ::::
@ -2181,7 +2182,7 @@
=< |= a/cord =< |= a/cord
%+ biff (rush a (more sepa elem)) %+ biff (rush a (more sepa elem))
|= b/(list _(wonk *elem)) ^- (unit date) |= b/(list _(wonk *elem)) ^- (unit date)
=- ?.((za:jo:markup -) ~ (some (zp:jo:markup -))) =- ?.((za:jo:js:eyre -) ~ (some (zp:jo:js:eyre -)))
^+ =+ [*date u=unit] ^+ =+ [*date u=unit]
*{(u _[a y]) (u _m) (u _d.t) (u _+.t) $~} *{(u _[a y]) (u _m) (u _d.t) (u _+.t) $~}
:~ :~

2
lib/down-jet/parse.hoon
View File

@ -3,7 +3,7 @@
:::: /hoon/parse/down-jet/lib :::: /hoon/parse/down-jet/lib
:: ::
/? 310 /? 310
=, markup =, xml:eyre
=+ =~ =+ =~
|% |%
++ loca |*(a/_* {p/@u q/a}) ++ loca |*(a/_* {p/@u q/a})

2
lib/map-to-json.hoon
View File

@ -5,4 +5,4 @@
/? 310 /? 310
|* {a/_cord b/_json} :: XX {a/$-(* cord) b/$-(* json)} |* {a/_cord b/_json} :: XX {a/$-(* cord) b/$-(* json)}
|= c/(map _+<.a _+<.b) |= c/(map _+<.a _+<.b)
(jobe:markup (turn (~(tap by c)) |*(d/^ [(a -.d) (b +.d)]))) (jobe:js:eyre (turn (~(tap by c)) |*(d/^ [(a -.d) (b +.d)])))

2
lib/react.hoon
View File

@ -2,7 +2,7 @@
:::: /hoon/react/lib :::: /hoon/react/lib
:: ::
/? 310 /? 310
=, markup =, xml:eyre
|% |%
++ react-elems :: XX /~ ++ react-elems :: XX /~
~+ %- silt ^- (list term) ~+ %- silt ^- (list term)

4
lib/twitter.hoon
View File

@ -6,7 +6,9 @@
/- twitter /- twitter
/+ interpolate, hep-to-cab /+ interpolate, hep-to-cab
=+ sur-twit:^twitter :: XX =+ sur-twit:^twitter :: XX
=, markup =, bytes:eyre
=, js:eyre
=, xml:eyre
!: !:
:::: functions :::: functions
:: ::

8
lib/write.hoon
View File

@ -74,7 +74,7 @@
:: ::
++ poke-paste ++ poke-paste
|= {typ/?($hoon $md $txt) txt/@t} ^+ abet |= {typ/?($hoon $md $txt) txt/@t} ^+ abet
(poke--data [`typ /web/paste/(scot %da now)] %mime / (taco txt)) (poke--data [`typ /web/paste/(scot %da now)] %mime / (taco:bytes:eyre txt))
:: ::
++ poke-comment ++ poke-comment
|= {sup/spur him/ship txt/@t} ^+ abet |= {sup/spur him/ship txt/@t} ^+ abet
@ -84,7 +84,7 @@
'## `' (scot %p him) '`' '## `' (scot %p him) '`'
'\0a' txt '\0a' txt
== ==
(poke--data [`%md pax] %mime / (taco txt)) (poke--data [`%md pax] %mime / (taco:bytes:eyre txt))
:: ::
++ poke-fora-post ++ poke-fora-post
|= {sup/spur him/ship hed/@t txt/@t} ^+ abet |= {sup/spur him/ship hed/@t txt/@t} ^+ abet
@ -103,7 +103,7 @@
{(trip txt)} {(trip txt)}
""" """
(poke--data [`%md pax] %mime / (taco txt)) (poke--data [`%md pax] %mime / (taco:bytes:eyre txt))
:: ::
++ ames-secret ++ ames-secret
^- @t ^- @t
@ -115,7 +115,7 @@
?> ?=($& -.hot) ?> ?=($& -.hot)
=. p.hot (scag 2 p.hot) :: ignore subdomain =. p.hot (scag 2 p.hot) :: ignore subdomain
=. dat (scot %uw (en:crua:crypto:ames ames-secret dat)) =. dat (scot %uw (en:crua:crypto:ames ames-secret dat))
(poke--data [`%atom [%sec p.hot]] %mime / (taco dat)) (poke--data [`%atom [%sec p.hot]] %mime / (taco:bytes:eyre dat))
:: ::
++ poke--data ++ poke--data
|= {{ext/(unit @t) pax/path} dat/data} ^+ abet |= {{ext/(unit @t) pax/path} dat/data} ^+ abet

8
mar/elem.hoon
View File

@ -2,14 +2,14 @@
:::: /hoon/elem/mar :::: /hoon/elem/mar
:: ::
/? 310 /? 310
=, markup =, js:e
|_ own/manx |_ own/manx
:: ::
++ grow :: convert to ++ grow :: convert to
|% |%
++ hymn ;html:(head body:"+{own}") :: convert to %hymn ++ hymn ;html:(head body:"+{own}") :: convert to %hymn
++ html (crip (poxo hymn)) :: convert to %html ++ html (crip (poxo:xml:eyre hymn)) :: convert to %html
++ mime [/text/html (taco html)] :: convert to %mime ++ mime [/text/html (taco:js:eyre html)] :: convert to %mime
-- --
++ garb /snip :: grabbed by ++ garb /snip :: grabbed by
++ grab |% :: convert from ++ grab |% :: convert from

2
mar/hoon.hoon
View File

@ -7,7 +7,7 @@
:: ::
++ grow :: convert to ++ grow :: convert to
|% |%
++ mime `^mime`[/text/x-hoon (taco own)] :: convert to %mime ++ mime `^mime`[/text/x-hoon (taco:bytes:eyre own)] :: convert to %mime
++ elem :: convert to %html ++ elem :: convert to %html
;div:pre(urb_codemirror "", mode "hoon"):"{(trip own)}" ;div:pre(urb_codemirror "", mode "hoon"):"{(trip own)}"
:: =+ gen-id="src-{<`@ui`(mug own)>}" :: =+ gen-id="src-{<`@ui`(mug own)>}"

2
mar/json.hoon
View File

@ -5,7 +5,7 @@
:: ::
:::: compute :::: compute
:: ::
=, markup =, js:eyre
|_ jon/json |_ jon/json
:: ::
++ grow :: convert to ++ grow :: convert to

3
mar/mime.hoon
View File

@ -12,7 +12,8 @@
++ grab :: convert from ++ grab :: convert from
|% |%
++ noun mime :: clam from %noun ++ noun mime :: clam from %noun
++ tape |=(a/_"" [/application/x-urb-unknown (tact a)]) ++ tape
|=(a/_"" [/application/x-urb-unknown (tact:bytes:eyre a)])
-- --
++ grad ++ grad
|% |%

2
mar/snip.hoon
View File

@ -2,7 +2,7 @@
:::: /hoon/snip/mar :::: /hoon/snip/mar
:: ::
/? 310 /? 310
=, markup =, xml:eyre
|% |%
++ words 1 ++ words 1
++ hedtal ++ hedtal

2
mar/txt.hoon
View File

@ -6,7 +6,7 @@
=, differ:^clay =, differ:^clay
=, differ:clay =, differ:clay
=, lines:clay =, lines:clay
=, markup =, bytes:eyre
|_ txt/wain |_ txt/wain
:: ::
++ grab :: convert from ++ grab :: convert from

2
mar/urb.hoon
View File

@ -3,7 +3,7 @@
:: ::
/? 310 /? 310
/= urb-wasp-data-js /: /%/wasp-data /js/ /= urb-wasp-data-js /: /%/wasp-data /js/
=, markup =, xml:eyre
!: !:
|_ {{dep/@uvH hed/marl} {dep-bod/@uvH bod/marl}} |_ {{dep/@uvH hed/marl} {dep-bod/@uvH bod/marl}}
++ grow :: convert to ++ grow :: convert to

2
ren/tree/body.hoon
View File

@ -6,7 +6,7 @@
/= dat-sen /| /: /%%/ /% /tree-json/ :: default include /= dat-sen /| /: /%%/ /% /tree-json/ :: default include
/~ ~ /~ ~
== ==
=, markup =, xml:eyre
^- marl ^- marl
;= ;script(type "text/javascript"): window.tree = {(pojo (jobe data+dat sein+dat-sen ~))} ;= ;script(type "text/javascript"): window.tree = {(pojo (jobe data+dat sein+dat-sen ~))}
;div#tree; ;div#tree;

2
ren/tree/json.hoon
View File

@ -8,7 +8,7 @@
/= dat /^ tree-include /tree-include/ /= dat /^ tree-include /tree-include/
/= kid /^ (map knot tree-include) /= kid /^ (map knot tree-include)
/_ /tree-include/ /_ /tree-include/
=, markup =, js:eyre
!: !:
:::: ::::
:: ::