d7dcf5a · elk · git.iko.soy

git.iko.soy/elk

on master help sign in

Get the whole compiler building again.

d7dcf5aevancz13 years ago

Elm.cabal+59−44

compare with master

unifiedsplit

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

32Library

33 exposed-modules: Language.Elm,

34 Language.Elm.Quasi

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

35+ Hs-Source-Dirs: compiler

36− other-modules: Ast,

36+ other-modules: Unique,

37− Located,

37+ SourceSyntax.Helpers,

38− CompileToJS,

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,

39− Cases,

48+ Generate.Cases,

40− Substitute,

49+ Transform.Substitute,

41− ExtractNoscript,

50+ Transform.Optimize,

42− GenerateHtml,

43− Guid,

44− Libraries,

51+ Metadata.Libraries,

45− LoadLibraries,

52+ Metadata.LoadLibraries,

46− Optimize,

47 Initialize,

53 Initialize,

48− Rename,

49− Parse.Binops,

54+ Parse.Binop,

50− Parse.Expr,

55+ Parse.Expression,

51 Parse.Foreign,

56 Parse.Foreign,

52− Parse.Library,

57+ Parse.Helpers,

53− Parse.Modules,

58+ Parse.Module,

54 Parse.Parser,

59 Parse.Parser,

55− Parse.Patterns,

60+ Parse.Pattern,

56− Parse.Types,

61+ Parse.Type,

57 Types.Alias,

62 Types.Alias,

58 Types.Types,

63 Types.Types,

59 Types.Constrain,

64 Types.Constrain,

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

85Executable elm

90Executable elm

86 Main-is: Compiler.hs

91 Main-is: Compiler.hs

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

92+ Hs-Source-Dirs: compiler

88− other-modules: Ast,

93+ other-modules: Unique,

89− Located,

94+ SourceSyntax.Helpers,

90− CompileToJS,

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,

91− Cases,

105+ Generate.Cases,

92− Substitute,

106+ Transform.Substitute,

93− ExtractNoscript,

107+ Transform.Optimize,

94− GenerateHtml,

95− Guid,

96− Libraries,

108+ Metadata.Libraries,

97− LoadLibraries,

109+ Metadata.LoadLibraries,

98− Optimize,

99 Initialize,

110 Initialize,

100− Rename,

101− Parse.Binops,

111+ Parse.Binop,

102− Parse.Expr,

112+ Parse.Expression,

103 Parse.Foreign,

113 Parse.Foreign,

104− Parse.Library,

114+ Parse.Helpers,

105− Parse.Modules,

115+ Parse.Module,

106 Parse.Parser,

116 Parse.Parser,

107− Parse.Patterns,

117+ Parse.Pattern,

108− Parse.Types,

118+ Parse.Type,

109 Types.Alias,

119 Types.Alias,

110 Types.Types,

120 Types.Types,

111 Types.Constrain,

121 Types.Constrain,

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

134

144

135Executable elm-doc

145Executable elm-doc

136 Main-is: Docs.hs

146 Main-is: Docs.hs

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

147+ Hs-Source-Dirs: compiler

138− other-modules: Ast,

148+ other-modules: SourceSyntax.Helpers,

139− Located,

149+ SourceSyntax.Location,

140− Parse.Library,

150+ SourceSyntax.Literal,

141− Parse.Modules,

151+ SourceSyntax.Pattern,

152+ SourceSyntax.Expression,

153+ SourceSyntax.Declaration,

154+ SourceSyntax.Module,

142− Rename

155+ SourceSyntax.Rename

156+ Parse.Helpers,

157+ Parse.Module

143

158

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

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

145 containers >= 0.3,

160 containers >= 0.3,

compiler/Compiler.hs+5−5

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

17import qualified Text.Jasmine as JS

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

20−import Ast

20+import SourceSyntax.Module

21import Initialize (buildFromSource, getSortedModuleNames)

22−import CompileToJS (jsModule)

22+import Generate.JavaScript (jsModule)

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

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

24−import qualified Libraries as Libraries

24+import qualified Metadata.Libraries as Libraries

25import Paths_Elm

27data Flags =

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

153 buildFiles flags numModules interfaces' rest

154

155

156−exportInfo :: Module -> IO String

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

157exportInfo (Module names exs ims stmts) =

158 do print exs

159 return (show exs)

compiler/Docs.hs+4−4

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

2module Main where

4−import Ast

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

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

6import Data.List (intercalate)

7import Data.Maybe (catMaybes)

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

9−import Parse.Types (datatype)

9+import Parse.Type (datatype)

10−import Parse.Library

10+import Parse.Helpers

11−import Parse.Modules (moduleDef)

11+import Parse.Module (moduleDef)

12import Text.Parsec hiding (newline,spaces)

13import System.Environment

14import System.Exit

compiler/Generate/Html.hs−1

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

15import Text.Jasmine (minify)

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

18−import Ast

19import Initialize (buildFromSource)

18import Initialize (buildFromSource)

20import Generate.JavaScript

19import Generate.JavaScript

21import Generate.Noscript

20import Generate.Noscript

compiler/Language/Elm.hs+4−4

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

14import Data.List (intercalate)

15import Data.Version (showVersion)

16−import CompileToJS (showErr, jsModule)

16+import Generate.JavaScript (showErr, jsModule)

17−import GenerateHtml (generateHtml)

17+import Generate.Html (generateHtml)

18import Initialize (buildFromSource)

19−import Parse.Library

19+import Parse.Helpers

20−import Parse.Modules (moduleDef)

20+import Parse.Module (moduleDef)

21import Text.Blaze.Html (Html)

22import Text.Parsec (option,optional)

23import Paths_Elm

compiler/Types/Alias.hs−1

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

8import qualified Data.Set as Set

9import Types.Substitutions (subst)

10import Types.Types

11−import Data.Generics.Uniplate.Data

12import Data.Data

11import Data.Data

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

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