From 0c473d20836af110188d5ad2d5625daa6b81abb6 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 6 Jan 2016 12:52:30 -0800 Subject: [PATCH] fix examples, remove mdy, react marks --- mar/down.hoon | 1 + mar/md.hoon | 1 + mar/mdy.hoon | 22 ---------------------- mar/paste-new.hoon | 19 +++++-------------- mar/react-snip.hoon | 31 ------------------------------- mar/react.hoon | 23 ----------------------- pub/match.hoon | 2 +- pub/paste.hoon | 2 +- pub/talk/src/js/.main.js | 0 pub/unparse.hoon | 6 +++--- 10 files changed, 12 insertions(+), 95 deletions(-) delete mode 100644 mar/mdy.hoon delete mode 100644 mar/react-snip.hoon delete mode 100644 mar/react.hoon delete mode 100644 pub/talk/src/js/.main.js diff --git a/mar/down.hoon b/mar/down.hoon index 6bac4cb0c..9c561ee4b 100644 --- a/mar/down.hoon +++ b/mar/down.hoon @@ -20,6 +20,7 @@ :: ++ grow :: convert into |% + ++ front ?~(don ~ ?:(?=(%meta -.i.don) p.i.don front(don t.don))) ++ hymn :: convert to %hymn ;html ;head:title:"Untitled" diff --git a/mar/md.hoon b/mar/md.hoon index fa2e3d9b0..f3930336d 100644 --- a/mar/md.hoon +++ b/mar/md.hoon @@ -20,4 +20,5 @@ (end 3 (dec (met 3 -)) -) -- ++ grad %txt +++ garb %down -- diff --git a/mar/mdy.hoon b/mar/mdy.hoon deleted file mode 100644 index e3104bd11..000000000 --- a/mar/mdy.hoon +++ /dev/null @@ -1,22 +0,0 @@ -:: -:::: /hoon/core/mdy/pro - :: -/? 314 -/+ frontmatter -!: -|_ [atr=(map cord cord) mud=@t] -++ grow - |% - ++ front atr - ++ mime [/text/x-markdown (taco md)] - ++ md (role txt) - ++ txt (print:frontmatter atr (lore mud)) - -- -++ grab - |% - ++ noun ,[(map cord cord) @t] - ++ md (cork lore txt) - ++ txt parse:frontmatter - -- -++ grad %txt --- diff --git a/mar/paste-new.hoon b/mar/paste-new.hoon index e718c673f..6f57c1c71 100644 --- a/mar/paste-new.hoon +++ b/mar/paste-new.hoon @@ -7,17 +7,8 @@ :: |_ jon=json :: -++ grow :: convert to - |% - ++ mime [/text/'paste-new+json' (taco txt)] :: convert to %mime - ++ txt (crip (pojo jon)) - -- -++ grab - |% :: convert from - :: ++ mime |=([p=mite q=octs] (fall (rush (,@t q.q) apex:poja) *json)) - ++ noun json :: clam from %noun - ++ numb jone - ++ time jode - -- -++ grad %mime --- +++ grow |% ++ mime :: convert to %mime + [/text/'paste-new+json' (tact (pojo jon))] + -- +++ grab |% ++ noun json :: clam from %noun +-- -- diff --git a/mar/react-snip.hoon b/mar/react-snip.hoon deleted file mode 100644 index 185263c7e..000000000 --- a/mar/react-snip.hoon +++ /dev/null @@ -1,31 +0,0 @@ -:: -:::: /hoon/core/react-snip/mar - :: -/? 314 -/+ react -!: -:::: - :: -[. react] -|_ [hed=marl tal=marl] -:: -++ grow :: convert to - |% - ++ mime [/application/json (tact tape)] - ++ tape (pojo react-snips-json) - ++ elem ;div:(h1:"*{hed}" div:"*{tal}") - ++ react-snip-js (crip (react-to-tape elem)) - ++ react-snips-json - ::?> ?=([[%div ~] [[%h1 ~] *] [[%div ~] *] ~]] own) :: xx mystery fish-loop - %^ jobe - head/react-head-json - body/react-snip-json - ~ - :: - ++ react-head-json (react-to-json ;h1:"*{hed}") - ++ react-snip-json (react-to-json ;div:"*{tal}") - -- -++ grab |% :: convert from - ++ noun manx :: clam from %noun - ++ snip |=(a=[marl marl] a) --- -- diff --git a/mar/react.hoon b/mar/react.hoon deleted file mode 100644 index adcb4f94c..000000000 --- a/mar/react.hoon +++ /dev/null @@ -1,23 +0,0 @@ -:: -:::: /hoon/core/react/mar - :: -/? 314 -/+ react -!: -:::: - :: -[. react] -|_ own=manx -:: -++ grow :: convert to - |% - ++ tape (pojo react-json) - ++ react-js (crip (react-to-tape own)) -:: ++ js react-js :: convert to %js - ++ react-json (react-to-json own) - ++ mime [/application/json (tact tape)] :: convert to %mime - -- -++ grab |% :: convert from - ++ noun manx :: clam from %noun - ++ elem |= a=manx a --- -- diff --git a/pub/match.hoon b/pub/match.hoon index 270c9ef49..3e17a55be 100644 --- a/pub/match.hoon +++ b/pub/match.hoon @@ -3,7 +3,7 @@ :::: /hook/hymn/match :: /= gas /$ fuel :: get request info -/= src /: /%/ /hook/ :: current source file +/= src /: /%/ /hoon/ :: current source file :: :::: ~sondel-forsut :: diff --git a/pub/paste.hoon b/pub/paste.hoon index 4ba84bbfb..8bf08d18c 100644 --- a/pub/paste.hoon +++ b/pub/paste.hoon @@ -1,4 +1,4 @@ -/= all /; flop /^ (list (pair time ,*)) /: /%%/ /& /mime/ +/= all /; flop /^ (list (pair time ,*)) /& /mime/ ;html ;head:title:"Pastebin" ;body diff --git a/pub/talk/src/js/.main.js b/pub/talk/src/js/.main.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/pub/unparse.hoon b/pub/unparse.hoon index 0d7472def..bcf1148c0 100644 --- a/pub/unparse.hoon +++ b/pub/unparse.hoon @@ -3,12 +3,12 @@ :::: /hook/hymn/unparse/pub :: /= gas /$ fuel -/= src /: /%%/mear /hoon/ -/= src2 /: /%/ /hook/ +/= src /: /%/mear /hoon/ +/= src2 /: /%/ /hoon/ :: :::: ~sondel-forsut :: -// /%%/mear +// /%/mear !: :::: ::