diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 8269bc27ae..57669e59eb 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -178,7 +178,7 @@ [1 p=term q=toga] :: deep toga [2 p=toga q=toga] :: cell toga == :: -++ trap ,_|.(**) :: makes perfect sense +++ trap |*(a=_,* ,_|?(*a)) :: makes perfect sense ++ trel |* [a=$+(* *) b=$+(* *) c=$+(* *)] :: just a triple ,[p=a q=b r=c] :: ++ tuna :: tagflow @@ -593,7 +593,7 @@ [~ u=(b u.a)] :: ++ bond :: replace - |* a=trap + |* a=(trap) |* b=(unit) ?~ b $:a u.b @@ -1842,8 +1842,7 @@ ^+ (+<+) => .(a `tang`a) ?~ a (+<+) - ~> %mean.|.(i.a) - $(a t.a) + ~_(i.a $(a t.a)) :::::::::::::::::::::::::::::::::::::::::::::::::::::: :: :::: chapter 2d, containers :::: :: :::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/mar/html.hoon b/mar/html.hoon index 3117289990..192a2ab099 100644 --- a/mar/html.hoon +++ b/mar/html.hoon @@ -14,4 +14,5 @@ -- :: ++ grab |% :: convert from ++ noun ,@t :: clam from %noun + ++ mime |=([p=mite q=octs] q.q) :: retrieve form %mime -- -- diff --git a/mar/tang.hoon b/mar/tang.hoon index cfca7610c0..9e30a6323c 100644 --- a/mar/tang.hoon +++ b/mar/tang.hoon @@ -14,6 +14,7 @@ -- ++ grab :: convert from |% - ++ noun (list tank) :: clam from %noun + ++ noun (list ^tank) :: clam from %noun + ++ tank |=(a=^tank [a]~) -- -- diff --git a/mar/xml.hoon b/mar/xml.hoon new file mode 100644 index 0000000000..580a1ec0cb --- /dev/null +++ b/mar/xml.hoon @@ -0,0 +1,18 @@ +:: +:::: /hoon/core/html/mar + :: +/? 314 + :: +:::: compute + :: +|_ htm=@t +:: +++ grow :: convert to + |% :: + ++ mime [/application/xml (taco htm)] :: to %mime + ++ hymn (need (poxa htm)) :: to %hymn + -- :: +++ grab |% :: convert from + ++ noun ,@t :: clam from %noun + ++ mime |=([p=mite q=octs] q.q) :: retrieve form %mime +-- --