git.iko.soy/elk
on master help sign in
Stop deriving Show for Type stuff
96dfd88Evan Czaplicki
src/Type/Fragment.hs+1−1
compare with master
unifiedsplit
@@ -10,7 +10,7 @@ data Fragment = Fragment
10 { typeEnv :: Map.Map String Type
10 { typeEnv :: Map.Map String Type
11 , vars :: [Variable]
11 , vars :: [Variable]
12 , typeConstraint :: TypeConstraint
12 , typeConstraint :: TypeConstraint
13− } deriving Show
13+ }
14
14
15emptyFragment = Fragment Map.empty [] (noneNoDocs CTrue)
15emptyFragment = Fragment Map.empty [] (noneNoDocs CTrue)
16
16
src/Type/State.hs+1−1
@@ -19,7 +19,7 @@ import Type.Type
19data Pool = Pool
19data Pool = Pool
20 { maxRank :: Int
20 { maxRank :: Int
21 , inhabitants :: [Variable]
21 , inhabitants :: [Variable]
22− } deriving Show
22+ }
23
23
24emptyPool = Pool { maxRank = outermostRank, inhabitants = [] }
24emptyPool = Pool { maxRank = outermostRank, inhabitants = [] }
25
25
src/Type/Type.hs+2−12
@@ -23,13 +23,11 @@ data Term1 a
23 | Var1 a
23 | Var1 a
24 | EmptyRecord1
24 | EmptyRecord1
25 | Record1 (Map.Map String [a]) a
25 | Record1 (Map.Map String [a]) a
26− deriving Show
27
26
28
27
29data TermN a
28data TermN a
30 = VarN (Maybe Var.Canonical) a
29 = VarN (Maybe Var.Canonical) a
31 | TermN (Maybe Var.Canonical) (Term1 (TermN a))
30 | TermN (Maybe Var.Canonical) (Term1 (TermN a))
32− deriving Show
33
31
34
32
35varN :: a -> TermN a
33varN :: a -> TermN a
@@ -66,7 +64,6 @@ data BasicConstraint a b
66 | CAnd [Constraint a b]
64 | CAnd [Constraint a b]
67 | CLet [Scheme a b] (Constraint a b)
65 | CLet [Scheme a b] (Constraint a b)
68 | CInstance SchemeName a
66 | CInstance SchemeName a
69− deriving Show
70
67
71
68
72data Scheme a b = Scheme
69data Scheme a b = Scheme
@@ -75,7 +72,6 @@ data Scheme a b = Scheme
75 , constraint :: Constraint a b
72 , constraint :: Constraint a b
76 , header :: Map.Map String a
73 , header :: Map.Map String a
77 }
74 }
78− deriving Show
79
75
80
76
81type TypeConstraint = Constraint Type Variable
77type TypeConstraint = Constraint Type Variable
@@ -116,7 +112,6 @@ data Descriptor = Descriptor
116 , mark :: Int
112 , mark :: Int
117 , alias :: Maybe Var.Canonical
113 , alias :: Maybe Var.Canonical
118 }
114 }
119− deriving Show
120
115
121
116
122noRank :: Int
117noRank :: Int
@@ -140,14 +135,14 @@ data Flex
140 | Flexible
135 | Flexible
141 | Constant
136 | Constant
142 | Is SuperType
137 | Is SuperType
143− deriving (Show, Eq)
138+ deriving (Eq)
144
139
145
140
146data SuperType
141data SuperType
147 = Number
142 = Number
148 | Comparable
143 | Comparable
149 | Appendable
144 | Appendable
150− deriving (Show, Eq)
145+ deriving (Eq)
151
146
152
147
153namedVar :: Flex -> Var.Canonical -> IO Variable
148namedVar :: Flex -> Var.Canonical -> IO Variable
@@ -200,11 +195,6 @@ existsNumber f =
200
195
201-- TYPES TO PRETTY STRINGS
196-- TYPES TO PRETTY STRINGS
202
197
203−instance Show a => Show (UF.Point a) where
204− show point =
205− unsafePerformIO $ fmap show (UF.descriptor point)
206−
207−
208instance PrettyType a => PrettyType (UF.Point a) where
198instance PrettyType a => PrettyType (UF.Point a) where
209 pretty when point =
199 pretty when point =
210 unsafePerformIO $ fmap (pretty when) (UF.descriptor point)
200 unsafePerformIO $ fmap (pretty when) (UF.descriptor point)