diff --git a/app/Icons.hs b/app/Icons.hs
index 2329ddc..45bd259 100644
--- a/app/Icons.hs
+++ b/app/Icons.hs
@@ -21,7 +21,7 @@ module Icons
 
 import Diagrams.Prelude hiding ((&), (#))
 -- import Diagrams.Backend.SVG(B)
-import Diagrams.TwoD.Text(Text)
+--import Diagrams.TwoD.Text(Text)
 import Data.Typeable(Typeable)
 
 import Types(Icon(..), SpecialQDiagram, SpecialBackend)
@@ -153,8 +153,6 @@ generalNestedDia textCol borderCol funText args reflect angle = centerXY $  tran
     transformedText = transformCorrectedTextBox funText textCol borderCol reflect angle
     seperation = circleRadius * 1.5
     verticalSeperation = circleRadius
-    appColor = apply0C colorScheme
-    n = length args
     trianglePortsCircle = hsep seperation $
       reflectX (fc borderCol apply0Triangle) :
       zipWith makeInnerIcon [2,3..] args ++
@@ -166,7 +164,7 @@ generalNestedDia textCol borderCol funText args reflect angle = centerXY $  tran
     finalDia = argBox <> allPorts
 
     makeInnerIcon portNum Nothing = makePort portNum <> portCircle
-    makeInnerIcon portNum (Just (iconName, icon)) = nameDiagram iconName $ iconToDiagram icon [] reflect angle
+    makeInnerIcon _ (Just (iconName, icon)) = nameDiagram iconName $ iconToDiagram icon [] reflect angle
 
 
 -- TEXT ICON --
diff --git a/app/Main.hs b/app/Main.hs
index 9d56a61..19e2204 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE NoMonomorphismRestriction, FlexibleContexts, TypeFamilies #-}
 module Main where
+import Prelude hiding (return)
 
 -- Note: (#) and (&) are hidden in all Glance source files, since they would require
 -- - an special case when translating when Glance is run on its own source code.
@@ -7,12 +8,9 @@ import Diagrams.Prelude hiding ((#), (&))
 import Diagrams.Backend.SVG.CmdLine
 import qualified Language.Haskell.Exts as Exts
 
-import Icons(flatLambda, textBox, colorScheme, ColorStyle(..), nestedApplyDia)
+import Icons(ColorStyle(..), colorScheme)
 import Rendering(renderDrawing)
-import Util(toNames, portToPort, iconToPort, iconToIcon,
-  iconToIconEnds, iconTailToPort)
-import Types(Icon(..), Drawing(..), EdgeEnd(..))
-import Translate(translateString, drawingsFromModule)
+import Translate(drawingsFromModule)
 
 
 -- TODO Now --
@@ -45,6 +43,7 @@ import Translate(translateString, drawingsFromModule)
 --  - connectPerim might be useful for this.
 -- For nested apply, cycle through different colors and line styles (eg. dashed, solid, wavy)
 -- - for each nesting level. This will help distinguish what is an argument to which funciton.
+-- Investigate arrows not being drawn
 
 -- Translate todos:
 -- Make nested version of FlatLambdaIcon
@@ -54,479 +53,6 @@ import Translate(translateString, drawingsFromModule)
 -- Eliminate BranchIcon for the identity funciton "y x = x"
 -- otherwise Guard special case
 
-(d0A, d0B, d0Res, d0Foo, d0Bar) = ("A", "B", "res", "foo", "bar")
-d0Icons = toNames
-  [(d0A, ApplyAIcon 1),
-  (d0B, ApplyAIcon 1),
-  (d0Res, ResultIcon),
-  (d0Foo, TextBoxIcon d0Foo),
-  (d0Bar, TextBoxIcon d0Bar)
-  ]
-
-d0Edges =
-  [
-  portToPort d0A 0 d0B 1,
-  iconToPort d0Foo d0B 0,
-  iconToPort d0Res d0A 1,
-  iconToPort d0Foo d0B 0,
-  iconToPort d0Bar d0B 2,
-  iconToPort d0Bar d0A 2
-  ]
-
-drawing0 = Drawing d0Icons d0Edges []
-d0Name = toName "d0"
-
-(s1Lam, s1y, s1z, s1q) = ("lam0", "y", "z", "q")
-superIcons = toNames [
-  (s1Lam, LambdaRegionIcon 3 d0Name),
-  (s1y, TextBoxIcon s1y),
-  (s1z, TextBoxIcon s1z),
-  (s1q, TextBoxIcon s1q)
-  ]
-
-superEdges =
-  [
-  portToPort (s1Lam .> d0A) 1 s1Lam 0,
-  iconToIcon s1y s1Lam,
-  iconToIcon s1z s1Lam,
-  iconToIcon s1q s1Lam,
-  iconToIcon d0A s1z,
-  iconToPort (s1Lam .> d0Foo .> d0Foo) s1Lam 0
-  ]
-
---superDrawing = Drawing [((toName "lam0"), LambdaRegionIcon 3 (toName"d0"))] superEdges [((toName "d0"), drawing0)]
-superDrawing = Drawing superIcons superEdges [(d0Name, drawing0)]
-
-super2Icons = toNames [
-  (s1Lam, LambdaRegionIcon 1 d0Name),
-  --("y", TextBoxIcon "y"),
-  ("lam1", LambdaRegionIcon 2 d0Name)
-  ]
-
-super2Edges =
-  [
-  iconToIcon s1Lam "lam1"
-  --iconToIcon "y" "lam0"
-  ]
-
-super2Drawing = Drawing super2Icons super2Edges [(d0Name, drawing0)]
-super2Name = toName "s2"
-
-super3Icons = toNames [
-  (s1Lam, LambdaRegionIcon 3 super2Name),
-  --("y", TextBoxIcon "y"),
-  ("lam1", LambdaRegionIcon 4 super2Name)
-  ]
-
-super3Edges =
-  [
---  iconToIcon "lam0" "lam1",
-  iconToIcon s1Lam "A"
-  ]
-
-super3Drawing = Drawing super3Icons super2Edges [(super2Name, super2Drawing)]
-
-(fG0, fOne, fEq0, fMinus1, fEq0Ap, fMinus1Ap, fTimes, fRecurAp, fTimesAp, fArg, fRes) =
-  ("g0", "one", "eq0", "-1", "eq0Ap", "-1Ap", "*", "recurAp", "*Ap", "arg", "res")
-
-fact0Icons = toNames
-  [
-  (fG0, GuardIcon 2),
-  (fOne, TextBoxIcon "1"),
-  (fEq0, TextBoxIcon "== 0"),
-  (fMinus1, TextBoxIcon fMinus1),
-  (fEq0Ap, ApplyAIcon 1),
-  (fMinus1Ap, ApplyAIcon 1),
-  (fTimes, TextBoxIcon fTimes),
-  (fRecurAp, ApplyAIcon 1),
-  (fTimesAp, ApplyAIcon 2),
-  (fArg, BranchIcon),
-  (fRes, ResultIcon)
-  ]
-
-fact0Edges = [
-    iconToPort fEq0 fEq0Ap 0,
-    portToPort fEq0Ap 1 fG0 3,
-    iconToPort fMinus1 fMinus1Ap 0,
-    iconToPort fTimes fTimesAp 0,
-    iconToPort fOne fG0 2,
-    portToPort fTimesAp 2 fG0 4,
-    portToPort fRecurAp 1 fTimesAp 3,
-    iconToPort fArg fEq0Ap 2,
-    iconToPort fArg fMinus1Ap 2,
-    iconToPort fArg fTimesAp 1,
-    portToPort fMinus1Ap 1 fRecurAp 2,
-    iconToPort fRes fG0 0
-  ]
-
-fact0Drawing = Drawing fact0Icons fact0Edges []
-fact0Name = toName "fac0"
-
-factLam0Icons = toNames [
-  ("lam0", LambdaRegionIcon 1 fact0Name),
-  ("fac", TextBoxIcon "factorial")
-  ]
-
-factLam0Edges = [
-  iconToPort ("lam0" .> fArg) "lam0" 0,
-  iconToPort "lam0" ("lam0" .> fRecurAp) 0,
-  iconToIcon "lam0" "fac"
-  ]
-
-factLam0Drawing = Drawing factLam0Icons factLam0Edges [(fact0Name, fact0Drawing)]
-
-fact1Icons = toNames
-  [
-  (fG0, GuardIcon 2),
-  (fOne, TextBoxIcon "1"),
-  (fEq0, TextBoxIcon "== 0"),
-  (fMinus1, TextBoxIcon fMinus1),
-  (fTimes, TextBoxIcon fTimes),
-  (fRecurAp, ApplyAIcon 1),
-  (fTimesAp, ApplyAIcon 2),
-  (fArg, BranchIcon),
-  (fRes, ResultIcon)
-  ]
-
-fact1Edges = [
-  iconToIconEnds fArg EndNone fEq0 EndAp1Arg,
-  iconTailToPort fEq0 EndAp1Result fG0 3,
-  iconToIconEnds fArg EndNone fMinus1 EndAp1Arg,
-  iconTailToPort fMinus1 EndAp1Result fRecurAp 2,
-  iconToPort fTimes fTimesAp 0,
-  iconToPort fOne fG0 2,
-  portToPort fTimesAp 1 fG0 4,
-  portToPort fRecurAp 1 fTimesAp 3,
-  iconToPort fArg fTimesAp 2,
-  iconToPort fRes fG0 0
-  ]
-
-fact1Drawing = Drawing fact1Icons fact1Edges []
-
-factLam1Drawing = Drawing factLam0Icons factLam0Edges [(fact0Name, fact1Drawing)]
-
--- fact2 is like fact1, but uses fTimesAp port 2 to distrubute the argument,
--- not fArg
-fact2Icons = toNames
-  [
-  (fG0, GuardIcon 2),
-  (fOne, TextBoxIcon "1"),
-  (fEq0, TextBoxIcon "== 0"),
-  (fMinus1, TextBoxIcon fMinus1),
-  (fTimes, TextBoxIcon fTimes),
-  (fRecurAp, ApplyAIcon 1),
-  (fTimesAp, ApplyAIcon 2),
-  --(fArg, BranchIcon),
-  (fRes, ResultIcon)
-  ]
-
-fact2Edges = [
-  --iconToIconEnds fArg EndNone fEq0 EndAp1Arg,
-  iconTailToPort fEq0 EndAp1Arg fTimesAp 2,
-  iconTailToPort fEq0 EndAp1Result fG0 3,
-  --iconToIconEnds fArg EndNone fMinus1 EndAp1Arg,
-  iconTailToPort fMinus1 EndAp1Arg fTimesAp 2,
-  iconTailToPort fMinus1 EndAp1Result fRecurAp 2,
-  iconToPort fTimes fTimesAp 0,
-  iconToPort fOne fG0 2,
-  portToPort fTimesAp 1 fG0 4,
-  portToPort fRecurAp 1 fTimesAp 3,
-  --iconToPort fArg fTimesAp 2,
-  iconToPort fRes fG0 0
-  ]
-
-fact2Drawing = Drawing fact2Icons fact2Edges []
-
-factLam2Edges = [
-  iconToPort ("lam0" .> fTimesAp .> (2 :: Int)) "lam0" 0,
-  iconToPort "lam0" ("lam0" .> fRecurAp) 0,
-  iconToIcon "lam0" "fac"
-  ]
-factLam2Drawing = Drawing factLam0Icons factLam2Edges [(fact0Name, fact2Drawing)]
-
-(arr1, arr2, arr3, arr4) = ("arr1", "arr2", "arr3", "arr4")
-
-arrowTestIcons = toNames [
-  (arr1, TextBoxIcon "1"),
-  (arr2, TextBoxIcon "2"),
-  (arr3, TextBoxIcon "3"),
-  (arr4, TextBoxIcon "4")
-  ]
-
-arrowTestEdges = [
-  iconToIconEnds arr1 EndAp1Arg arr2 EndAp1Result,
-  iconToIconEnds arr1 EndAp1Result arr3 EndAp1Arg,
-  iconToIconEnds arr2 EndAp1Result arr3 EndAp1Result,
-  iconToIconEnds arr1 EndAp1Arg arr4 EndAp1Arg
-  ]
-
-arrowTestDrawing = Drawing arrowTestIcons arrowTestEdges []
-
-nestedTestIcons = toNames [
-  ("n1", NestedApply "N1" args),
-  ("t1", TextBoxIcon "T1"),
-  ("t2", TextBoxIcon "t2")
-  ]
-  where
-    innerArgs = [Just (toName "t", TextBoxIcon "t"), Nothing, Just (toName "n2", NestedApply "n2" [Nothing])]
-    args = [
-      Nothing, Just (toName "foo", TextBoxIcon "3"),
-      Just (toName "in", NestedApply "inner" innerArgs)
-      ]
-
-nestedTestEdges = [
-  iconToPort "t1" "n1" 2,
-  --iconToPort "t1" "in" 1,
-  --iconToPort "t2" ("n1" .> "in") 3,
-  iconToPort "t2" ("n1" .> "in" .> "n2") 2
-  ]
-
-nestedTextDrawing = Drawing nestedTestIcons nestedTestEdges []
-
-main1 :: IO ()
-main1 = do
-  placedNodes <- renderDrawing nestedTextDrawing
-  mainWith (bgFrame 1 (backgroundC colorScheme) placedNodes :: Diagram B)
-
-main2 = mainWith ((bgFrame 0.1 black $ dia False 0)  :: Diagram B)
-  where
-    args = [Nothing, Just (toName "foo", TextBoxIcon "3"), Just (toName "in", NestedApply "inner" [Just (toName "t", TextBoxIcon "t")])]
-    dia = nestedApplyDia "Hello world" args
-
-main3 :: IO ()
-main3 = do
-  renderedDiagrams <- traverse renderDrawing allDrawings
-  let vCattedDrawings = vsep 0.5 renderedDiagrams
-  mainWith (bgFrame 1 (backgroundC colorScheme) vCattedDrawings :: Diagram B)
-  where
-    allDrawings = [
-      drawing0,
-      superDrawing,
-      super2Drawing,
-      super3Drawing,
-      fact0Drawing,
-      factLam0Drawing,
-      fact1Drawing,
-      factLam1Drawing,
-      fact2Drawing,
-      factLam2Drawing,
-      arrowTestDrawing
-      ]
-
-nestedTests = [
-  "y = f x",
-  "y = f (g x)",
-  "y = let x = 1 in f x",
-  "y = let x = 1 in f (g x)",
-  "y = f []",
-  "y = f [1]",
-  "y = f [1,2]",
-  "y = f [g 3, h 5]"
-  ]
-
-dollarTests = [
-  "y = f $ g 3",
-  " y = f 1 $ g 2 "
-  ]
-
-specialTests = [
-  "lookupTail EndAp1Arg = (arrowTail .~ dart')",
-  "y = x .~ y",
-  "initialIdState = IDState 0",
-  "y = f x",
-  "yyy = fff xxx",
-  "yyyyy = fffff xxxxx"
-  ]
-
-negateTests = [
-  "y = -1",
-  "y = -1/2",
-  "y = -x"
-  ]
-
-doTests = [
-  "y = do {x1}",
-  "y = do {x1; x2}",
-  "y = do {x1; x2; x3}",
-  "y = do {x1 <- m1; x2}",
-  "y = do {(x1, x2) <- m1; x1 + x2}",
-  "y = do {x1 <- m1; x2 <- f x1; g x2}",
-  "y = do {let {x = 1}; x2 <- x; f x2}"
-  ]
-
-enumTests = [
-  "y = [1..]",
-  "y = [1,2..]",
-  "y = [0..10]",
-  "y = [0,1..10]"
-  ]
-
-tupleTests = [
-  "y = ()",
-  "(x, y) = (1,2)",
-  "(x, y, z) = (1,2,3)"
-  ]
-
-listTests = [
-  "y = []",
-  "y = [1]",
-  "y = [1,2]",
-  "y = [1,2,3]",
-  "[x] = 1",
-  "[x, y] = 2",
-  "[x, y, z] = 3"
-  -- TODO: Add this test "(x:y) = 3"
-  ]
-
-caseTests = [
-  "y = case x of {0 -> 1; 2 -> 3}",
-  "y = case f x of {0 -> 1; 2 -> 3}",
-  "y = case x of {Foo a -> a}",
-  "y = case x of {Foo a -> f a; Bar a -> f a}",
-  "y = case x of {F x -> x; G x -> x}",
-  "y = case x of {F -> 0; G -> 1}",
-  "z = case x of {0 -> 1; y -> y}"
-  ]
-
-guardTests = [
-  "y x\n\
-  \  | x == 0 = 1",
-  "y x\n\
-  \  | x == 0 = 1\n\
-  \  | otherwise = 2"
-  ]
-
-patternTests = [
-  "Foo _ x = 3",
-  "y (F x) = x",
-  "y = (\\(F x) -> x)",
-  "y = let {g = 3; F x y = h g} in x y",
-  "y = let {F x y = 3} in x y",
-  "y = let {g = 3; F x y = g} in x y",
-  "y = let F x y = g in x y",
-  "F x = g x",
-  "Foo (Bar x) (Baz y) = f 1 2 x y",
-  "Foo x y = f 1 y x",
-  "t@(x,y) = (x,y)",
-  "y = let {t@(_,_) = (3,4)} in t + 3",
-  "y = let {(x, y) = (1,2)} in x + y",
-  -- TODO: Fix so that lines between patterns are Pattern Color.
-  "y = let {(x, y) = (1,2); (z, w) = x; (m, g) = y} in foo x y z w m g",
-  "(x:y) = 2"
-  ]
-
-lambdaTests = [
-  "y = (\\x -> (\\x -> (\\x -> x) x) x)",
-  "y = (\\x -> (\\x -> (\\x -> x)))",
-  "y = (\\y -> y)",
-  "y = (\\x1 -> (\\x2 -> (\\x3 -> x1 x2 x3)))",
-  "y x = (\\z -> x)",
-  "y = (\\x -> (\\z -> x))",
-  "y x = x",
-  "y x = y x",
-  "y x = g y y",
-  "y f x = f x",
-  "y x = x y",
-  "y x1 x2 = f x1 x3 x2",
-  "y x1 x2 = f x1 x2",
-  "y x = f x1 x2",
-  "{y 0 = 1; y 1= 0}",
-  "y (-1) = 2",
-  "y 1 = 0",
-  "{y (F x) = x; y (G x) = x}",
-  "{y (F x) z = x z; y (G x) z = z x}",
-  "y x = z 3 where z = f x y",
-  "y x = z where z = f x y"
-  ]
-
-letTests = [
-  "y = let {z = (\\x -> y x)} in z",
-  "y = let {z x = y x} in z ",
-  "y = x where x = f 3 y",
-  "y x1 = let {x2 = x1; x3 = x2; x4 = f x3} in x4",
-  "y x1 = let x2 = f x1 in x2 x1",
-  "y x = let x = 3 in x",
-  "y = let {a= 1; x = let {a = 27; x = f a 2} in x} in x",
-  "y = let {a = b; b = a; d = f a} in d",
-  "y = let {a = b; b = a} in a",
-  "y = let x = x in x",
-  "y = let {fibs = cons 0 (cons 1 (zipWith (+) fibs (tail fibs)))} in fibs",
-  "fibs = cons 0 (cons 1 (zipWith (+) fibs (tail fibs)))",
-  "y = let x = f x in x",
-  "y = f y",
-  "y = let {a = f b; b = g a} in b",
-  "y = let {a = 48; b = a + 3} in b",
-  "y = let {b = a; a = 84} in f b",
-  "y = let {x = 1} in f x",
-  "y = let z = 2 in z",
-  "y = let {z = 3; z2 = z} in z2",
-  "y x = let z = x in z"
-  ]
-
-operatorTests = [
-  "y = 1 + 2",
-  "y = map (1 ++) 3",
-  "y = map (++ 1) 3"
-  ]
-
-otherTests = [
-  "y = f 1 'c' 2.3 \"foobar\"",
-  "fact x = if (x == 0) then 1 else (fact x (x - 1))",
-  "fact x = if ((==) 0 x) then 1 else (fact x ((-) x 1))",
-  "y x = if x then (if z then q else x) else w",
-  "y x1 x2 x3 = if f x1 then g x2 else h x3",
-  "y x1 x2 x3 = if x1 then x2 else x3",
-  "y = if b then x else n",
-  "y2 = f x1 x2 x3 x4",
-  "y = x",
-  "y = f x",
-  "y = f (g x)",
-  "y = f (g x1 x2) x3",
-  "y = (f x1 x2) (g x1 x2)",
-  "y = Foo.bar"
-  ]
-
-testDecls = mconcat [
-  --dollarTests
-  nestedTests
-  -- ,negateTests
-  -- ,doTests
-  -- ,enumTests
-  -- ,caseTests
-  -- ,lambdaTests
-  -- ,guardTests
-  -- ,patternTests
-  -- ,specialTests
-  -- ,tupleTests
-  -- ,listTests
-  -- ,letTests
-  -- ,operatorTests
-  -- ,otherTests
-  ]
-
-translateStringToDrawing :: String -> IO (Diagram B)
-translateStringToDrawing s = do
-  let
-    (drawing, decl) = translateString s
-  print decl
-  putStr "\n"
-  print drawing
-  putStr "\n\n"
-  renderDrawing drawing
-
-main4 :: IO ()
-main4 = do
-  drawings <- traverse translateStringToDrawing testDecls
-  let
-    textDrawings = fmap (\t -> alignL $ textBox t False 0) testDecls
-    vCattedDrawings = vsep 1 $ zipWith (===) (fmap alignL drawings) textDrawings
-  mainWith (bgFrame 1 (backgroundC colorScheme) vCattedDrawings :: Diagram B)
-
-testFiles = [
-  "./app/Main.hs",
-  "./test/test_translate.hs"
-  ]
-
 main5 :: IO ()
 main5 = do
   parseResult <- Exts.parseFileWithExts [Exts.EnableExtension Exts.MultiParamTypeClasses, Exts.EnableExtension Exts.FlexibleContexts]
diff --git a/app/Translate.hs b/app/Translate.hs
index b30de15..92bbcd8 100644
--- a/app/Translate.hs
+++ b/app/Translate.hs
@@ -22,7 +22,7 @@ import Types(Drawing(..), NameAndPort(..), IDState,
   initialIdState, Edge)
 import Util(toNames, makeSimpleEdge, nameAndPort, justName, mapFst)
 import Icons(Icon(..))
-import TranslateCore(Reference, IconGraph(..), EvalContext, GraphAndRef,
+import TranslateCore(Reference, IconGraph(..), Sink, EvalContext, GraphAndRef,
   iconGraphFromIcons, iconGraphFromIconsEdges, getUniqueName, combineExpressions,
   edgesForRefPortList, iconGraphToDrawing, makeApplyGraph,
   namesInPattern, lookupReference, deleteBindings, makeEdges,
@@ -108,11 +108,12 @@ qOpToString :: QOp -> String
 qOpToString (QVarOp n) = qNameToString n
 qOpToString (QConOp n) = qNameToString n
 
---decideIfNested :: ((IconGraph, r), p) -> (Maybe ((IconGraph, r), p), Maybe (DIA.Name, Icon))
-decideIfNested valAndPort@((IconGraph [nameAndIcon] [] [] sinks bindings, _), _) = (Nothing, Just nameAndIcon, sinks, bindings)
+decideIfNested :: ((IconGraph, t1), t) ->
+  (Maybe ((IconGraph, t1), t), Maybe (DIA.Name, Icon), [Sink], [(String, Reference)])
+decideIfNested ((IconGraph [nameAndIcon] [] [] sinks bindings, _), _) = (Nothing, Just nameAndIcon, sinks, bindings)
 decideIfNested valAndPort = (Just valAndPort, Nothing, [], [])
 
-makeTextApplyGraph :: Bool -> DIA.Name -> String -> [(IconGraph, Reference)] -> Int -> (IconGraph, NameAndPort)
+makeTextApplyGraph :: Bool -> DIA.Name -> String -> [GraphAndRef] -> Int -> (IconGraph, NameAndPort)
 makeTextApplyGraph inPattern applyIconName funStr argVals numArgs = result
   where
     result = nestedApplyResult
diff --git a/notes.txt b/notes.txt
index e9a03fe..6c31be4 100644
--- a/notes.txt
+++ b/notes.txt
@@ -8,3 +8,10 @@ or if that does not work
 stack build  --exec "glance-exe -o output.svg -w 500"
 
 View circle.svg with svg-preview plug-in.
+
+To use ghci with the test file:
+stack ghci glance:test:glance-test
+
+For all warnings (some warnings duplicated):
+stack clean
+stack build --test --no-run-tests --ghc-options -Wall
diff --git a/test/AllTests.hs b/test/AllTests.hs
index b2d6c31..9a542fa 100644
--- a/test/AllTests.hs
+++ b/test/AllTests.hs
@@ -1,10 +1,264 @@
+import Prelude hiding (return)
 import Diagrams.Prelude hiding ((#), (&))
 import Diagrams.Backend.SVG.CmdLine
 import Diagrams.Backend.SVG (renderSVG)
 
-import Rendering(renderDrawing)
-import Translate(translateString)
 import Icons(textBox, colorScheme, ColorStyle(..))
+import Rendering(renderDrawing)
+import Util(toNames, portToPort, iconToPort, iconToIcon,
+  iconToIconEnds, iconTailToPort)
+import Types(Icon(..), Drawing(..), EdgeEnd(..))
+import Translate(translateString)
+
+(d0A, d0B, d0Res, d0Foo, d0Bar) = ("A", "B", "res", "foo", "bar")
+d0Icons = toNames
+  [(d0A, ApplyAIcon 1),
+  (d0B, ApplyAIcon 1),
+  (d0Res, ResultIcon),
+  (d0Foo, TextBoxIcon d0Foo),
+  (d0Bar, TextBoxIcon d0Bar)
+  ]
+
+d0Edges =
+  [
+  portToPort d0A 0 d0B 1,
+  iconToPort d0Foo d0B 0,
+  iconToPort d0Res d0A 1,
+  iconToPort d0Foo d0B 0,
+  iconToPort d0Bar d0B 2,
+  iconToPort d0Bar d0A 2
+  ]
+
+drawing0 = Drawing d0Icons d0Edges []
+d0Name = toName "d0"
+
+(s1Lam, s1y, s1z, s1q) = ("lam0", "y", "z", "q")
+superIcons = toNames [
+  (s1Lam, LambdaRegionIcon 3 d0Name),
+  (s1y, TextBoxIcon s1y),
+  (s1z, TextBoxIcon s1z),
+  (s1q, TextBoxIcon s1q)
+  ]
+
+superEdges =
+  [
+  portToPort (s1Lam .> d0A) 1 s1Lam 0,
+  iconToIcon s1y s1Lam,
+  iconToIcon s1z s1Lam,
+  iconToIcon s1q s1Lam,
+  iconToIcon d0A s1z,
+  iconToPort (s1Lam .> d0Foo .> d0Foo) s1Lam 0
+  ]
+
+--superDrawing = Drawing [((toName "lam0"), LambdaRegionIcon 3 (toName"d0"))] superEdges [((toName "d0"), drawing0)]
+superDrawing = Drawing superIcons superEdges [(d0Name, drawing0)]
+
+super2Icons = toNames [
+  (s1Lam, LambdaRegionIcon 1 d0Name),
+  --("y", TextBoxIcon "y"),
+  ("lam1", LambdaRegionIcon 2 d0Name)
+  ]
+
+super2Edges =
+  [
+  iconToIcon s1Lam "lam1"
+  --iconToIcon "y" "lam0"
+  ]
+
+super2Drawing = Drawing super2Icons super2Edges [(d0Name, drawing0)]
+super2Name = toName "s2"
+
+super3Icons = toNames [
+  (s1Lam, LambdaRegionIcon 3 super2Name),
+  --("y", TextBoxIcon "y"),
+  ("lam1", LambdaRegionIcon 4 super2Name)
+  ]
+
+super3Edges =
+  [
+--  iconToIcon "lam0" "lam1",
+  iconToIcon s1Lam "A"
+  ]
+
+super3Drawing = Drawing super3Icons super2Edges [(super2Name, super2Drawing)]
+
+(fG0, fOne, fEq0, fMinus1, fEq0Ap, fMinus1Ap, fTimes, fRecurAp, fTimesAp, fArg, fRes) =
+  ("g0", "one", "eq0", "-1", "eq0Ap", "-1Ap", "*", "recurAp", "*Ap", "arg", "res")
+
+fact0Icons = toNames
+  [
+  (fG0, GuardIcon 2),
+  (fOne, TextBoxIcon "1"),
+  (fEq0, TextBoxIcon "== 0"),
+  (fMinus1, TextBoxIcon fMinus1),
+  (fEq0Ap, ApplyAIcon 1),
+  (fMinus1Ap, ApplyAIcon 1),
+  (fTimes, TextBoxIcon fTimes),
+  (fRecurAp, ApplyAIcon 1),
+  (fTimesAp, ApplyAIcon 2),
+  (fArg, BranchIcon),
+  (fRes, ResultIcon)
+  ]
+
+fact0Edges = [
+    iconToPort fEq0 fEq0Ap 0,
+    portToPort fEq0Ap 1 fG0 3,
+    iconToPort fMinus1 fMinus1Ap 0,
+    iconToPort fTimes fTimesAp 0,
+    iconToPort fOne fG0 2,
+    portToPort fTimesAp 2 fG0 4,
+    portToPort fRecurAp 1 fTimesAp 3,
+    iconToPort fArg fEq0Ap 2,
+    iconToPort fArg fMinus1Ap 2,
+    iconToPort fArg fTimesAp 1,
+    portToPort fMinus1Ap 1 fRecurAp 2,
+    iconToPort fRes fG0 0
+  ]
+
+fact0Drawing = Drawing fact0Icons fact0Edges []
+fact0Name = toName "fac0"
+
+factLam0Icons = toNames [
+  ("lam0", LambdaRegionIcon 1 fact0Name),
+  ("fac", TextBoxIcon "factorial")
+  ]
+
+factLam0Edges = [
+  iconToPort ("lam0" .> fArg) "lam0" 0,
+  iconToPort "lam0" ("lam0" .> fRecurAp) 0,
+  iconToIcon "lam0" "fac"
+  ]
+
+factLam0Drawing = Drawing factLam0Icons factLam0Edges [(fact0Name, fact0Drawing)]
+
+fact1Icons = toNames
+  [
+  (fG0, GuardIcon 2),
+  (fOne, TextBoxIcon "1"),
+  (fEq0, TextBoxIcon "== 0"),
+  (fMinus1, TextBoxIcon fMinus1),
+  (fTimes, TextBoxIcon fTimes),
+  (fRecurAp, ApplyAIcon 1),
+  (fTimesAp, ApplyAIcon 2),
+  (fArg, BranchIcon),
+  (fRes, ResultIcon)
+  ]
+
+fact1Edges = [
+  iconToIconEnds fArg EndNone fEq0 EndAp1Arg,
+  iconTailToPort fEq0 EndAp1Result fG0 3,
+  iconToIconEnds fArg EndNone fMinus1 EndAp1Arg,
+  iconTailToPort fMinus1 EndAp1Result fRecurAp 2,
+  iconToPort fTimes fTimesAp 0,
+  iconToPort fOne fG0 2,
+  portToPort fTimesAp 1 fG0 4,
+  portToPort fRecurAp 1 fTimesAp 3,
+  iconToPort fArg fTimesAp 2,
+  iconToPort fRes fG0 0
+  ]
+
+fact1Drawing = Drawing fact1Icons fact1Edges []
+
+factLam1Drawing = Drawing factLam0Icons factLam0Edges [(fact0Name, fact1Drawing)]
+
+-- fact2 is like fact1, but uses fTimesAp port 2 to distrubute the argument,
+-- not fArg
+fact2Icons = toNames
+  [
+  (fG0, GuardIcon 2),
+  (fOne, TextBoxIcon "1"),
+  (fEq0, TextBoxIcon "== 0"),
+  (fMinus1, TextBoxIcon fMinus1),
+  (fTimes, TextBoxIcon fTimes),
+  (fRecurAp, ApplyAIcon 1),
+  (fTimesAp, ApplyAIcon 2),
+  --(fArg, BranchIcon),
+  (fRes, ResultIcon)
+  ]
+
+fact2Edges = [
+  --iconToIconEnds fArg EndNone fEq0 EndAp1Arg,
+  iconTailToPort fEq0 EndAp1Arg fTimesAp 2,
+  iconTailToPort fEq0 EndAp1Result fG0 3,
+  --iconToIconEnds fArg EndNone fMinus1 EndAp1Arg,
+  iconTailToPort fMinus1 EndAp1Arg fTimesAp 2,
+  iconTailToPort fMinus1 EndAp1Result fRecurAp 2,
+  iconToPort fTimes fTimesAp 0,
+  iconToPort fOne fG0 2,
+  portToPort fTimesAp 1 fG0 4,
+  portToPort fRecurAp 1 fTimesAp 3,
+  --iconToPort fArg fTimesAp 2,
+  iconToPort fRes fG0 0
+  ]
+
+fact2Drawing = Drawing fact2Icons fact2Edges []
+
+factLam2Edges = [
+  iconToPort ("lam0" .> fTimesAp .> (2 :: Int)) "lam0" 0,
+  iconToPort "lam0" ("lam0" .> fRecurAp) 0,
+  iconToIcon "lam0" "fac"
+  ]
+factLam2Drawing = Drawing factLam0Icons factLam2Edges [(fact0Name, fact2Drawing)]
+
+(arr1, arr2, arr3, arr4) = ("arr1", "arr2", "arr3", "arr4")
+
+arrowTestIcons = toNames [
+  (arr1, TextBoxIcon "1"),
+  (arr2, TextBoxIcon "2"),
+  (arr3, TextBoxIcon "3"),
+  (arr4, TextBoxIcon "4")
+  ]
+
+arrowTestEdges = [
+  iconToIconEnds arr1 EndAp1Arg arr2 EndAp1Result,
+  iconToIconEnds arr1 EndAp1Result arr3 EndAp1Arg,
+  iconToIconEnds arr2 EndAp1Result arr3 EndAp1Result,
+  iconToIconEnds arr1 EndAp1Arg arr4 EndAp1Arg
+  ]
+
+arrowTestDrawing = Drawing arrowTestIcons arrowTestEdges []
+
+nestedTestIcons = toNames [
+  ("n1", NestedApply "N1" args),
+  ("t1", TextBoxIcon "T1"),
+  ("t2", TextBoxIcon "t2")
+  ]
+  where
+    innerArgs = [Just (toName "t", TextBoxIcon "t"), Nothing, Just (toName "n2", NestedApply "n2" [Nothing])]
+    args = [
+      Nothing, Just (toName "foo", TextBoxIcon "3"),
+      Just (toName "in", NestedApply "inner" innerArgs)
+      ]
+
+nestedTestEdges = [
+  iconToPort "t1" "n1" 2,
+  --iconToPort "t1" "in" 1,
+  --iconToPort "t2" ("n1" .> "in") 3,
+  iconToPort "t2" ("n1" .> "in" .> "n2") 2
+  ]
+
+nestedTextDrawing = Drawing nestedTestIcons nestedTestEdges []
+
+renderTests :: IO (Diagram B)
+renderTests = do
+  renderedDiagrams <- traverse renderDrawing allDrawings
+  let vCattedDrawings = vsep 0.5 renderedDiagrams
+  pure vCattedDrawings
+  where
+    allDrawings = [
+      drawing0,
+      superDrawing,
+      super2Drawing,
+      super3Drawing,
+      fact0Drawing,
+      factLam0Drawing,
+      fact1Drawing,
+      factLam1Drawing,
+      fact2Drawing,
+      factLam2Drawing,
+      arrowTestDrawing,
+      nestedTextDrawing
+      ]
 
 nestedTests = [
   "y = f x",
@@ -208,14 +462,26 @@ translateStringToDrawing s = do
   putStr "\n\n"
   renderDrawing drawing
 
-renderAllTests :: IO ()
-renderAllTests = do
+translateTests :: IO (Diagram B)
+translateTests = do
   drawings <- traverse translateStringToDrawing testDecls
   let
     textDrawings = fmap (\t -> alignL $ textBox t False 0) testDecls
     vCattedDrawings = vsep 1 $ zipWith (===) (fmap alignL drawings) textDrawings
-  --mainWith (bgFrame 1 (backgroundC colorScheme) vCattedDrawings :: Diagram B)
-  renderSVG "test/test-output/all-tests.svg" (mkWidth 700) (bgFrame 1 (backgroundC colorScheme) vCattedDrawings :: Diagram B)
+  pure vCattedDrawings
+
+drawingsAndNames :: [(String, IO (Diagram B))]
+drawingsAndNames = [
+  ("translate-tests", translateTests),
+  ("render-tests", renderTests)
+  ]
+
+renderDrawings :: [(String, IO (Diagram B))] -> IO ()
+renderDrawings = mapM_ saveDrawing where
+  saveDrawing (name, drawingMaker) = do
+    dia <- drawingMaker
+    -- TODO Replace string concatenation with proper path manipulation functions.
+    renderSVG ("test/test-output/" ++ name ++ ".svg") (mkWidth 700) (bgFrame 1 (backgroundC colorScheme) dia)
 
 main :: IO ()
-main = renderAllTests
+main = renderDrawings drawingsAndNames