96f55fc · elk · git.iko.soy

compiler/Build/Source.hs−2

compare with master

unifiedsplit

@@ -51,8 +51,6 @@ build noPrelude interfaces source =

51 , datatypes = [ (name,vars,ctors,ds) | Datatype name vars ctors ds <- decls ]

52 , fixities = [ (assoc,level,op) | Fixity assoc level op <- decls ]

53 , aliases = [ (name,tvs,tipe,ds) | TypeAlias name tvs tipe ds <- decls ]

54− , sendPorts = [ (name,expr,tipe) | Port (Send name expr tipe) <- decls ]

55− , recvPorts = [ (name,expr,tipe) | Port (Recv name expr tipe) <- decls ]

56 }

54 }

57

55

58 types <- TI.infer interfaces metaModule

56 types <- TI.infer interfaces metaModule

compiler/SourceSyntax/Module.hs−2

@@ -47,8 +47,6 @@ data MetadataModule =

47 , fixities :: [(Assoc, Int, String)]

48 , aliases :: [Alias]

49 , datatypes :: [ADT]

50− , sendPorts :: [(String, LExpr, Type)]

51− , recvPorts :: [(String, LExpr, Type)]

52 } deriving Show

50 } deriving Show

53

51

54type Interfaces = Map.Map String ModuleInterface

52type Interfaces = Map.Map String ModuleInterface

compiler/Transform/Canonicalize.hs+1−6

@@ -58,16 +58,11 @@ metadataModule ifaces modul =

58 program' <- rename initialEnv (program modul)

59 aliases' <- mapM (three4 renameType') (aliases modul)

60 datatypes' <- mapM (three4 (mapM (two2 (mapM renameType')))) (datatypes modul)

61− sendPorts' <- mapM renamePort (sendPorts modul)

62− recvPorts' <- mapM renamePort (recvPorts modul)

63 return $ modul { program = program'

61 return $ modul { program = program'

64 , aliases = aliases'

62 , aliases = aliases'

65− , datatypes = datatypes'

63+ , datatypes = datatypes' }

66− , sendPorts = sendPorts'

67− , recvPorts = recvPorts' }

68 where

64 where

69 two2 f (a,b) = (,) a <$> f b

65 two2 f (a,b) = (,) a <$> f b

70− renamePort (name,expr,tipe) = (,,) name <$> rename initialEnv expr <*> renameType' tipe

71 three4 f (a,b,c,d) = (,,,) a b <$> f c <*> return d

66 three4 f (a,b,c,d) = (,,,) a b <$> f c <*> return d

72 renameType' =

67 renameType' =

73 Either.either (\err -> Left [P.text err]) return . renameType (replace "type" initialEnv)

68 Either.either (\err -> Left [P.text err]) return . renameType (replace "type" initialEnv)

compiler/Transform/SafeNames.hs+1−5

@@ -69,8 +69,4 @@ metadataModule modul =

69 , datatypes =

70 let makeSafe (name,tvars,ctors,ds) = (var name, tvars, map (first var) ctors, ds)

71 in map makeSafe (datatypes modul)

72− , sendPorts = map safePorts (sendPorts modul)

73− , recvPorts = map safePorts (recvPorts modul)

74− }

72+ }

75− where

76− safePorts (name,expr,tipe) = (name, expression expr, tipe)