033fa66 · elk · git.iko.soy

Add type hints for `move`, `scale`, and `rotate`.

commit033fa66e5a32f1170a46b0c1a5567b0bea7c9689 authorevancz <info@elm-lang.org> dateTue 31 Jul 2012, 15:36 (14 years ago) parent46cb69f

2 files changed+7−3

unifiedsplit

elm/src/Types/Hints.hs+6−3

@@ -47,6 +47,9 @@ shapes = [ twoNums (\n m -> listOf (pairOf n) ==> pairOf m ==> shape) "polygon"

4747 , "filled" -: color ==> shape ==> form

4848 , "outlined" -: color ==> shape ==> form

4949 , "customOutline" -: listOf int ==> color ==> shape ==> form

50+ , scheme2 number transformable (\n t -> n ==> n ==> t ==> t) "move"

51+ , scheme2 number transformable (\n t -> n ==> t ==> t) "rotate"

52+ , scheme2 number transformable (\n t -> n ==> t ==> t) "scale"

5053 ] ++ map (twoNums (\n m -> n ==> n ==> pairOf m ==> shape)) [ "ngon"

5154 , "rect"

5255 , "oval" ]

@@ -141,11 +144,11 @@ concreteSignals =

141144

142145binop t = t ==> t ==> t

143146scheme1 super t name = (name, Forall [0] [VarT 0 :<: super] (t (VarT 0)))

147+scheme2 s1 s2 t name =

148+ (name, Forall [0,1] [VarT 0 :<: s1, VarT 1 :<: s2] (t (VarT 0) (VarT 1)))

144149numScheme t name = scheme1 number t name

145150timeScheme name t = scheme1 time t name

146−twoNums f name =

147− (,) name . Forall [0,1] [ VarT 0 :<: number, VarT 1 :<: number ] $

148− f (VarT 0) (VarT 1)

151+twoNums f name = scheme2 number number f name

149152

150153math =

151154 map (numScheme (\t -> t ==> binop t)) ["clamp"] ++

elm/src/Types/Types.hs+1

@@ -51,6 +51,7 @@ pairOf t = tupleOf [t,t]

5151point = pairOf int

5252appendable t = SuperType "Appendable" (Set.fromList [ string, text, listOf t ])

5353comparable = SuperType "Comparable" (Set.fromList [ int, float, char, string, tipe "Number", tipe "Time" ])

54+transformable = SuperType "Transformable" (Set.fromList [ shape, line ])

5455

5556jsBool = tipe "JSBool"

5657jsNumber = tipe "JSNumber"