git.iko.soy/elk
on master help sign in
Stop deriving Show for Type stuff
commit96dfd8853e1a0a8d6219da291f2f146579201d79 authorEvan Czaplicki <info@elm-lang.org> dateSun 23 Nov 2014, 20:55 (12 years ago) parentff9acf5
3 files changed+4−14
compare with master
unifiedsplit
src/Type/Fragment.hs+1−1 src/Type/State.hs+1−1 src/Type/Type.hs+2−12
src/Type/Fragment.hs+1−1
@@ -10,7 +10,7 @@ data Fragment = Fragment
1010 { typeEnv :: Map.Map String Type
1111 , vars :: [Variable]
1212 , typeConstraint :: TypeConstraint
13− } deriving Show
13+ }
1414
1515emptyFragment = Fragment Map.empty [] (noneNoDocs CTrue)
1616
src/Type/State.hs+1−1
@@ -19,7 +19,7 @@ import Type.Type
1919data Pool = Pool
2020 { maxRank :: Int
2121 , inhabitants :: [Variable]
22− } deriving Show
22+ }
2323
2424emptyPool = Pool { maxRank = outermostRank, inhabitants = [] }
2525
src/Type/Type.hs+2−12
@@ -23,13 +23,11 @@ data Term1 a
2323 | Var1 a
2424 | EmptyRecord1
2525 | Record1 (Map.Map String [a]) a
26− deriving Show
2726
2827
2928data TermN a
3029 = VarN (Maybe Var.Canonical) a
3130 | TermN (Maybe Var.Canonical) (Term1 (TermN a))
32− deriving Show
3331
3432
3533varN :: a -> TermN a
@@ -66,7 +64,6 @@ data BasicConstraint a b
6664 | CAnd [Constraint a b]
6765 | CLet [Scheme a b] (Constraint a b)
6866 | CInstance SchemeName a
69− deriving Show
7067
7168
7269data Scheme a b = Scheme
@@ -75,7 +72,6 @@ data Scheme a b = Scheme
7572 , constraint :: Constraint a b
7673 , header :: Map.Map String a
7774 }
78− deriving Show
7975
8076
8177type TypeConstraint = Constraint Type Variable
@@ -116,7 +112,6 @@ data Descriptor = Descriptor
116112 , mark :: Int
117113 , alias :: Maybe Var.Canonical
118114 }
119− deriving Show
120115
121116
122117noRank :: Int
@@ -140,14 +135,14 @@ data Flex
140135 | Flexible
141136 | Constant
142137 | Is SuperType
143− deriving (Show, Eq)
138+ deriving (Eq)
144139
145140
146141data SuperType
147142 = Number
148143 | Comparable
149144 | Appendable
150− deriving (Show, Eq)
145+ deriving (Eq)
151146
152147
153148namedVar :: Flex -> Var.Canonical -> IO Variable
@@ -200,11 +195,6 @@ existsNumber f =
200195
201196-- TYPES TO PRETTY STRINGS
202197
203−instance Show a => Show (UF.Point a) where
204− show point =
205− unsafePerformIO $ fmap show (UF.descriptor point)
206−
207−
208198instance PrettyType a => PrettyType (UF.Point a) where
209199 pretty when point =
210200 unsafePerformIO $ fmap (pretty when) (UF.descriptor point)