From ce9f1eb3dac411d89ae24ebda2a261509258e610 Mon Sep 17 00:00:00 2001 From: Ted Blackman Date: Tue, 26 Jan 2021 20:43:23 -0500 Subject: [PATCH] clay: fix +grow in mark casting --- pkg/arvo/mar/html.hoon | 1 - pkg/arvo/sys/vane/clay.hoon | 2 +- pkg/arvo/tests/sys/vane/clay.hoon | 30 ++++++++++++++++++++++-------- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/pkg/arvo/mar/html.hoon b/pkg/arvo/mar/html.hoon index 4e161fae1..203d75f61 100644 --- a/pkg/arvo/mar/html.hoon +++ b/pkg/arvo/mar/html.hoon @@ -6,7 +6,6 @@ :::: compute :: =, html -^| |_ htm=@t ++ grow :: convert to ^? diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 2511940ba..bebcb7e0a 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -685,7 +685,7 @@ :_ nub %+ slap (with-faces cor+old ~) ^- hoon - :+ %brcl tsgr/[limb/%cor limb/%bunt] + :+ %brcl !,(*hoon v=+<.cor) :+ %tsgl limb/b !,(*hoon ~(grow cor v)) :: try direct +grab diff --git a/pkg/arvo/tests/sys/vane/clay.hoon b/pkg/arvo/tests/sys/vane/clay.hoon index 5b5b4a751..6d5289cec 100644 --- a/pkg/arvo/tests/sys/vane/clay.hoon +++ b/pkg/arvo/tests/sys/vane/clay.hoon @@ -5,6 +5,7 @@ /* lib-strand %hoon /lib/strand/hoon /* sur-spider %hoon /sur/spider/hoon /* mar-mime %hoon /mar/mime/hoon +/* mar-html %hoon /mar/html/hoon :: !: =, format @@ -91,17 +92,10 @@ |. (parse-pile:(ford):fusion /sur/foo/hoon "[") :: ++ test-mar-mime ^- tang - =/ =ankh:clay - :- fil=~ - %- ~(gas by *(map @tas ankh:clay)) - :~ :+ %mar fil=~ - %- ~(gas by *(map @tas ankh:clay)) - :~ :+ %hoon fil=`[*lobe:clay hoon+!>(mar-mime)] dir=~ - == == =/ ford %: ford:fusion bud - ankh + *ankh:clay deletes=~ changes=(my [/mar/mime/hoon &+hoon+mar-mime]~) file-store=~ @@ -118,6 +112,26 @@ !> dez:(~(got by vases.cache.nub) /mar/mime/hoon) == :: +++ test-cast-html-mime ^- tang + =/ changes + %- my + :~ [/mar/mime/hoon &+hoon+mar-mime] + [/mar/html/hoon &+hoon+mar-html] + == + =/ ford + %: ford:fusion + bud + *ankh:clay + deletes=~ + changes + file-store=~ + *ford-cache:fusion + == + =/ [res=vase nub=state:ford:fusion] (get-cast:ford %html %mime) + %+ expect-eq + (slam res !>('')) + !> `mime`[/text/html 13 ''] +:: ++ test-gen-hello ^- tang =/ =ankh:clay :- fil=~