d7dcf5a · elk · git.iko.soy

git.iko.soy/elk

Get the whole compiler building again.

commitd7dcf5a9e804156feda9294e317ac070ba129da5 authorevancz <info@elm-lang.org> dateThu 13 Jun 2013, 22:59 (13 years ago) parent721ce4f

6 files changed+72−59

compare with master

unifiedsplit

Elm.cabal+59−44 compiler/Compiler.hs+5−5 compiler/Docs.hs+4−4 compiler/Generate/Html.hs−1 compiler/Language/Elm.hs+4−4 compiler/Types/Alias.hs−1

Elm.cabal+59−44

@@ -32,28 +32,33 @@ source-repository head

3232Library

3333 exposed-modules: Language.Elm,

3434 Language.Elm.Quasi

35− Hs-Source-Dirs: compiler, compiler/Gen, compiler/Model, compiler/Transform

36− other-modules: Ast,

37− Located,

38− CompileToJS,

39− Cases,

40− Substitute,

41− ExtractNoscript,

42− GenerateHtml,

43− Guid,

44− Libraries,

45− LoadLibraries,

46− Optimize,

35+ Hs-Source-Dirs: compiler

36+ other-modules: Unique,

37+ SourceSyntax.Helpers,

38+ SourceSyntax.Location,

39+ SourceSyntax.Literal,

40+ SourceSyntax.Pattern,

41+ SourceSyntax.Expression,

42+ SourceSyntax.Declaration,

43+ SourceSyntax.Module,

44+ SourceSyntax.Rename

45+ Generate.JavaScript,

46+ Generate.Noscript,

47+ Generate.Html,

48+ Generate.Cases,

49+ Transform.Substitute,

50+ Transform.Optimize,

51+ Metadata.Libraries,

52+ Metadata.LoadLibraries,

4753 Initialize,

48− Rename,

49− Parse.Binops,

50− Parse.Expr,

54+ Parse.Binop,

55+ Parse.Expression,

5156 Parse.Foreign,

52− Parse.Library,

53− Parse.Modules,

57+ Parse.Helpers,

58+ Parse.Module,

5459 Parse.Parser,

55− Parse.Patterns,

56− Parse.Types,

60+ Parse.Pattern,

61+ Parse.Type,

5762 Types.Alias,

5863 Types.Types,

5964 Types.Constrain,

@@ -84,28 +89,33 @@ Library

8489

8590Executable elm

8691 Main-is: Compiler.hs

87− Hs-Source-Dirs: compiler, compiler/Gen, compiler/Model, compiler/Transform

88− other-modules: Ast,

89− Located,

90− CompileToJS,

91− Cases,

92− Substitute,

93− ExtractNoscript,

94− GenerateHtml,

95− Guid,

96− Libraries,

97− LoadLibraries,

98− Optimize,

92+ Hs-Source-Dirs: compiler

93+ other-modules: Unique,

94+ SourceSyntax.Helpers,

95+ SourceSyntax.Location,

96+ SourceSyntax.Literal,

97+ SourceSyntax.Pattern,

98+ SourceSyntax.Expression,

99+ SourceSyntax.Declaration,

100+ SourceSyntax.Module,

101+ SourceSyntax.Rename

102+ Generate.JavaScript,

103+ Generate.Noscript,

104+ Generate.Html,

105+ Generate.Cases,

106+ Transform.Substitute,

107+ Transform.Optimize,

108+ Metadata.Libraries,

109+ Metadata.LoadLibraries,

99110 Initialize,

100− Rename,

101− Parse.Binops,

102− Parse.Expr,

111+ Parse.Binop,

112+ Parse.Expression,

103113 Parse.Foreign,

104− Parse.Library,

105− Parse.Modules,

114+ Parse.Helpers,

115+ Parse.Module,

106116 Parse.Parser,

107− Parse.Patterns,

108− Parse.Types,

117+ Parse.Pattern,

118+ Parse.Type,

109119 Types.Alias,

110120 Types.Types,

111121 Types.Constrain,

@@ -134,12 +144,17 @@ Executable elm

134144

135145Executable elm-doc

136146 Main-is: Docs.hs

137− Hs-Source-Dirs: compiler, compiler/Model, compiler/Transform

138− other-modules: Ast,

139− Located,

140− Parse.Library,

141− Parse.Modules,

142− Rename

147+ Hs-Source-Dirs: compiler

148+ other-modules: SourceSyntax.Helpers,

149+ SourceSyntax.Location,

150+ SourceSyntax.Literal,

151+ SourceSyntax.Pattern,

152+ SourceSyntax.Expression,

153+ SourceSyntax.Declaration,

154+ SourceSyntax.Module,

155+ SourceSyntax.Rename

156+ Parse.Helpers,

157+ Parse.Module

143158

144159 Build-depends: base >=4.2 && <5,

145160 containers >= 0.3,

compiler/Compiler.hs+5−5

@@ -17,11 +17,11 @@ import qualified Text.Blaze.Html.Renderer.String as Normal

1717import qualified Text.Jasmine as JS

1818import qualified Data.ByteString.Lazy.Char8 as BS

1919

20−import Ast

20+import SourceSyntax.Module

2121import Initialize (buildFromSource, getSortedModuleNames)

22−import CompileToJS (jsModule)

23−import GenerateHtml (createHtml, JSStyle(..), JSSource(..))

24−import qualified Libraries as Libraries

22+import Generate.JavaScript (jsModule)

23+import Generate.Html (createHtml, JSStyle(..), JSSource(..))

24+import qualified Metadata.Libraries as Libraries

2525import Paths_Elm

2626

2727data Flags =

@@ -153,7 +153,7 @@ buildFiles flags numModules interfaces (filePath:rest) = do

153153 buildFiles flags numModules interfaces' rest

154154

155155

156−exportInfo :: Module -> IO String

156+exportInfo :: Module t v -> IO String

157157exportInfo (Module names exs ims stmts) =

158158 do print exs

159159 return (show exs)

compiler/Docs.hs+4−4

@@ -1,14 +1,14 @@

22module Main where

4−import Ast

4+import SourceSyntax.Declaration (Declaration(Datatype))

55import Control.Applicative ((<$>), (<*>))

66import Data.List (intercalate)

77import Data.Maybe (catMaybes)

88import Types.Types ((==>), Type ( ADT, VarT ) )

9−import Parse.Types (datatype)

10−import Parse.Library

11−import Parse.Modules (moduleDef)

9+import Parse.Type (datatype)

10+import Parse.Helpers

11+import Parse.Module (moduleDef)

1212import Text.Parsec hiding (newline,spaces)

1313import System.Environment

1414import System.Exit

compiler/Generate/Html.hs−1

@@ -15,7 +15,6 @@ import qualified Text.Blaze.Html5.Attributes as A

1515import Text.Jasmine (minify)

1616import qualified Data.ByteString.Lazy.Char8 as BS

1717

18−import Ast

1918import Initialize (buildFromSource)

2019import Generate.JavaScript

2120import Generate.Noscript

compiler/Language/Elm.hs+4−4

@@ -13,11 +13,11 @@ module Language.Elm (compile, toHtml, moduleName, runtime, docs) where

1313

1414import Data.List (intercalate)

1515import Data.Version (showVersion)

16−import CompileToJS (showErr, jsModule)

17−import GenerateHtml (generateHtml)

16+import Generate.JavaScript (showErr, jsModule)

17+import Generate.Html (generateHtml)

1818import Initialize (buildFromSource)

19−import Parse.Library

20−import Parse.Modules (moduleDef)

19+import Parse.Helpers

20+import Parse.Module (moduleDef)

2121import Text.Blaze.Html (Html)

2222import Text.Parsec (option,optional)

2323import Paths_Elm

compiler/Types/Alias.hs−1

@@ -8,7 +8,6 @@ import qualified Data.Map as Map

88import qualified Data.Set as Set

99import Types.Substitutions (subst)

1010import Types.Types

11−import Data.Generics.Uniplate.Data

1211import Data.Data

1312

1413builtins :: [(String,([X],Type))]