git.iko.soy/elk
on master help sign in
SourceSyntax/ => AST/ in more modules

partial fix, still not in working order yet

commite08d95b55f4c6112d88bd6b6ee01fa7b0a533153 authorEvan Czaplicki <info@elm-lang.org> dateMon 14 Apr 2014, 16:24 (13 years ago) parent4799b34
6 files changed+12−11
compare with master
unifiedsplit
compiler/Build/Interface.hs+1−1 compiler/Build/Print.hs+2−2 compiler/Build/Source.hs+1−1 compiler/Elm/Internal/Utils.hs+2−2 compiler/Metadata/Prelude.hs+4−3 compiler/Type/Alias.hs+2−2
compiler/Build/Interface.hs+1−1
@@ -7,7 +7,7 @@ import qualified Data.Binary as Binary
77import qualified Build.Print as Print
88import qualified Elm.Internal.Version as Version
99import System.Directory (doesFileExist)
10−import SourceSyntax.Module
10+import AST.Module
1111
1212load :: Binary.Binary a => FilePath -> IO a
1313load filePath =
compiler/Build/Print.hs+2−2
@@ -5,8 +5,8 @@ import System.Exit (exitFailure)
55
66import qualified Data.Map as Map
77import qualified Data.List as List
8−import qualified SourceSyntax.Module as M
9−import qualified SourceSyntax.PrettyPrint as Pretty
8+import qualified AST.Module as M
9+import qualified AST.PrettyPrint as Pretty
1010import qualified Type.Alias as Alias
1111import qualified Text.PrettyPrint as P
1212
compiler/Build/Source.hs+1−1
@@ -15,7 +15,7 @@ import qualified Metadata.Prelude as Prelude
1515import qualified Transform.Check as Check
1616import qualified Transform.SortDefinitions as SD
1717import qualified Type.Inference as TI
18−import qualified Type.Constrain.Declaration as TcDecl
18+import qualified Transform.Declaration as TcDecl
1919import qualified Transform.Canonicalize as Canonical
2020
2121build :: Bool -> Interfaces -> String -> Either [Doc] MetadataModule
compiler/Elm/Internal/Utils.hs+2−2
@@ -6,7 +6,7 @@ import qualified Data.List as List
66import qualified Generate.JavaScript as JS
77import qualified Build.Source as Source
88import qualified Parse.Module as Parser
9−import qualified SourceSyntax.Module as M
9+import qualified AST.Module as M
1010import qualified Text.PrettyPrint as P
1111import qualified Metadata.Prelude as Prelude
1212import System.IO.Unsafe
@@ -25,4 +25,4 @@ interfaces = unsafePerformIO $ Prelude.interfaces False
2525
2626-- |This function extracts the module name of a given source program.
2727moduleName :: String -> Maybe String
28−moduleName = Parser.getModuleName
28+moduleName = Parser.getModuleName
compiler/Metadata/Prelude.hs+4−3
@@ -5,12 +5,13 @@ import qualified Data.Map as Map
55import qualified Control.Exception as E
66import System.Exit
77import System.IO
8−import SourceSyntax.Module
8+import AST.Module
99import qualified Build.Interface as Interface
1010import Build.Utils (getDataFile)
1111
12−add :: Bool -> Module def -> Module def
13−add noPrelude (Module name exs ims decls) = Module name exs (customIms ++ ims) decls
12+add :: Bool -> Module exs body -> Module exs body
13+add noPrelude (Module name path exs ims decls) =
14+ Module name path exs (customIms ++ ims) decls
1415 where
1516 customIms = if noPrelude then [] else concatMap addModule prelude
1617
compiler/Type/Alias.hs+2−2
@@ -7,8 +7,8 @@ import Control.Arrow (second)
77import Data.Map ((!))
88import qualified Data.Map as Map
99import qualified Data.List as List
10−import SourceSyntax.Type
11−import SourceSyntax.Module
10+import AST.Type
11+import AST.Module
1212
1313type Rules = ([Alias], Type -> Type)
1414