033fa66 · elk · git.iko.soy

git.iko.soy/elk

on master help sign in

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

033fa66evancz14 years ago

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

compare with master

unifiedsplit

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

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

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

49 , "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"

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

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

51 , "rect"

54 , "rect"

52 , "oval" ]

55 , "oval" ]

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

141

144

142binop t = t ==> t ==> t

145binop t = t ==> t ==> t

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

146scheme1 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)))

144numScheme t name = scheme1 number t name

149numScheme t name = scheme1 number t name

145timeScheme name t = scheme1 time t name

150timeScheme name t = scheme1 time t name

146−twoNums f name =

151+twoNums f name = scheme2 number number f name

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

148− f (VarT 0) (VarT 1)

149

152

150math =

153math =

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

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

elm/src/Types/Types.hs+1

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

51point = pairOf int

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

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

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

55jsBool = tipe "JSBool"

56jsBool = tipe "JSBool"

56jsNumber = tipe "JSNumber"

57jsNumber = tipe "JSNumber"