ivory, tower backends: rename Interface to Schema because thats what we mean

gidl.cabal

@@ -28,11 +28,11 @@ library
                        Gidl.Backend.Haskell.Test,
                        Gidl.Backend.Haskell.Types,
                        Gidl.Backend.Ivory,
-                       Gidl.Backend.Ivory.Interface,
+                       Gidl.Backend.Ivory.Schema,
                        Gidl.Backend.Ivory.Test,
                        Gidl.Backend.Ivory.Types,
                        Gidl.Backend.Tower,
-                       Gidl.Backend.Tower.Interface
+                       Gidl.Backend.Tower.Schema
 
   other-modules:       Paths_gidl
 

src/Gidl/Backend/Ivory.hs

@@ -13,7 +13,7 @@ import Gidl.Interface
 import Gidl.Schema
 import Gidl.Backend.Cabal
 import Gidl.Backend.Ivory.Types
-import Gidl.Backend.Ivory.Interface
+import Gidl.Backend.Ivory.Schema
 
 ivoryBackend :: TypeEnv -> InterfaceEnv -> String -> String -> [Artifact]
 ivoryBackend te ie pkgname namespace_raw =
@@ -35,15 +35,15 @@ ivoryBackend te ie pkgname namespace_raw =
 
 ivorySources :: TypeEnv -> InterfaceEnv -> [String] -> [Artifact]
 ivorySources (TypeEnv te) (InterfaceEnv ie) namespace =
-  tmods ++ concat imods ++ [ typeUmbrella namespace userDefinedTypes
+  tmods ++ concat smods ++ [ typeUmbrella namespace userDefinedTypes
                            , unpackModule namespace
                            ]
   where
   userDefinedTypes = [ t | (_,t) <- te, isUserDefined t ]
   tmods = [ typeModule (namespace ++ ["Types"]) t
           | t <- userDefinedTypes ]
-  imods = [ [ interfaceModule (namespace ++ ["Interface"]) i (producerSchema i)
-            , interfaceModule (namespace ++ ["Interface"]) i (consumerSchema i) ]
+  smods = [ [ schemaModule (namespace ++ ["Interface"]) i (producerSchema i)
+            , schemaModule (namespace ++ ["Interface"]) i (consumerSchema i) ]
           | (_iname, i) <- ie ]
 
 dotwords :: String -> [String]

src/Gidl/Backend/Ivory/Interface.hs

@@ -1,5 +1,5 @@
 
-module Gidl.Backend.Ivory.Interface where
+module Gidl.Backend.Ivory.Schema where
 
 
 import Data.Monoid
@@ -13,8 +13,8 @@ import Gidl.Backend.Ivory.Types
 import Ivory.Artifact
 import Text.PrettyPrint.Mainland
 
-interfaceModule :: [String] -> Interface -> Schema -> Artifact
-interfaceModule modulepath ir schema =
+schemaModule :: [String] -> Interface -> Schema -> Artifact
+schemaModule modulepath ir schema =
   artifactPath (intercalate "/" (modulepath ++ [ifModuleName ir])) $
   artifactText (schemaName ++ ".hs") $
   prettyLazyText 80 $

src/Gidl/Backend/Ivory/Test.hs

@@ -5,7 +5,7 @@ module Gidl.Backend.Ivory.Test where
 import Data.Monoid
 import Gidl.Interface
 import Gidl.Schema
-import Gidl.Backend.Ivory.Interface
+import Gidl.Backend.Ivory.Schema
 import Ivory.Artifact
 import Text.PrettyPrint.Mainland
 

src/Gidl/Backend/Tower.hs

@@ -12,8 +12,8 @@ import Gidl.Interface
 import Gidl.Schema
 import Gidl.Backend.Cabal
 import Gidl.Backend.Ivory (dotwords, ivorySources)
-import Gidl.Backend.Ivory.Interface (ifModuleName)
-import Gidl.Backend.Tower.Interface
+import Gidl.Backend.Ivory.Schema (ifModuleName)
+import Gidl.Backend.Tower.Schema
 
 towerBackend :: TypeEnv -> InterfaceEnv -> String -> String -> [Artifact]
 towerBackend te ie pkgname namespace_raw =
@@ -42,8 +42,8 @@ towerSources :: InterfaceEnv -> [String] -> [Artifact]
 towerSources (InterfaceEnv ie) namespace = towerInterfaces
   where
   towerInterfaces = concat
-    [ [ interfaceModule (namespace ++ ["Interface"]) i (producerSchema i)
-      , interfaceModule (namespace ++ ["Interface"]) i (consumerSchema i) ]
+    [ [ schemaModule (namespace ++ ["Interface"]) i (producerSchema i)
+      , schemaModule (namespace ++ ["Interface"]) i (consumerSchema i) ]
     | (_iname, i) <- ie ]
 
 makefile :: Artifact

src/Gidl/Backend/Tower/Interface.hs

@@ -1,5 +1,5 @@
 
-module Gidl.Backend.Tower.Interface where
+module Gidl.Backend.Tower.Schema where
 
 
 import Data.Monoid
@@ -9,12 +9,12 @@ import Gidl.Types
 import Gidl.Interface
 import Gidl.Schema
 import Gidl.Backend.Ivory.Types
-import Gidl.Backend.Ivory.Interface (ifModuleName, parserName, senderName)
+import Gidl.Backend.Ivory.Schema (ifModuleName, parserName, senderName)
 import Ivory.Artifact
 import Text.PrettyPrint.Mainland
 
-interfaceModule :: [String] -> Interface -> Schema -> Artifact
-interfaceModule modulepath ir schema =
+schemaModule :: [String] -> Interface -> Schema -> Artifact
+schemaModule modulepath ir schema =
   artifactPath (intercalate "/" (modulepath ++ [ifModuleName ir])) $
   artifactText (schemaName ++ ".hs") $
   prettyLazyText 80 $