From fa67d61e84b9f28339cbc342945b21915e8b3d41 Mon Sep 17 00:00:00 2001 From: Robbie Gleichman Date: Thu, 22 Dec 2016 19:51:22 -0800 Subject: [PATCH] Delete ResultIcon. --- app/Icons.hs | 3 --- app/Types.hs | 2 +- test/VisualRenderingTests.hs | 8 ++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/Icons.hs b/app/Icons.hs index e8a3198..08af04d 100644 --- a/app/Icons.hs +++ b/app/Icons.hs @@ -9,7 +9,6 @@ module Icons iconToDiagram, textBox, multilineComment, - resultIcon, guardIcon, caseIcon, defaultLineWidth, @@ -44,7 +43,6 @@ iconToDiagram :: SpecialBackend b n => Icon -> TransformableDia b n iconToDiagram (ApplyAIcon n) = identDiaFunc $ applyADia n iconToDiagram (ComposeIcon n) = identDiaFunc $ composeDia n iconToDiagram (PAppIcon n str) = pAppDia n str -iconToDiagram ResultIcon = identDiaFunc resultIcon iconToDiagram (TextBoxIcon s) = textBox s iconToDiagram (BindTextBoxIcon s) = identDiaFunc $ bindTextBox s iconToDiagram (GuardIcon n) = identDiaFunc $ guardIcon n @@ -99,7 +97,6 @@ getPortAngles icon port maybeNodeName = case icon of ApplyAIcon _ -> applyPortAngles port ComposeIcon _ -> applyPortAngles port PAppIcon _ _ -> applyPortAngles port - ResultIcon -> [] TextBoxIcon _ -> [] BindTextBoxIcon _ -> [] GuardIcon _ -> guardPortAngles port diff --git a/app/Types.hs b/app/Types.hs index d3d1c84..c64bcb8 100644 --- a/app/Types.hs +++ b/app/Types.hs @@ -36,7 +36,7 @@ import Data.Typeable(Typeable) -- The TextBoxIcon's data is the text that appears in the text box. -- The LambdaRegionIcon's data is the number of lambda ports, and the name of it's -- subdrawing. -data Icon = ResultIcon | TextBoxIcon String | GuardIcon Int +data Icon = TextBoxIcon String | GuardIcon Int | FlatLambdaIcon Int | ApplyAIcon Int | ComposeIcon Int | PAppIcon Int String | CaseIcon Int | CaseResultIcon | BindTextBoxIcon String diff --git a/test/VisualRenderingTests.hs b/test/VisualRenderingTests.hs index 6f3448d..02d7db5 100644 --- a/test/VisualRenderingTests.hs +++ b/test/VisualRenderingTests.hs @@ -23,7 +23,7 @@ drawing0 = Drawing d0Icons d0Edges where d0Icons = [(d0A, ApplyAIcon 1), (d0B, ApplyAIcon 1), - (d0Res, ResultIcon), + (d0Res, CaseResultIcon), (d0Foo, TextBoxIcon "foo"), (d0Bar, TextBoxIcon "bar") ] @@ -57,7 +57,7 @@ fact0Drawing = Drawing fact0Icons fact0Edges where (fRecurAp, ApplyAIcon 1), (fTimesAp, ApplyAIcon 2), -- (fArg, BranchIcon), - (fRes, ResultIcon) + (fRes, CaseResultIcon) ] fact0Edges = [ iconToIntPort fEq0 fEq0Ap 0, @@ -86,7 +86,7 @@ fact1Icons = (fRecurAp, ApplyAIcon 1), (fTimesAp, ApplyAIcon 2), -- (fArg, BranchIcon), - (fRes, ResultIcon) + (fRes, CaseResultIcon) ] fact1Edges :: [Edge] @@ -119,7 +119,7 @@ fact2Icons = (fRecurAp, ApplyAIcon 1), (fTimesAp, ApplyAIcon 2), --(fArg, BranchIcon), - (fRes, ResultIcon) + (fRes, CaseResultIcon) ] fact2Edges :: [Edge]