yogsototh/elm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get the whole compiler building again.

Browse source
This commit is contained in:
evancz 2013-06-13 22:59:14 -07:00
parent 721ce4f192
commit d7dcf5a9e8
6 changed files with 72 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
Elm.cabal
View file

@ -32,28 +32,33 @@ source-repository head
Library
exposed-modules: Language.Elm,
Language.Elm.Quasi
Hs-Source-Dirs: compiler, compiler/Gen, compiler/Model, compiler/Transform
other-modules: Ast,
Located,
CompileToJS,
Cases,
Substitute,
ExtractNoscript,
GenerateHtml,
Guid,
Libraries,
LoadLibraries,
Optimize,
Hs-Source-Dirs: compiler
other-modules: Unique,
SourceSyntax.Helpers,
SourceSyntax.Location,
SourceSyntax.Literal,
SourceSyntax.Pattern,
SourceSyntax.Expression,
SourceSyntax.Declaration,
SourceSyntax.Module,
SourceSyntax.Rename
Generate.JavaScript,
Generate.Noscript,
Generate.Html,
Generate.Cases,
Transform.Substitute,
Transform.Optimize,
Metadata.Libraries,
Metadata.LoadLibraries,
Initialize,
Rename,
Parse.Binops,
Parse.Expr,
Parse.Binop,
Parse.Expression,
Parse.Foreign,
Parse.Library,
Parse.Modules,
Parse.Helpers,
Parse.Module,
Parse.Parser,
Parse.Patterns,
Parse.Types,
Parse.Pattern,
Parse.Type,
Types.Alias,
Types.Types,
Types.Constrain,
@ -84,28 +89,33 @@ Library
Executable elm
Main-is: Compiler.hs
Hs-Source-Dirs: compiler, compiler/Gen, compiler/Model, compiler/Transform
other-modules: Ast,
Located,
CompileToJS,
Cases,
Substitute,
ExtractNoscript,
GenerateHtml,
Guid,
Libraries,
LoadLibraries,
Optimize,
Hs-Source-Dirs: compiler
other-modules: Unique,
SourceSyntax.Helpers,
SourceSyntax.Location,
SourceSyntax.Literal,
SourceSyntax.Pattern,
SourceSyntax.Expression,
SourceSyntax.Declaration,
SourceSyntax.Module,
SourceSyntax.Rename
Generate.JavaScript,
Generate.Noscript,
Generate.Html,
Generate.Cases,
Transform.Substitute,
Transform.Optimize,
Metadata.Libraries,
Metadata.LoadLibraries,
Initialize,
Rename,
Parse.Binops,
Parse.Expr,
Parse.Binop,
Parse.Expression,
Parse.Foreign,
Parse.Library,
Parse.Modules,
Parse.Helpers,
Parse.Module,
Parse.Parser,
Parse.Patterns,
Parse.Types,
Parse.Pattern,
Parse.Type,
Types.Alias,
Types.Types,
Types.Constrain,
@ -134,12 +144,17 @@ Executable elm
Executable elm-doc
Main-is: Docs.hs
Hs-Source-Dirs: compiler, compiler/Model, compiler/Transform
other-modules: Ast,
Located,
Parse.Library,
Parse.Modules,
Rename
Hs-Source-Dirs: compiler
other-modules: SourceSyntax.Helpers,
SourceSyntax.Location,
SourceSyntax.Literal,
SourceSyntax.Pattern,
SourceSyntax.Expression,
SourceSyntax.Declaration,
SourceSyntax.Module,
SourceSyntax.Rename
Parse.Helpers,
Parse.Module
Build-depends: base >=4.2 && <5,
containers >= 0.3,

10
compiler/Compiler.hs
View file

@ -17,11 +17,11 @@ import qualified Text.Blaze.Html.Renderer.String as Normal
import qualified Text.Jasmine as JS
import qualified Data.ByteString.Lazy.Char8 as BS
import Ast
import SourceSyntax.Module
import Initialize (buildFromSource, getSortedModuleNames)
import CompileToJS (jsModule)
import GenerateHtml (createHtml, JSStyle(..), JSSource(..))
import qualified Libraries as Libraries
import Generate.JavaScript (jsModule)
import Generate.Html (createHtml, JSStyle(..), JSSource(..))
import qualified Metadata.Libraries as Libraries
import Paths_Elm
data Flags =
@ -153,7 +153,7 @@ buildFiles flags numModules interfaces (filePath:rest) = do
buildFiles flags numModules interfaces' rest
exportInfo :: Module -> IO String
exportInfo :: Module t v -> IO String
exportInfo (Module names exs ims stmts) =
do print exs
return (show exs)

8
compiler/Docs.hs
View file

@ -1,14 +1,14 @@
module Main where
import Ast
import SourceSyntax.Declaration (Declaration(Datatype))
import Control.Applicative ((<$>), (<*>))
import Data.List (intercalate)
import Data.Maybe (catMaybes)
import Types.Types ((==>), Type ( ADT, VarT ) )
import Parse.Types (datatype)
import Parse.Library
import Parse.Modules (moduleDef)
import Parse.Type (datatype)
import Parse.Helpers
import Parse.Module (moduleDef)
import Text.Parsec hiding (newline,spaces)
import System.Environment
import System.Exit

1
compiler/Generate/Html.hs
View file

@ -15,7 +15,6 @@ import qualified Text.Blaze.Html5.Attributes as A
import Text.Jasmine (minify)
import qualified Data.ByteString.Lazy.Char8 as BS
import Ast
import Initialize (buildFromSource)
import Generate.JavaScript
import Generate.Noscript

8
compiler/Language/Elm.hs
View file

@ -13,11 +13,11 @@ module Language.Elm (compile, toHtml, moduleName, runtime, docs) where
import Data.List (intercalate)
import Data.Version (showVersion)
import CompileToJS (showErr, jsModule)
import GenerateHtml (generateHtml)
import Generate.JavaScript (showErr, jsModule)
import Generate.Html (generateHtml)
import Initialize (buildFromSource)
import Parse.Library
import Parse.Modules (moduleDef)
import Parse.Helpers
import Parse.Module (moduleDef)
import Text.Blaze.Html (Html)
import Text.Parsec (option,optional)
import Paths_Elm

1
compiler/Types/Alias.hs
View file

@ -8,7 +8,6 @@ import qualified Data.Map as Map
import qualified Data.Set as Set
import Types.Substitutions (subst)
import Types.Types
import Data.Generics.Uniplate.Data
import Data.Data
builtins :: [(String,([X],Type))]