75c1c8d · elk · git.iko.soy

src/AST/Expression/General.hs+2−2

compare with master

unifiedsplit

@@ -10,7 +10,7 @@ module AST.Expression.General where

10

11import AST.PrettyPrint

12import Text.PrettyPrint as P

13−import AST.Type (PortType)

13+import AST.Type (PortDirection)

14

15import qualified AST.Annotation as Annotation

16import qualified AST.Helpers as Help

@@ -58,7 +58,7 @@ data Expr' ann def var

58 | Modify (Expr ann def var) [(String, Expr ann def var)]

59 | Record [(String, Expr ann def var)]

60 -- for type checking and code gen only

61− | Port String (PortType var)

61+ | Port String (PortDirection var)

62 | Perform (Expr ann def var)

63 | GLShader String String Literal.GLShaderTipe

64 deriving (Show)

src/AST/Type.hs+13−24

@@ -1,6 +1,7 @@

1module AST.Type

2− ( Type(..), RawType, CanonicalType, PortType(..)

2+ ( Type(..), RawType, CanonicalType

3+ , PortType(..), PortDirection(..)

3− , portTypeToType, fieldMap, recordOf, listOf, tupleOf

4+ , fieldMap, recordOf, listOf, tupleOf

4 , deepDealias, dealias

5 , deepDealias, dealias

5 , collectLambdas

6 , collectLambdas

6 , prettyParens

7 , prettyParens

@@ -37,22 +38,18 @@ type CanonicalType =

37 Type Var.Canonical

38 Type Var.Canonical

38

39

40

40−data PortType var

41+data PortType var = PortType

41− = Inbound (Type var)

42+ { direction :: PortDirection var

42− | Internal (Type var)

43− | Outbound (Type var)

43+ , tipe :: Type var

44+ }

44 deriving (Show)

45 deriving (Show)

45

46

47

47−portTypeToType :: PortType Var.Canonical -> CanonicalType

48+data PortDirection var

48−portTypeToType portType =

49+ = Inbound (Type var)

49− let makeType name tipe =

50− App (Type (Var.fromModule ["Port"] name)) [tipe]

51− in

52− case portType of

53− Inbound tipe -> makeType "InboundPort" tipe

54− Internal tipe -> makeType "Port" tipe

50+ | Internal

55− Outbound tipe -> makeType "OutboundPort" tipe

51+ | Outbound (Type var)

52+ deriving (Show)

56

53

57

54

58fieldMap :: [(String,a)] -> Map.Map String [a]

55fieldMap :: [(String,a)] -> Map.Map String [a]

@@ -139,15 +136,7 @@ replace typeTable t =

139

136

140instance (Pretty var, Var.ToString var) => Pretty (PortType var) where

137instance (Pretty var, Var.ToString var) => Pretty (PortType var) where

141 pretty portType =

138 pretty portType =

142− case portType of

139+ pretty (tipe portType)

143− Inbound tipe ->

144− P.text "InboundPort" <+> pretty tipe

145−

146− Internal tipe ->

147− P.text "Port" <+> pretty tipe

148−

149− Outbound tipe ->

150− P.text "OutboundPort" <+> pretty tipe

151

140

152

141

153instance (Var.ToString var, Pretty var) => Pretty (Type var) where

142instance (Var.ToString var, Pretty var) => Pretty (Type var) where

src/Generate/JavaScript.hs+1−1

@@ -212,7 +212,7 @@ expression (A region expr) =

212 T.Inbound tipe ->

213 return (Port.inbound name tipe)

214

215− T.Internal _ ->

215+ T.Internal ->

216 return (Port.internal name)

217

218 T.Outbound tipe ->

src/Transform/Canonicalize.hs+12−7

@@ -206,8 +206,8 @@ declaration env decl =

206 do Env.uses ["Native","Port"]

207 Env.uses ["Native","JavaScript"]

208 tipe' <- canonicalize Canonicalize.tipe "port" name env tipe

209− portType <- Port.check name tipe'

209+ portDirection <- Port.check name tipe'

210− return $ D.Port name portType

210+ return $ D.Port name (Type.PortType portDirection tipe')

211

212 D.Perform line expr ->

213 do Env.uses ["Native","Task"]

@@ -304,12 +304,17 @@ expression env (A.A ann validExpr) =

304 (,) <$> format (pattern env p)

305 <*> expression (Env.addPattern p env) b

306

307− Port name portType ->

307+ Port name direction ->

308 Port name <$>

309− case portType of

309+ case direction of

310+ Type.Inbound tipe ->

310− Type.Inbound tipe -> Type.Inbound <$> tipe' env tipe

311+ Type.Inbound <$> tipe' env tipe

312+

311− Type.Internal tipe -> Type.Internal <$> tipe' env tipe

313+ Type.Internal ->

314+ return Type.Internal

315+

316+ Type.Outbound tipe ->

312− Type.Outbound tipe -> Type.Outbound <$> tipe' env tipe

317+ Type.Outbound <$> tipe' env tipe

313

318

314 Perform expr ->

319 Perform expr ->

315 Perform <$> go expr

320 Perform <$> go expr

src/Transform/Canonicalize/Port.hs+3−3

@@ -20,7 +20,7 @@ throw err =

20check

21 :: String

22 -> T.CanonicalType

23− -> Env.Canonicalizer [P.Doc] (T.PortType Var.Canonical)

23+ -> Env.Canonicalizer [P.Doc] (T.PortDirection Var.Canonical)

24check name tipe =

25 checkHelp name tipe tipe

26

@@ -29,12 +29,12 @@ checkHelp

29 :: String

30 -> T.CanonicalType

31 -> T.CanonicalType

32− -> Env.Canonicalizer [P.Doc] (T.PortType Var.Canonical)

32+ -> Env.Canonicalizer [P.Doc] (T.PortDirection Var.Canonical)

33checkHelp name rootType tipe =

34 case tipe of

35 T.Aliased alias [(_,arg)] _

36 | Var.is ["Port"] "Port" alias ->

37− return (T.Internal arg)

37+ return T.Internal

38

39 | Var.is ["Port"] "InboundPort" alias ->

40 do validForeignType name In arg arg

src/Transform/Declaration.hs+1−1

@@ -117,7 +117,7 @@ toDefs moduleName decl =

117 []

118

119 D.Port name tipe ->

120− [ definition name (A.none $ E.Port name tipe) (T.portTypeToType tipe) ]

120+ [ definition name (A.none $ E.Port name (T.direction tipe)) (T.tipe tipe) ]

121

122 D.Perform line expr ->

123 let name = "$perform$" ++ show line