diff --git a/app/ask.hoon b/app/ask.hoon index 299c1157e..5e9601766 100644 --- a/app/ask.hoon +++ b/app/ask.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/ask/app :: -/? 314 +/? 310 /+ sole [. sole] |% @@ -15,7 +15,7 @@ |= path ^- (quip {bone card} +>) ~| [%not-in-whitelist src.bow] - ?> (~(has in (sa (limo ~zod our.bow ~talsur-todres ~))) src.bow) + ?> (~(has in (sy ~zod our.bow ~talsur-todres ~)) src.bow) :_ +>.$(sos (~(put by sos) ost.bow *sole-share)) =- [(effect %mor pro+[& %$ ""] -)]~ =+ all=adrs diff --git a/app/curl.hoon b/app/curl.hoon index 60927a731..8fa615f87 100644 --- a/app/curl.hoon +++ b/app/curl.hoon @@ -1,11 +1,12 @@ -!: +:: :::: /hoon/curl/app :: -/? 314 -|_ [[^ ^ ost=@ ^] ~] -++ poke |*(a=[mark *] :_(+> [ost %hiss / %wain a]~)) -::++ poke-purl |=(a=purl :_(+> [ost %hiss / %wain %purl a]~)) -++ poke-noun |=(a=tape (poke %purl (scan a auri:epur))) -++ sigh-wain |=([* a=wain] ~&(a `+>)) -++ sigh-tang |=([* a=tang] (mean a)) +/? 310 +!: +|_ {{^ ^ ost/@ ^} $~} +++ poke |*(a/{mark *} :_(+> [ost %hiss / %wain a]~)) +::++ poke-purl |=(a/purl :_(+> [ost %hiss / %wain %purl a]~)) +++ poke-noun |=(a/tape (poke %purl (scan a auri:epur))) +++ sigh-wain |=({* a/wain} ~&(a `+>)) +++ sigh-tang |=({* a/tang} (mean a)) -- diff --git a/app/dojo.hoon b/app/dojo.hoon index ce6366949..6a73fc30f 100644 --- a/app/dojo.hoon +++ b/app/dojo.hoon @@ -1,7 +1,7 @@ :: :: :: :::: /hoon/dojo/app :: :::: :: :: :: -/? 314 :: arvo kelvin +/? 310 :: arvo kelvin /- sole :: console structures /+ sole :: console library [. sole] diff --git a/app/hood.hoon b/app/hood.hoon index f8859eeb7..078b2252b 100644 --- a/app/hood.hoon +++ b/app/hood.hoon @@ -1,7 +1,7 @@ :: :: :: :::: /hoon/hood/app :: :: :: :: :: -/? 314 :: zuse version +/? 310 :: zuse version /+ sole, talk, helm, kiln, drum, write :: libraries [. helm kiln drum] :: :: :: diff --git a/app/talk.hoon b/app/talk.hoon index 3a43d4921..9c5c5abdd 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -1,7 +1,7 @@ :: :: :: :::: /hoon/talk/app :: :: :: :: :: -/? 314 +/? 310 /- talk, sole /+ talk, sole /= seed /~ !>(.) diff --git a/app/work.hoon b/app/work.hoon deleted file mode 100644 index 08cb0aa45..000000000 --- a/app/work.hoon +++ /dev/null @@ -1,337 +0,0 @@ -:: -:::: /hoon/work/app - :: -/? 314 -/- work -/+ talk -!: -:::: - :: -[. work] -|% -++ move (pair bone card) :: all actions -++ card :: general card - $% [%diff %work-report client] :: - [%peer wire dock path] :: - [%poke wire dock pear] :: - == :: -++ pear :: poke fruit - $% [%talk-command command:talk] :: - == :: --- -!: -:::: - :: -|_ $: bowl - client - connected=_| :: subscribed to talk - count=@ud :: # messages from talk - unordered=(map ,[@uvH @u] (pair ship flesh:work-stuff:talk)) - == -++ at - |= client-task - =| moves=(list move) - |% - ++ abet - ^- [(list move) _+>.$] - [(flop moves) +>.$(tasks (~(put by tasks) id.tax +<.$))] - :: - ++ abut - ^- [(list move) _+>.$] - [(flop moves) +>.$] - :: - ++ send-audience - |= [to=(set station:talk) action=duty:work-stuff:talk] - %_ +>.$ - eny (sham eny action) - moves - :_ moves - ^- move - :* ost %poke - /sending/(scot %uv id.tax)/(scot %ud version.tax) - [our %talk] - %talk-command - => [. talk] ^- command:talk - :- %publish - |- ^- (list thought) - :_ ~ - :+ (shaf %task eny) - %- mo ^- (list ,[partner envelope delivery]) - %+ turn (~(tap in to)) - |=(sat=station [[%& sat] [*envelope %pending]]) - [now *bouquet [%tax action]] - == - == - :: - ++ send - |= action=duty:work-stuff:talk - (send-audience audience action) - :: - ++ send-archive - |= to=(set station:talk) - (send-audience to %archive id.tax) - :: - ++ send-create (send %create tax) - ++ send-change |* * - ?: =(our creator.tax) - (send-update +(version.tax) our +<) - %+ send-audience - [[creator.tax (main:talk creator.tax)] ~ ~] - [%change id.tax +<] - ++ send-update |*(* (send %update id.tax +<)) - ++ process-update - |= up=update - ^+ +> - ?- -.up - %add ?>(?=(%comment +<.up) (send-change %add-comment our +>.up)) - %doer - ?- +<.up - %release (send-change %set-doer ~) - %claim (send-change %set-doer `our) - == - :: - %set - ?- +<.up - %audience (process-audience to.up) - %date-due (send-change %set-date-due +>.up) - %title (send-change %set-title +>.up) - %description (send-change %set-description +>.up) - %tags (send-change %set-tags +>.up) - %done (send-change %set-done +>.up) - == - == - ++ process-audience - |= to=(set station:talk) - ^+ +> - =. +>.$ (send-archive (~(dif in audience) to)) - =. +>.$ (send-audience (~(dif in to) audience) %create tax) - +>.$(audience to) - -- -:: -++ prep - |= $= old - $_ - =< $ - %- unit - $: client - _| - @ud - (map ,[@uvH @u] (pair ship flesh:work-stuff:talk)) - == - ^- [(list move) _+>.$] - initialize(+<+ ?~(old +<+.+>.$ u.old)) -:: -++ initialize - ^- [(list move) _.] - ?: connected - [~ .] - :_ .(connected %&) :_ ~ - [ost %peer /peering [our %talk] /f/(main:talk our)/(scot %ud count)] -:: -++ process-duty - |= [when=@da her=ship from=(set station:talk) action=duty:work-stuff:talk] - ^- [(list move) _+>.$] - =- =^ mof con mirror-to-web:con - [(welp mof mos) con] - ^- [mos=(list move) con=_+>.$] - ?- -.action - %create - =+ existing-task=(~(get by tasks) id.tax.action) - ?: ?& ?=(^ existing-task) - !=(tax.action tax.u.existing-task) - !archived.u.existing-task - == - ~& :* %new-task-with-old-id - her=her - from=from - new-task=tax.action - existing-task=u.existing-task - == - [~ +>.$] - ?. =(her creator.tax.action) - ~& :* %created-with-bad-creator - her=her - from=from - new-task=tax.action - existing-task=existing-task - == - [~ +>.$] - =. tasks - %^ ~(put by tasks) id.tax.action | - :_ tax.action - ?~ existing-task from - (~(uni in audience.u.existing-task) from) - =. sort ?^(existing-task sort [id.tax.action sort]) - [~ +>.$] - :: - %archive - =+ tax=(~(get by tasks) id.action) - ?~ tax - ~& :* %archive-for-nonexistent-task - her=her - from=from - action=action - == - [~ +>.$] - ?: !=(her creator.tax.u.tax) - ~& :* %archiver-not-creator - her=her - from=from - action=action - tax=tax - == - [~ +>.$] - =. tasks - %+ ~(put by tasks) id.action - :* =(~ (~(dif in audience.u.tax) from)) - (~(dif in audience.u.tax) from) - tax.u.tax - == - [~ +>.$] - :: - %change - =+ tax=(~(get by tasks) id.action) - ?~ tax - ~& :* %change-for-nonexistent-task - her=her - from=from - action=action - == - [~ +>.$] - ?: !=(our creator.tax.u.tax) - ~& :* %me-not-creator - her=her - from=from - action=action - tax=tax - == - [~ +>.$] - abet:(send-update:(at u.tax) +(version.tax.u.tax) her meat.action) - :: - %update - =+ tax=(~(get by tasks) id.action) - ?~ tax - ~& :* %update-for-nonexistent-task - her=her - from=from - action=action - == - [~ +>.$] - ?: !=(her creator.tax.u.tax) - ~& :* %her-not-creator - her=her - from=from - action=action - tax=tax - == - [~ +>.$] - ?. =(version.action +(version.tax.u.tax)) - ~& :* %update-bad-version - her - from=from - action=action - tax=tax - == - ?: (lte version.action version.tax.u.tax) - ~& %really-bad-version - [~ +>.$] - :- ~ - %_ +>.$ - unordered - %+ ~(put by unordered) - [id.action version.action] - [her.action meat.action] - == - |- - =. tasks - %+ ~(put by tasks) id.action - :+ archived.u.tax - (~(uni in audience.u.tax) from) - =. version.tax.u.tax version.action - =. date-modified.tax.u.tax when - ?- -.meat.action - %set-doer tax.u.tax(doer her.meat.action) - %set-date-due tax.u.tax(date-due wen.meat.action) - %set-tags tax.u.tax(tags tag.meat.action) - %set-title tax.u.tax(title til.meat.action) - %set-description tax.u.tax(description des.meat.action) - %set-done tax.u.tax(done ?.(don.meat.action ~ `when)) - %add-comment - %= tax.u.tax - discussion [[when [who com]:meat.action] discussion.tax.u.tax] - == - == - =+ ooo=(~(get by unordered) id.action +(version.action)) - ?~ ooo - [~ +>.^$] - %= $ - version.action +(version.action) - her.action p.u.ooo - meat.action q.u.ooo - == - == -:: -++ mirror-to-web - ^- [(list move) _.] - ~& [%mirroring sort=(turn sort |=(a=@uv `@uv`(rsh 2 25 a)))] - :_ . - %+ murn (~(tap by sup)) - |= [ust=bone her=ship pax=path] - ^- (unit move) - ?:(?=([%sole *] pax) ~ `[ust full-report]) -:: -++ full-report [%diff %work-report tasks sort] -++ peer-repo |=(path [[ost full-report]~ +>.$]) -++ coup - |= [way=wire saw=(unit tang)] - ^- [(list move) _+>.$] - ?> ?=(~ saw) - [~ +>.$] -:: -++ quit-peering |=(way=wire ?>(?=(~ way) initialize(connected |))) -++ reap-peering - |= [way=wire saw=(unit tang)] - ^- [(list move) _+>.$] - ?> ?=([~ ~] +<) - [~ +>.$] -:: -++ poke-work-command - |= cod=command - ?. =(our src) - ~|([%wrong-user our=our src=src] !!) - ?- -.cod - %sort mirror-to-web(sort p.cod) - %old - =^ mow +>.$ - =+ (at (~(got by tasks) id.cod)) - abet:(process-update:- dif.cod) - =^ mov +>.$ mirror-to-web - [(welp mov mow) +>.$] - %new - =. +>.cod +>.cod(date-created now, version 0, date-modified now) - abut:send-create:(at | +.cod) - == -:: -:: XX test the disconnection case -++ diff-talk-report - |= [way=wire rep=report:talk] - ^- [(list move) _+>.$] - ?> ?=(%grams -.rep) - |- ^- [(list move) _+>.^$] - ?~ q.rep [~ +>.^$] - =. count +(count) - =* her p.i.q.rep - =* when p.r.q.i.q.rep - =* said r.r.q.i.q.rep - ?. ?=(%tax -.said) - $(p.rep +(p.rep), q.rep t.q.rep) - =+ ^- from=(set station:talk) - %- sa ^- (list station:talk) - %+ murn (~(tap by q.q.i.q.rep)) - => talk - |= [par=partner *] - `(unit station)`?.(?=(%& -.par) ~ `p.par) - =^ mos +>.^$ (process-duty when her from +.said) - =^ mof +>.^$ $(p.rep +(p.rep), q.rep t.q.rep) - [(weld mos mof) +>.^$] --- diff --git a/arvo/ford.hoon b/arvo/ford.hoon index 786e9067f..6c53b0452 100644 --- a/arvo/ford.hoon +++ b/arvo/ford.hoon @@ -937,15 +937,10 @@ ++ lamp :: normalize version |= {cof/cafe bem/beam} ^- (bolt beam) - %+ cope - ?: ?=($ud -.r.bem) (fine cof bem) - =+ von=(syve [151 %noun] ~ %cw bem(s ~)) - ?~ von [p=cof q=[%1 [%w bem ~] ~ ~]] - (fine cof bem(r [%ud ((hard @) +.+:(need u.von))])) - |= {cof/cafe bem/{{ship desk $ud r/@u} s/spur}} - ?: =(0 r.bem) - (flaw cof [leaf+"ford: no data: {<(tope bem(s ~))>}"]~) - (fine cof bem) + ?: ?=($ud -.r.bem) (fine cof bem) + =+ von=(syve [151 %noun] ~ %cw bem(s ~)) + ?~ von [p=cof q=[%1 [%w bem ~] ~ ~]] + (fine cof bem(r [%ud ((hard @) +.+:(need u.von))])) :: ++ lave :: validate |= {cof/cafe for/mark som/*} @@ -988,9 +983,11 @@ ++ liar :: load cage |= {cof/cafe bem/beam} ^- (bolt cage) + ?: =([%ud 0] r.bem) + (flaw cof [leaf+"ford: no data: {<(tope bem(s ~))>}"]~) =+ von=(syve [151 %noun] ~ %cx bem) ?~ von - [p=*cafe q=[%1 [[%x bem ~] ~ ~]]] + [p=cof q=[%1 [[%x bem ~] ~ ~]]] ?~ u.von (flaw cof leaf+"file not found" (smyt (tope bem)) ~) (fine cof u.u.von) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 579534a65..c5cd0876a 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -778,7 +778,7 @@ :: ++ swag :: infix |* {{a/@ b/@} c/(list)} - (scag b (slag a c)) + (scag +<-> (slag +<-< c)) :: ++ turn :: transform ~/ %turn diff --git a/gen/cat.hoon b/gen/cat.hoon index 1aab558c8..d78653284 100644 --- a/gen/cat.hoon +++ b/gen/cat.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/cat/gen :: -/? 314 +/? 310 // /%%/ls/subdir // /%/pretty !: diff --git a/gen/cat/pretty.hoon b/gen/cat/pretty.hoon index 8353c9c80..d5a2f0256 100644 --- a/gen/cat/pretty.hoon +++ b/gen/cat/pretty.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/pretty/cat/gen :: -/? 314 +/? 310 !: |% ++ pretty-noun diff --git a/gen/change.hoon b/gen/change.hoon index 6f0e247b2..4414e8b58 100644 --- a/gen/change.hoon +++ b/gen/change.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/change/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/curl.hoon b/gen/curl.hoon index 6100de1ef..e131cb1aa 100644 --- a/gen/curl.hoon +++ b/gen/curl.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/curl/gen :: -/? 314 +/? 310 /- sole [sole] :- %get |= {^ {a/tape $~} $~} diff --git a/gen/hello.hoon b/gen/hello.hoon index 1433e0c80..28c9f7175 100644 --- a/gen/hello.hoon +++ b/gen/hello.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/hello/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/ask.hoon b/gen/hood/ask.hoon index cabd27195..73d8566f0 100644 --- a/gen/hood/ask.hoon +++ b/gen/hood/ask.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/ask/hood/gen :: -/? 314 +/? 310 :- %say |= {^ {mel/cord $~} $~} =+ adr=(star ;~(less (mask "\"\\()[],:;<>@") prn)) diff --git a/gen/hood/autoload.hoon b/gen/hood/autoload.hoon index 812a4a477..5bdba0c57 100644 --- a/gen/hood/autoload.hoon +++ b/gen/hood/autoload.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/autoload/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/begin.hoon b/gen/hood/begin.hoon index ce24137b4..7b375090f 100644 --- a/gen/hood/begin.hoon +++ b/gen/hood/begin.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/begin/hood/gen :: -/? 314 +/? 310 /- sole :: :::: @@ -13,7 +13,7 @@ [sole .] :- %ask |= $: {now/@da eny/@uvI bec/beak} - arg/$~ + {arg/_(scug *@ *{his/@p tic/@p $~})} safety/?($on $off) == ^- (sole-result (cask begs)) diff --git a/gen/hood/breload.hoon b/gen/hood/breload.hoon index 6d0f8c3ef..d41da8016 100644 --- a/gen/hood/breload.hoon +++ b/gen/hood/breload.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/breload/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/cancel.hoon b/gen/hood/cancel.hoon index aa3520349..1977f28b7 100644 --- a/gen/hood/cancel.hoon +++ b/gen/hood/cancel.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/cancel/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/cp.hoon b/gen/hood/cp.hoon index ef7ca78c3..a525ebde7 100644 --- a/gen/hood/cp.hoon +++ b/gen/hood/cp.hoon @@ -1,6 +1,6 @@ :: :::: /hoon/cp/hood/gen :: -/? 314 +/? 310 :- %say |=({^ {input/path output/path $~} $~} kiln-cp+[input output]) diff --git a/gen/hood/deset.hoon b/gen/hood/deset.hoon index 1de540735..14ebf7ecb 100644 --- a/gen/hood/deset.hoon +++ b/gen/hood/deset.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/deset/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/hi.hoon b/gen/hood/hi.hoon index d028e6dbe..eb9099a98 100644 --- a/gen/hood/hi.hoon +++ b/gen/hood/hi.hoon @@ -1,6 +1,6 @@ :: :::: /hoon/hi/hood/gen :: -/? 314 +/? 310 :- %say |=({^ {who/ship mez/$@($~ {a/tape $~})} $~} helm-send-hi+[who ?~(mez ~ `a.mez)]) diff --git a/gen/hood/invite.hoon b/gen/hood/invite.hoon index 2c88ec369..6a063eca1 100644 --- a/gen/hood/invite.hoon +++ b/gen/hood/invite.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/invite/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/label.hoon b/gen/hood/label.hoon index 47519e26a..cfe9ebcdb 100644 --- a/gen/hood/label.hoon +++ b/gen/hood/label.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/label/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/link.hoon b/gen/hood/link.hoon index 795217340..a21b96e74 100644 --- a/gen/hood/link.hoon +++ b/gen/hood/link.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/link/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/mass.hoon b/gen/hood/mass.hoon index e9ed29162..3c26ceb45 100644 --- a/gen/hood/mass.hoon +++ b/gen/hood/mass.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/mass/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/merge.hoon b/gen/hood/merge.hoon index 6e20843ea..bff79b960 100644 --- a/gen/hood/merge.hoon +++ b/gen/hood/merge.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/merge/hood/gen :: -/? 314 +/? 310 !: |% ++ beaky {knot knot knot $~} @@ -31,9 +31,9 @@ :: {* ^ $~} :- (pars-src syd.arg) - =+((pars bek.arg) [who dez (opt-case caz) gem])] + =+((pars bek.arg) [who dez (opt-case caz) gem]) == -++ opt-case |=(a=case ?:(=(*case cas) a cas)) :: override +++ opt-case |=(a/case ?:(=(*case cas) a cas)) :: override ++ pars |=(a/beaky `{{who/ship dez/desk caz/case} *}`(need (tome a))) ++ pars-src |= syd/$@(desk beaky) diff --git a/gen/hood/mount.hoon b/gen/hood/mount.hoon index faa3a9502..f757e938e 100644 --- a/gen/hood/mount.hoon +++ b/gen/hood/mount.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/mount/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/mv.hoon b/gen/hood/mv.hoon index 6e5e7d485..2fe8b1028 100644 --- a/gen/hood/mv.hoon +++ b/gen/hood/mv.hoon @@ -1,6 +1,6 @@ :: :::: /hoon/mv/hood/gen :: -/? 314 +/? 310 :- %say |=({^ {input/path output/path $~} $~} kiln-mv+[input output]) diff --git a/gen/hood/overload.hoon b/gen/hood/overload.hoon index fce8e8a71..ab007b0af 100644 --- a/gen/hood/overload.hoon +++ b/gen/hood/overload.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/overload/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/rc.hoon b/gen/hood/rc.hoon index 3da2812bd..e802175e6 100644 --- a/gen/hood/rc.hoon +++ b/gen/hood/rc.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/rc/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/reboot.hoon b/gen/hood/reboot.hoon index 1995af9a2..6f9dc085e 100644 --- a/gen/hood/reboot.hoon +++ b/gen/hood/reboot.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/reboot/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/reload-desk.hoon b/gen/hood/reload-desk.hoon index eea3df827..5f03f59f1 100644 --- a/gen/hood/reload-desk.hoon +++ b/gen/hood/reload-desk.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/reload-desk/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/reload.hoon b/gen/hood/reload.hoon index bf36610d1..7e0b45cc8 100644 --- a/gen/hood/reload.hoon +++ b/gen/hood/reload.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/reload/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/reset.hoon b/gen/hood/reset.hoon index acf5f2ef4..9473aded1 100644 --- a/gen/hood/reset.hoon +++ b/gen/hood/reset.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/reset/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/rf.hoon b/gen/hood/rf.hoon index 4f138ff9b..a632edbb9 100644 --- a/gen/hood/rf.hoon +++ b/gen/hood/rf.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/rf/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/rm.hoon b/gen/hood/rm.hoon index 7fada7f29..3a3e494df 100644 --- a/gen/hood/rm.hoon +++ b/gen/hood/rm.hoon @@ -1,6 +1,6 @@ :: :::: /hoon/rm/hood/gen :: -/? 314 +/? 310 :- %say |=({^ {input/path $~} $~} kiln-rm+input) diff --git a/gen/hood/schedule.hoon b/gen/hood/schedule.hoon index d2561b308..17aed3a38 100644 --- a/gen/hood/schedule.hoon +++ b/gen/hood/schedule.hoon @@ -1,6 +1,6 @@ :: :::: /hoon/schedule/hood/gen :: -/? 314 +/? 310 :- %say |=({^ {where/path tym/@da eve/@t $~} $~} kiln-schedule+[where tym eve]) diff --git a/gen/hood/serve.hoon b/gen/hood/serve.hoon index aa4062634..006c7809b 100644 --- a/gen/hood/serve.hoon +++ b/gen/hood/serve.hoon @@ -1,13 +1,13 @@ :: :::: /hoon/serve/hood/gen :: -/? 314 +/? 310 :: :::: !: :- %say -|= $: [now=@da eny=@uvI bec=beak] - [[pax=$|(term [i=knot t=path]) ~] ~] +|= $: {now/@da eny/@uvI bec/beak} + {{pax/$@(term {i/knot t/path}) $~} $~} == :- %helm-serve ?@ pax pax diff --git a/gen/hood/start.hoon b/gen/hood/start.hoon index 39094e495..8c17d7a11 100644 --- a/gen/hood/start.hoon +++ b/gen/hood/start.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/start/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/sync.hoon b/gen/hood/sync.hoon index 85a3426b9..3ccc6ad15 100644 --- a/gen/hood/sync.hoon +++ b/gen/hood/sync.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/sync/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/track.hoon b/gen/hood/track.hoon index 0b452a16f..f1d1119cb 100644 --- a/gen/hood/track.hoon +++ b/gen/hood/track.hoon @@ -1,13 +1,13 @@ :: :::: /hoon/track/hood/gen :: -/? 314 +/? 310 :: :::: !: :- %say -|= $: [now=@da eny=@uvI bec=beak] - [arg=[syd=@tas her=@p sud=@tas ~] ~] +|= $: {now/@da eny/@uvI bec/beak} + {arg/{syd/@tas her/@p sud/@tas $~} $~} == :- %kiln-track -[syd her sud]:arg +[syd her sud]:arg \ No newline at end of file diff --git a/gen/hood/unlink.hoon b/gen/hood/unlink.hoon index 94fe2557c..32b0c8d95 100644 --- a/gen/hood/unlink.hoon +++ b/gen/hood/unlink.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/unlink/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/unmount.hoon b/gen/hood/unmount.hoon index 265c5e2c0..f2e82af24 100644 --- a/gen/hood/unmount.hoon +++ b/gen/hood/unmount.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/unmount/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/unsync.hoon b/gen/hood/unsync.hoon index d106cc85e..81ae2314b 100644 --- a/gen/hood/unsync.hoon +++ b/gen/hood/unsync.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/unsync/hood/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/hood/verb.hoon b/gen/hood/verb.hoon index 9e39e3fd4..40bfd8b35 100644 --- a/gen/hood/verb.hoon +++ b/gen/hood/verb.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/verb/hood/gen :: -/? 314 +/? 310 /- sole :: :::: diff --git a/gen/ls.hoon b/gen/ls.hoon index 283ef96cc..ac123ae90 100644 --- a/gen/ls.hoon +++ b/gen/ls.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/ls/gen :: -/? 314 +/? 310 // /%/subdir !: :::: diff --git a/gen/ls/subdir.hoon b/gen/ls/subdir.hoon index 00231ce5f..516e67a36 100644 --- a/gen/ls/subdir.hoon +++ b/gen/ls/subdir.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/subdir/ls/gen :: -/? 314 +/? 310 |% ++ subdir |= {pax/path des/(map @t $~)} diff --git a/gen/make.hoon b/gen/make.hoon index d3a0ceb21..fdc7b4898 100644 --- a/gen/make.hoon +++ b/gen/make.hoon @@ -1,6 +1,6 @@ :: :::: /hoon/make/gen :: -/? 314 +/? 310 :- %say |=({^ arg/(list @) foo/_`@`1 bar/_`@`2} noun+[arg foo bar]) diff --git a/gen/moon.hoon b/gen/moon.hoon index df0fb27bb..436566ace 100644 --- a/gen/moon.hoon +++ b/gen/moon.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/moon/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/pope.hoon b/gen/pope.hoon index 22e4b75ff..3ca0c995a 100644 --- a/gen/pope.hoon +++ b/gen/pope.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/pope/gen :: -/? 314 +/? 310 :: Input twitter keys /- sole !: diff --git a/gen/solid.hoon b/gen/solid.hoon index 691e1beb3..9f8f9b071 100644 --- a/gen/solid.hoon +++ b/gen/solid.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/solid/gen :: -/? 314 +/? 310 :: :::: !: diff --git a/gen/talk/load.hoon b/gen/talk/load.hoon index f2350d140..bfcc9173f 100644 --- a/gen/talk/load.hoon +++ b/gen/talk/load.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/load/talk/gen :: -/? 314 +/? 310 :: :::: !: @@ -9,4 +9,4 @@ |= $: {now/@da eny/@uvI byk/beak} {{man/knot $~} $~} == -[%talk-load man] +[%talk-load man] \ No newline at end of file diff --git a/gen/talk/log.hoon b/gen/talk/log.hoon index 504f0fc65..c3c2845e7 100644 --- a/gen/talk/log.hoon +++ b/gen/talk/log.hoon @@ -1,12 +1,12 @@ :: :::: /hoon/log/talk/gen :: -/? 314 +/? 310 :: :::: !: :- %say -|= $: [now=@da eny=@uvI byk=beak] - [[man=knot ~] ~] +|= $: {now/@da eny/@uvI byk/beak} + {{man/knot $~} $~} == -[%talk-log man] +[%talk-log man] \ No newline at end of file diff --git a/gen/talk/save.hoon b/gen/talk/save.hoon index 8e9d8ceee..e6da15b70 100644 --- a/gen/talk/save.hoon +++ b/gen/talk/save.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/save/talk/gen :: -/? 314 +/? 310 :: :::: !: @@ -9,4 +9,4 @@ |= $: {now/@da eny/@uvI byk/beak} {{man/knot $~} $~} == -[%talk-save man] +[%talk-save man] \ No newline at end of file diff --git a/gen/talk/unlog.hoon b/gen/talk/unlog.hoon index a2b9592df..0810306d2 100644 --- a/gen/talk/unlog.hoon +++ b/gen/talk/unlog.hoon @@ -1,12 +1,12 @@ :: :::: /hoon/unlog/talk/gen :: -/? 314 +/? 310 :: :::: !: :- %say -|= $: [now=@da eny=@uvI byk=beak] - [[man=knot ~] ~] +|= $: {now/@da eny/@uvI byk/beak} + {{man/knot $~} $~} == -[%talk-unlog man] +[%talk-unlog man] \ No newline at end of file diff --git a/gen/ticket.hoon b/gen/ticket.hoon index 4bb9ff13e..18407e7d2 100644 --- a/gen/ticket.hoon +++ b/gen/ticket.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/ticket/gen :: -/? 314 +/? 310 :: :::: !: @@ -10,4 +10,4 @@ {{her/@p $~} $~} == :- %noun -.^(@p /a/(scot %p p.bec)/tick/(scot %da now)/(scot %p her)) +.^(@p /a/(scot %p p.bec)/tick/(scot %da now)/(scot %p her)) \ No newline at end of file diff --git a/gen/tree.hoon b/gen/tree.hoon index f203741d1..28b03f292 100644 --- a/gen/tree.hoon +++ b/gen/tree.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/tree/gen :: -/? 314 +/? 310 !: :::: :: @@ -12,7 +12,7 @@ =+ rend=?^(fla smyt |=(a/path (smyt (slag len a)))) :- %tang %- flop |- ^- tang -=+ ark=.^(arch cy+pax)) +=+ ark=.^(arch cy+pax) =- ?~ fil.ark - [(rend pax) -] %- zing diff --git a/lib/down-jet.hoon b/lib/down-jet.hoon index b4e95e6f9..272a983ac 100644 --- a/lib/down-jet.hoon +++ b/lib/down-jet.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/down-jet/lib :: -/? 314 +/? 310 /- markdown :: :::: diff --git a/lib/down-jet/parse.hoon b/lib/down-jet/parse.hoon index 1c19d300d..9c5396f47 100644 --- a/lib/down-jet/parse.hoon +++ b/lib/down-jet/parse.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/parse/down-jet/lib :: -/? 314 +/? 310 =+ =~ |% ++ loca |*(a/_* {p/@u q/a}) diff --git a/lib/down-jet/rend.hoon b/lib/down-jet/rend.hoon index eaa385f8d..be77989cb 100644 --- a/lib/down-jet/rend.hoon +++ b/lib/down-jet/rend.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/rend/down-jet/lib :: -/? 314 +/? 310 !: |% ++ into-inner diff --git a/lib/frontmatter.hoon b/lib/frontmatter.hoon index e28cb32c7..cbed1f2cf 100644 --- a/lib/frontmatter.hoon +++ b/lib/frontmatter.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/frontmatter/lib :: -/? 314 +/? 310 !: |% ++ atr-lines diff --git a/lib/map-to-json.hoon b/lib/map-to-json.hoon new file mode 100644 index 000000000..d61bb03e4 --- /dev/null +++ b/lib/map-to-json.hoon @@ -0,0 +1,8 @@ +:: hoon data to json +:: +:::: /hoon/map-to-json/lib + :: +/? 310 +|* {a/_cord b/_json} :: XX {a/$-(* cord) b/$-(* json)} +|= c/(map _+<.a _+<.b) +(jobe (turn (~(tap by c)) |*(d/^ [(a -.d) (b +.d)]))) diff --git a/lib/react.hoon b/lib/react.hoon index 8c0569fff..841d5d6d6 100644 --- a/lib/react.hoon +++ b/lib/react.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/react/lib :: -/? 314 +/? 310 |% ++ react-elems :: XX /~ ~+ %- silt ^- (list term) @@ -118,8 +118,7 @@ ;: weld "React.createElement(" ?^ n.g.src !! :: namespaces unsupported - ?: (react-vale n.g.src) - ~! n.g.src + ?: (react-vale n.g.src) "'{(trip n.g.src)}'" (trip n.g.src) ", " diff --git a/lib/talk.hoon b/lib/talk.hoon index d502e71fe..f8f0cbb58 100644 --- a/lib/talk.hoon +++ b/lib/talk.hoon @@ -3,7 +3,7 @@ :: :: This file is in the public domain. :: -/? 314 +/? 310 /- talk !: :::: diff --git a/lib/tree.hoon b/lib/tree.hoon index 9010b571e..9cc68b0da 100644 --- a/lib/tree.hoon +++ b/lib/tree.hoon @@ -12,12 +12,6 @@ ~[ele] (zing (turn c.ele ..$)) :: -++ map-to-json :: hoon data to json - |* {a/$-(* cord) b/$-(* json)} - |* c/(map) ^- json :: XX c=(map _+<.a _+<.b) - ~! c - (jobe (turn (~(tap by c)) |*(* [(a +<-) (b +<+)]))) -:: :: a.b_c.d => [[%a %b] [%c %d]] :: a.b_c, a_b__c => [[%a %b] %c] :: a_b_c, a__b_c => [%a [%b %c]] diff --git a/lib/urb-split.hoon b/lib/urb-split.hoon index 62e61c781..becda7564 100644 --- a/lib/urb-split.hoon +++ b/lib/urb-split.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/urb-split/lib :: -/? 314 +/? 310 |= {dep/@uvH urb/manx} ^- {hed/{@uvh marl} bod/{@uvH marl}} ~| [%malformed-urb urb] :: XX types ?> ?=({{$html $~} {{$head $~} *} {{$body $~} *} $~} urb) diff --git a/lib/write.hoon b/lib/write.hoon index 45d10d150..b880a042d 100644 --- a/lib/write.hoon +++ b/lib/write.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/write/lib :: -/? 314 +/? 310 |% ++ part {$write $0 pith} :: no state ++ pith $~ diff --git a/mar/ask-mail.hoon b/mar/ask-mail.hoon index c06e89548..170ef3ba1 100644 --- a/mar/ask-mail.hoon +++ b/mar/ask-mail.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/ask-mail/mar :: -/? 314 +/? 310 |_ txt/cord :: ++ grab :: convert from diff --git a/mar/atom.hoon b/mar/atom.hoon index a41617d0c..4ec10a6c2 100644 --- a/mar/atom.hoon +++ b/mar/atom.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/atom/mar :: -/? 314 +/? 310 !: :::: A minimal atom mark |_ ato/@ diff --git a/mar/coffee.hoon b/mar/coffee.hoon index a3dedda31..d9a5c79f6 100644 --- a/mar/coffee.hoon +++ b/mar/coffee.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/coffee/mar :: -/? 314 +/? 310 |_ mud/@t ++ grow |% diff --git a/mar/comment-md.hoon b/mar/comment-md.hoon deleted file mode 100644 index 01c9d3f34..000000000 --- a/mar/comment-md.hoon +++ /dev/null @@ -1,6 +0,0 @@ -:: -:::: /hoon/comment-md/mar - :: -/? 314 -:: -// /===/mar/md :: alias diff --git a/mar/css.hoon b/mar/css.hoon index a5fc302da..fe053bd9a 100644 --- a/mar/css.hoon +++ b/mar/css.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/css/mar :: -/? 314 +/? 310 |_ mud/@t ++ grow :: convert to |% ++ mime [/text/css (taco mud)] :: convert to %mime diff --git a/mar/dill/belt.hoon b/mar/dill/belt.hoon index ea082932b..d4360881a 100644 --- a/mar/dill/belt.hoon +++ b/mar/dill/belt.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/belt/dill/mar :: -/? 314 +/? 310 /- kyev, sole !: :::: diff --git a/mar/dill/blit.hoon b/mar/dill/blit.hoon index ecb3fae35..e2bc51eb2 100644 --- a/mar/dill/blit.hoon +++ b/mar/dill/blit.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/blit/dill/mar :: -/? 314 +/? 310 /- sole [sole .] |_ dib/dill-blit diff --git a/mar/down.hoon b/mar/down.hoon index a60252507..415ea887f 100644 --- a/mar/down.hoon +++ b/mar/down.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/down/mar :: -/? 314 +/? 310 /- markdown /+ down-jet, frontmatter :: diff --git a/mar/elem.hoon b/mar/elem.hoon index 95c00bfe5..e9e074a07 100644 --- a/mar/elem.hoon +++ b/mar/elem.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/elem/mar :: -/? 314 +/? 310 |_ own/manx :: ++ grow :: convert to diff --git a/mar/front.hoon b/mar/front.hoon index a3a0d32e0..e39f4b704 100644 --- a/mar/front.hoon +++ b/mar/front.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/front/mar :: -/? 314 +/? 310 !: :::: :: diff --git a/mar/helm-hi.hoon b/mar/helm-hi.hoon index c11ad0a2d..2b18135ac 100644 --- a/mar/helm-hi.hoon +++ b/mar/helm-hi.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/helm-hi/mar :: -/? 314 +/? 310 |_ txt/cord :: ++ grab :: convert from diff --git a/mar/hoon.hoon b/mar/hoon.hoon index 2c5f77889..cb52314ec 100644 --- a/mar/hoon.hoon +++ b/mar/hoon.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/hoon/mar :: -/? 314 +/? 310 !: |_ own/@t :: diff --git a/mar/html.hoon b/mar/html.hoon index 07bec73e8..8f4b2e45f 100644 --- a/mar/html.hoon +++ b/mar/html.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/html/mar :: -/? 314 +/? 310 :: :::: compute :: diff --git a/mar/httr.hoon b/mar/httr.hoon index c0adcdf33..1d3ebf0d0 100644 --- a/mar/httr.hoon +++ b/mar/httr.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/httr/mar :: -/? 314 +/? 310 !: |_ hit/httr ++ grow |% ++ wall (turn wain trip) diff --git a/mar/hymn.hoon b/mar/hymn.hoon index 33056f5bc..0ac6e37c3 100644 --- a/mar/hymn.hoon +++ b/mar/hymn.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/hymn/mar :: -/? 314 +/? 310 |_ own/manx :: ++ grow :: convert to diff --git a/mar/jam.hoon b/mar/jam.hoon index 309e6eeee..3647266fa 100644 --- a/mar/jam.hoon +++ b/mar/jam.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/jam/mar :: -/? 314 +/? 310 !: |_ mud/@ ++ grow diff --git a/mar/js.hoon b/mar/js.hoon index 3d1070465..1f01827cc 100644 --- a/mar/js.hoon +++ b/mar/js.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/js/mar :: -/? 314 +/? 310 !: |_ mud/@ ++ grow diff --git a/mar/json.hoon b/mar/json.hoon index 812b2eb09..37ba530e3 100644 --- a/mar/json.hoon +++ b/mar/json.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/json/mar :: -/? 314 +/? 310 :: :::: compute :: diff --git a/mar/markdown.hoon b/mar/markdown.hoon index db4fd5453..0f7aabfcd 100644 --- a/mar/markdown.hoon +++ b/mar/markdown.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/markdown/mar :: -/? 314 +/? 310 :: |_ mud/@t ++ grow diff --git a/mar/md.hoon b/mar/md.hoon index fe4d56452..b6214ff99 100644 --- a/mar/md.hoon +++ b/mar/md.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/md/mar :: -/? 314 +/? 310 :: |_ mud/@t ++ grow diff --git a/mar/mime.hoon b/mar/mime.hoon index db44560ef..28c909023 100644 --- a/mar/mime.hoon +++ b/mar/mime.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/mime/mar :: -/? 314 +/? 310 !: |_ own/mime ++ grab :: convert from diff --git a/mar/purl.hoon b/mar/purl.hoon index 171a41c88..391335841 100644 --- a/mar/purl.hoon +++ b/mar/purl.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/purl/mar :: -/? 314 +/? 310 |_ url/purl :: ++ grow |% ++ hiss [url %get ~ ~] diff --git a/mar/quri.hoon b/mar/quri.hoon index 032af1626..66e2c3609 100644 --- a/mar/quri.hoon +++ b/mar/quri.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/quri/mar :: -/? 314 +/? 310 |_ url/quri :: ++ grow |% ++ mime [text+/x-uri (tact (apex:earn url))] diff --git a/mar/rss-xml.hoon b/mar/rss-xml.hoon new file mode 100644 index 000000000..a60519e5e --- /dev/null +++ b/mar/rss-xml.hoon @@ -0,0 +1,6 @@ +:: +:::: /hoon/rss-xml/mar + :: +/? 310 +:: +// /===/mar/xml :: alias diff --git a/mar/snip.hoon b/mar/snip.hoon index 31cb48b00..53e163161 100644 --- a/mar/snip.hoon +++ b/mar/snip.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/snip/mar :: -/? 314 +/? 310 !: |% ++ words 1 diff --git a/mar/sole/action.hoon b/mar/sole/action.hoon index 25bdcbe0c..6e1e53e92 100644 --- a/mar/sole/action.hoon +++ b/mar/sole/action.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/action/sole/mar :: -/? 314 +/? 310 /- sole !: :::: diff --git a/mar/sole/effect.hoon b/mar/sole/effect.hoon index 7e6922a6b..ca30c1fed 100644 --- a/mar/sole/effect.hoon +++ b/mar/sole/effect.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/effect/sole/mar :: -/? 314 +/? 310 /- sole !: :::: diff --git a/mar/talk/command.hoon b/mar/talk/command.hoon index 3847e7aad..7494b5d20 100644 --- a/mar/talk/command.hoon +++ b/mar/talk/command.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/command/talk/mar :: -/? 314 +/? 310 /- talk !: [talk .] diff --git a/mar/talk/report.hoon b/mar/talk/report.hoon index 1c1212a9e..c785b7988 100644 --- a/mar/talk/report.hoon +++ b/mar/talk/report.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/report/talk/mar :: -/? 314 +/? 310 /- talk /+ talk !: diff --git a/mar/talk/telegrams.hoon b/mar/talk/telegrams.hoon index 8b316bf6c..25e31b543 100644 --- a/mar/talk/telegrams.hoon +++ b/mar/talk/telegrams.hoon @@ -1,9 +1,9 @@ :: :::: /hoon/telegrams/talk/mar :: -/? 314 +/? 310 /- talk -/+ talk +/+ talk,map-to-json !: =+ talk |_ gam/(list telegram) @@ -127,20 +127,12 @@ ++ jope |=(a/ship (jape +:)) ::[%s (crip +:(scow %p a))]) ++ joke |=(a/tank [%s (role (turn (wash 0^80 a) crip))]) ++ jode |=(a/time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1))) - ++ jome :: stringify keys - |* {a/_cord b/_json} - |= c/(map _+<.a _+<.b) - (jobe (turn (~(tap by c)) (both a b))) - :: - ++ both :: cons two gates - |* {a/_* b/_*} - |=(c/_[+<.a +<.b] [(a -.c) (b +.c)]) :: ++ thot |= thought (jobe serial+(jape

) audience+(audi q) statement+(stam r) ~) :: - ++ audi (jome parn jove) + ++ audi (map-to-json parn jove) ++ bouq |= a/bouquet a+(turn (~(tap in a)) |=(b/path a+(turn b |=(c/knot s+c)))) diff --git a/mar/tang.hoon b/mar/tang.hoon index 0ff4db649..28aeca0ef 100644 --- a/mar/tang.hoon +++ b/mar/tang.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/tang/mar :: -/? 314 +/? 310 !: |_ tan/(list tank) :: diff --git a/mar/tree-include.hoon b/mar/tree-include.hoon index 84683a1fc..5af994e87 100644 --- a/mar/tree-include.hoon +++ b/mar/tree-include.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/tree-include/mar :: -/? 314 +/? 310 /- tree-include |_ tree-include ++ grab |% ++ noun tree-include diff --git a/mar/tree/elem.hoon b/mar/tree/elem.hoon index c9fc2025b..50159c617 100644 --- a/mar/tree/elem.hoon +++ b/mar/tree/elem.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/elem/tree/mar :: -/? 314 +/? 310 |_ own/manx :: ++ grow |% ++ elem own :: alias diff --git a/mar/tree/hymn.hoon b/mar/tree/hymn.hoon index c155e5a57..a262ec6ff 100644 --- a/mar/tree/hymn.hoon +++ b/mar/tree/hymn.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/hymn/tree/mar :: -/? 314 +/? 310 |_ own/manx :: ++ grow :: convert to diff --git a/mar/tree/include.hoon b/mar/tree/include.hoon index cfaa05b75..51e023f30 100644 --- a/mar/tree/include.hoon +++ b/mar/tree/include.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/include/tree/mar :: -/? 314 +/? 310 /- tree-include |_ tree-include ++ grab |% ++ noun tree-include diff --git a/mar/tree/index.hoon b/mar/tree/index.hoon index ccd48b08c..66110842a 100644 --- a/mar/tree/index.hoon +++ b/mar/tree/index.hoon @@ -1,8 +1,8 @@ :: :::: /hoon/index/tree/mar :: -/? 314 -/+ tree,react +/? 310 +/+ tree,react,map-to-json [. tree react] !: :::: diff --git a/mar/tree/json.hoon b/mar/tree/json.hoon index c2ea71169..0128f7568 100644 --- a/mar/tree/json.hoon +++ b/mar/tree/json.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/json/tree/mar :: -/? 314 +/? 310 :: :::: compute :: diff --git a/mar/txt-diff.hoon b/mar/txt-diff.hoon index 863461588..8fd10e6ac 100644 --- a/mar/txt-diff.hoon +++ b/mar/txt-diff.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/txt-diff/mar :: -/? 314 +/? 310 |_ txt-diff/(urge cord) :: ++ grab :: convert from diff --git a/mar/txt.hoon b/mar/txt.hoon index c4fe125bf..bb4ad16c7 100644 --- a/mar/txt.hoon +++ b/mar/txt.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/txt/mar :: -/? 314 +/? 310 !: |_ txt/wain :: diff --git a/mar/urb.hoon b/mar/urb.hoon index d2bd16393..602f3bed2 100644 --- a/mar/urb.hoon +++ b/mar/urb.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/urb/mar :: -/? 314 +/? 310 /= urb-wasp-data-js /: /%/wasp-data /js/ !: |_ {{dep/@uvH hed/marl} {dep-bod/@uvH bod/marl}} diff --git a/mar/urbit.hoon b/mar/urbit.hoon index 511b83567..41f48dc4f 100644 --- a/mar/urbit.hoon +++ b/mar/urbit.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/urbit/mar :: -/? 314 +/? 310 :::: A minimal urbit mark !: |_ her/@p diff --git a/mar/will.hoon b/mar/will.hoon index 8448f03ad..244a5c1d0 100644 --- a/mar/will.hoon +++ b/mar/will.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/will/mar :: -/? 314 +/? 310 |_ wyl/(unit will) :: ++ grab :: convert from diff --git a/mar/write/comment.hoon b/mar/write/comment.hoon index 93e08ff52..0dc688f9b 100644 --- a/mar/write/comment.hoon +++ b/mar/write/comment.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/comment/write/mar :: -/? 314 +/? 310 !: |_ {pax/path txt/@t} ++ grab diff --git a/mar/write/paste.hoon b/mar/write/paste.hoon index e11070e0c..65d8857b1 100644 --- a/mar/write/paste.hoon +++ b/mar/write/paste.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/paste/write/mar :: -/? 314 +/? 310 !: |_ {typ/?($hoon $md $txt) txt/@t} ++ grab diff --git a/mar/write/tree.hoon b/mar/write/tree.hoon index 3ed959132..9e276609d 100644 --- a/mar/write/tree.hoon +++ b/mar/write/tree.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/tree/write/mar :: -/? 314 +/? 310 !: |_ {sup/spur mim/mime} ++ grab diff --git a/mar/write/wipe.hoon b/mar/write/wipe.hoon index 9f7addfb1..8ab98f024 100644 --- a/mar/write/wipe.hoon +++ b/mar/write/wipe.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/wipe/write/mar :: -/? 314 +/? 310 !: |_ spur ++ grab diff --git a/mar/xml.hoon b/mar/xml.hoon index bae17ff47..21a02ebbf 100644 --- a/mar/xml.hoon +++ b/mar/xml.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/xml/mar :: -/? 314 +/? 310 :: :::: compute :: diff --git a/ren/rss-xml.hoon b/ren/rss-xml.hoon index be957186a..0b3915bd3 100644 --- a/ren/rss-xml.hoon +++ b/ren/rss-xml.hoon @@ -2,19 +2,20 @@ :: :::: /hoon/rss-xml/ren :: -/? 314 +/? 310 /= sum /snip/ -/^ kid=(map knot ,[marl marl]) - /_ /snip/ -/$ |=([bem=beam but=path] [our=p.bem tub=(slag 1 (flop but))]) -:: -:::: ~fyr +/= kid /^ (map knot {marl marl}) + /_ /snip/ +/$ |=({bem/beam *} [our=p.bem tub=(slag 1 (flop s.bem))]) +!: +:::: ~fyr, ~tasfyn-partyv :: +~& [sum=sum kid=kid] :: Link from relative path -=+ hok=`hart`[& ~ `/org/urbit/(rsh 3 1 (scot %p our))] -=+ ref=|=(a=path (earn hok `(weld tub a) ~)) +=+ hok=`hart`[& ~ &+/org/urbit/(rsh 3 1 (scot %p our))] +=+ ref=|=(a/path (earn hok `(weld tub a) ~)) :: urb:front attrs confuse RSS validators, readers -=+ no-meta=|=(a=marl `_a`?~(a ~ ?.(?=(%meta n.g.i.a) a $(a t.a)))) +=+ no-meta=|=(a/marl ^+(a ?~(a ~ ?.(?=($meta n.g.i.a) a $(a t.a))))) :: %- crip %- poxo ;rss(version "2.0") @@ -23,7 +24,7 @@ ;link: {(ref /)} ;description: *{(no-meta tal.sum)} ;* %+ turn (~(tap by kid)) - |= [nom=@t hed=marl tal=marl] + |= {nom/@t hed/marl tal/marl} ;item ;title: *{hed} ;description: *{(no-meta tal)} diff --git a/ren/run.hoon b/ren/run.hoon index 9357b60e8..37a4c4a33 100644 --- a/ren/run.hoon +++ b/ren/run.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/run/ren :: -/? 314 +/? 310 /% /!noun/ ~& run/-.- ~ diff --git a/ren/tree/body.hoon b/ren/tree/body.hoon index d138d6c1f..2743cfe11 100644 --- a/ren/tree/body.hoon +++ b/ren/tree/body.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/body/tree/ren :: -/? 314 +/? 310 /= dat /% /tree-json/ :: default include ^- marl ;= ;script(type "text/javascript"): window.tree = {(pojo (joba %data dat))} diff --git a/ren/tree/combine.hoon b/ren/tree/combine.hoon index dcd2e8426..ae55af7f7 100644 --- a/ren/tree/combine.hoon +++ b/ren/tree/combine.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/combine/tree/ren :: -/? 314 +/? 310 /- tree-include /+ react /= mime /mime/ diff --git a/ren/tree/elem.hoon b/ren/tree/elem.hoon index 08e9a3be8..87f75ad22 100644 --- a/ren/tree/elem.hoon +++ b/ren/tree/elem.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/elem/tree/ren :: -/? 314 +/? 310 /% /, /web /|(/!elem/ /elem/) / /elem/ diff --git a/ren/tree/head.hoon b/ren/tree/head.hoon index fc2653726..a655e644d 100644 --- a/ren/tree/head.hoon +++ b/ren/tree/head.hoon @@ -2,7 +2,7 @@ :::: /hoon/head/tree/ren :: :: -/? 314 +/? 310 /= tub /$ |=({bem/beam *} (flop s.bem)) /= aut /$ %+ cork fuel :: after parsing params, diff --git a/ren/tree/include.hoon b/ren/tree/include.hoon index 2eb85ff4f..6a7d3cc95 100644 --- a/ren/tree/include.hoon +++ b/ren/tree/include.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/include/tree/ren :: -/? 314 +/? 310 /- tree-include /| /tree-combine/ /:/===/web/404:/tree-combine/ :: XX merge into tree-elem? diff --git a/ren/tree/index.hoon b/ren/tree/index.hoon index 100ac71ca..b4f51d47c 100644 --- a/ren/tree/index.hoon +++ b/ren/tree/index.hoon @@ -1,13 +1,13 @@ :: :::: /hoon/index/tree/ren :: -/? 314 +/? 310 /+ tree /, / /; (getall:tree /h1/h2/h3/h4/h5/h6) /tree-elem/ :: /pub/docs/dev/hoon/runes - /; |= [tip=marl sub=(map knot marl) ~] + /; |= {tip/marl sub/(map knot marl) $~} (zing `(list marl)`[tip (turn (~(tap by sub)) tail)]) /. /; (getall:tree %h1 ~) /tree-elem/ /_ /; (getall:tree %h1 ~) /tree-elem/ diff --git a/ren/tree/json.hoon b/ren/tree/json.hoon index 81ecdc8aa..0ff5f6d3f 100644 --- a/ren/tree/json.hoon +++ b/ren/tree/json.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/json/tree/ren :: -/? 314 +/? 310 /+ tree /= gas /$ fuel /= dat /^ tree-include /tree-include/ diff --git a/ren/urb.hoon b/ren/urb.hoon index c3c6a3ac8..727d63278 100644 --- a/ren/urb.hoon +++ b/ren/urb.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/urb/ren :: -/? 314 +/? 310 /+ urb-split :: for single-page apps /% /^ {hed/{@uvH marl} bod/{@uvH marl}} /, /web/app diff --git a/ren/urb/tree.hoon b/ren/urb/tree.hoon index 09a9a73e4..992afebdd 100644 --- a/ren/urb/tree.hoon +++ b/ren/urb/tree.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/tree/urb/ren :: -/? 314 +/? 310 /= hed /# /% /: /===/ren /tree-head/ :: XX static /= bod /# /% /tree-body/ ^- {hed/{@uvH marl} bod/{@uvH marl}} diff --git a/sur/down.hoon b/sur/down.hoon index 56ab3f5c8..2a61c9a33 100644 --- a/sur/down.hoon +++ b/sur/down.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/down/sur :: -/? 314 +/? 310 /- markdown down.markdown diff --git a/sur/kyev.hoon b/sur/kyev.hoon index a92c966e4..5b464fc5e 100644 --- a/sur/kyev.hoon +++ b/sur/kyev.hoon @@ -2,7 +2,7 @@ :: :::: /hoon/kyev/sur :: -/? 314 +/? 310 =- {p/(set ?($ctrl $shift $alt $meta)) q/$@(cord {$act speck})} ^= speck $? $ctrl $shift $alt $meta $entr $esc $caps $uncap diff --git a/sur/markdown.hoon b/sur/markdown.hoon index 61dff05eb..2ffab6499 100644 --- a/sur/markdown.hoon +++ b/sur/markdown.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/markdown/sur :: -/? 314 +/? 310 |% ++ down (list elem) ++ kids (list inline) diff --git a/sur/tree-include.hoon b/sur/tree-include.hoon index 5d2908382..d47cfe1bd 100644 --- a/sur/tree-include.hoon +++ b/sur/tree-include.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/tree-include/sur :: -/? 314 +/? 310 |- $: mime/mime body/json diff --git a/web/404.hoon b/web/404.hoon index 564f10fde..13b23830b 100644 --- a/web/404.hoon +++ b/web/404.hoon @@ -1,5 +1,5 @@ :: :::: /hoon/404/web :: -/? 314 +/? 310 ;list(data-source "default", is404 "true"); diff --git a/web/talk.hoon b/web/talk.hoon index 98f19cc8e..415a01861 100644 --- a/web/talk.hoon +++ b/web/talk.hoon @@ -1,7 +1,7 @@ :: :::: /hoon/talk/web :: -/? 314 +/? 310 ;module(nav_title "Talk", nav_no-dpad "", nav_no-sibs "", nav_subnav "talk-station") ;script@"/~~/~/at/lib/js/urb.js"; ;script@"/talk/main.js";