Get the whole compiler building again.
This commit is contained in:
parent
721ce4f192
commit
d7dcf5a9e8
6 changed files with 72 additions and 59 deletions
103
Elm.cabal
103
Elm.cabal
|
@ -32,28 +32,33 @@ source-repository head
|
||||||
Library
|
Library
|
||||||
exposed-modules: Language.Elm,
|
exposed-modules: Language.Elm,
|
||||||
Language.Elm.Quasi
|
Language.Elm.Quasi
|
||||||
Hs-Source-Dirs: compiler, compiler/Gen, compiler/Model, compiler/Transform
|
Hs-Source-Dirs: compiler
|
||||||
other-modules: Ast,
|
other-modules: Unique,
|
||||||
Located,
|
SourceSyntax.Helpers,
|
||||||
CompileToJS,
|
SourceSyntax.Location,
|
||||||
Cases,
|
SourceSyntax.Literal,
|
||||||
Substitute,
|
SourceSyntax.Pattern,
|
||||||
ExtractNoscript,
|
SourceSyntax.Expression,
|
||||||
GenerateHtml,
|
SourceSyntax.Declaration,
|
||||||
Guid,
|
SourceSyntax.Module,
|
||||||
Libraries,
|
SourceSyntax.Rename
|
||||||
LoadLibraries,
|
Generate.JavaScript,
|
||||||
Optimize,
|
Generate.Noscript,
|
||||||
|
Generate.Html,
|
||||||
|
Generate.Cases,
|
||||||
|
Transform.Substitute,
|
||||||
|
Transform.Optimize,
|
||||||
|
Metadata.Libraries,
|
||||||
|
Metadata.LoadLibraries,
|
||||||
Initialize,
|
Initialize,
|
||||||
Rename,
|
Parse.Binop,
|
||||||
Parse.Binops,
|
Parse.Expression,
|
||||||
Parse.Expr,
|
|
||||||
Parse.Foreign,
|
Parse.Foreign,
|
||||||
Parse.Library,
|
Parse.Helpers,
|
||||||
Parse.Modules,
|
Parse.Module,
|
||||||
Parse.Parser,
|
Parse.Parser,
|
||||||
Parse.Patterns,
|
Parse.Pattern,
|
||||||
Parse.Types,
|
Parse.Type,
|
||||||
Types.Alias,
|
Types.Alias,
|
||||||
Types.Types,
|
Types.Types,
|
||||||
Types.Constrain,
|
Types.Constrain,
|
||||||
|
@ -84,28 +89,33 @@ Library
|
||||||
|
|
||||||
Executable elm
|
Executable elm
|
||||||
Main-is: Compiler.hs
|
Main-is: Compiler.hs
|
||||||
Hs-Source-Dirs: compiler, compiler/Gen, compiler/Model, compiler/Transform
|
Hs-Source-Dirs: compiler
|
||||||
other-modules: Ast,
|
other-modules: Unique,
|
||||||
Located,
|
SourceSyntax.Helpers,
|
||||||
CompileToJS,
|
SourceSyntax.Location,
|
||||||
Cases,
|
SourceSyntax.Literal,
|
||||||
Substitute,
|
SourceSyntax.Pattern,
|
||||||
ExtractNoscript,
|
SourceSyntax.Expression,
|
||||||
GenerateHtml,
|
SourceSyntax.Declaration,
|
||||||
Guid,
|
SourceSyntax.Module,
|
||||||
Libraries,
|
SourceSyntax.Rename
|
||||||
LoadLibraries,
|
Generate.JavaScript,
|
||||||
Optimize,
|
Generate.Noscript,
|
||||||
|
Generate.Html,
|
||||||
|
Generate.Cases,
|
||||||
|
Transform.Substitute,
|
||||||
|
Transform.Optimize,
|
||||||
|
Metadata.Libraries,
|
||||||
|
Metadata.LoadLibraries,
|
||||||
Initialize,
|
Initialize,
|
||||||
Rename,
|
Parse.Binop,
|
||||||
Parse.Binops,
|
Parse.Expression,
|
||||||
Parse.Expr,
|
|
||||||
Parse.Foreign,
|
Parse.Foreign,
|
||||||
Parse.Library,
|
Parse.Helpers,
|
||||||
Parse.Modules,
|
Parse.Module,
|
||||||
Parse.Parser,
|
Parse.Parser,
|
||||||
Parse.Patterns,
|
Parse.Pattern,
|
||||||
Parse.Types,
|
Parse.Type,
|
||||||
Types.Alias,
|
Types.Alias,
|
||||||
Types.Types,
|
Types.Types,
|
||||||
Types.Constrain,
|
Types.Constrain,
|
||||||
|
@ -134,12 +144,17 @@ Executable elm
|
||||||
|
|
||||||
Executable elm-doc
|
Executable elm-doc
|
||||||
Main-is: Docs.hs
|
Main-is: Docs.hs
|
||||||
Hs-Source-Dirs: compiler, compiler/Model, compiler/Transform
|
Hs-Source-Dirs: compiler
|
||||||
other-modules: Ast,
|
other-modules: SourceSyntax.Helpers,
|
||||||
Located,
|
SourceSyntax.Location,
|
||||||
Parse.Library,
|
SourceSyntax.Literal,
|
||||||
Parse.Modules,
|
SourceSyntax.Pattern,
|
||||||
Rename
|
SourceSyntax.Expression,
|
||||||
|
SourceSyntax.Declaration,
|
||||||
|
SourceSyntax.Module,
|
||||||
|
SourceSyntax.Rename
|
||||||
|
Parse.Helpers,
|
||||||
|
Parse.Module
|
||||||
|
|
||||||
Build-depends: base >=4.2 && <5,
|
Build-depends: base >=4.2 && <5,
|
||||||
containers >= 0.3,
|
containers >= 0.3,
|
||||||
|
|
|
@ -17,11 +17,11 @@ import qualified Text.Blaze.Html.Renderer.String as Normal
|
||||||
import qualified Text.Jasmine as JS
|
import qualified Text.Jasmine as JS
|
||||||
import qualified Data.ByteString.Lazy.Char8 as BS
|
import qualified Data.ByteString.Lazy.Char8 as BS
|
||||||
|
|
||||||
import Ast
|
import SourceSyntax.Module
|
||||||
import Initialize (buildFromSource, getSortedModuleNames)
|
import Initialize (buildFromSource, getSortedModuleNames)
|
||||||
import CompileToJS (jsModule)
|
import Generate.JavaScript (jsModule)
|
||||||
import GenerateHtml (createHtml, JSStyle(..), JSSource(..))
|
import Generate.Html (createHtml, JSStyle(..), JSSource(..))
|
||||||
import qualified Libraries as Libraries
|
import qualified Metadata.Libraries as Libraries
|
||||||
import Paths_Elm
|
import Paths_Elm
|
||||||
|
|
||||||
data Flags =
|
data Flags =
|
||||||
|
@ -153,7 +153,7 @@ buildFiles flags numModules interfaces (filePath:rest) = do
|
||||||
buildFiles flags numModules interfaces' rest
|
buildFiles flags numModules interfaces' rest
|
||||||
|
|
||||||
|
|
||||||
exportInfo :: Module -> IO String
|
exportInfo :: Module t v -> IO String
|
||||||
exportInfo (Module names exs ims stmts) =
|
exportInfo (Module names exs ims stmts) =
|
||||||
do print exs
|
do print exs
|
||||||
return (show exs)
|
return (show exs)
|
|
@ -1,14 +1,14 @@
|
||||||
|
|
||||||
module Main where
|
module Main where
|
||||||
|
|
||||||
import Ast
|
import SourceSyntax.Declaration (Declaration(Datatype))
|
||||||
import Control.Applicative ((<$>), (<*>))
|
import Control.Applicative ((<$>), (<*>))
|
||||||
import Data.List (intercalate)
|
import Data.List (intercalate)
|
||||||
import Data.Maybe (catMaybes)
|
import Data.Maybe (catMaybes)
|
||||||
import Types.Types ((==>), Type ( ADT, VarT ) )
|
import Types.Types ((==>), Type ( ADT, VarT ) )
|
||||||
import Parse.Types (datatype)
|
import Parse.Type (datatype)
|
||||||
import Parse.Library
|
import Parse.Helpers
|
||||||
import Parse.Modules (moduleDef)
|
import Parse.Module (moduleDef)
|
||||||
import Text.Parsec hiding (newline,spaces)
|
import Text.Parsec hiding (newline,spaces)
|
||||||
import System.Environment
|
import System.Environment
|
||||||
import System.Exit
|
import System.Exit
|
||||||
|
|
|
@ -15,7 +15,6 @@ import qualified Text.Blaze.Html5.Attributes as A
|
||||||
import Text.Jasmine (minify)
|
import Text.Jasmine (minify)
|
||||||
import qualified Data.ByteString.Lazy.Char8 as BS
|
import qualified Data.ByteString.Lazy.Char8 as BS
|
||||||
|
|
||||||
import Ast
|
|
||||||
import Initialize (buildFromSource)
|
import Initialize (buildFromSource)
|
||||||
import Generate.JavaScript
|
import Generate.JavaScript
|
||||||
import Generate.Noscript
|
import Generate.Noscript
|
||||||
|
|
|
@ -13,11 +13,11 @@ module Language.Elm (compile, toHtml, moduleName, runtime, docs) where
|
||||||
|
|
||||||
import Data.List (intercalate)
|
import Data.List (intercalate)
|
||||||
import Data.Version (showVersion)
|
import Data.Version (showVersion)
|
||||||
import CompileToJS (showErr, jsModule)
|
import Generate.JavaScript (showErr, jsModule)
|
||||||
import GenerateHtml (generateHtml)
|
import Generate.Html (generateHtml)
|
||||||
import Initialize (buildFromSource)
|
import Initialize (buildFromSource)
|
||||||
import Parse.Library
|
import Parse.Helpers
|
||||||
import Parse.Modules (moduleDef)
|
import Parse.Module (moduleDef)
|
||||||
import Text.Blaze.Html (Html)
|
import Text.Blaze.Html (Html)
|
||||||
import Text.Parsec (option,optional)
|
import Text.Parsec (option,optional)
|
||||||
import Paths_Elm
|
import Paths_Elm
|
||||||
|
|
|
@ -8,7 +8,6 @@ import qualified Data.Map as Map
|
||||||
import qualified Data.Set as Set
|
import qualified Data.Set as Set
|
||||||
import Types.Substitutions (subst)
|
import Types.Substitutions (subst)
|
||||||
import Types.Types
|
import Types.Types
|
||||||
import Data.Generics.Uniplate.Data
|
|
||||||
import Data.Data
|
import Data.Data
|
||||||
|
|
||||||
builtins :: [(String,([X],Type))]
|
builtins :: [(String,([X],Type))]
|
||||||
|
|
Loading…
Reference in a new issue