a950bc5 · elk · git.iko.soy

git.iko.soy/elk

Don't expose Elm.Compiler.Version

commita950bc5f7ab00f8c5c31f5129c3dc753a13405c7 authorjmite <jmitdase@gmail.com> dateThu 27 Aug 2015, 12:41 (11 years ago) parent0fccc0e

7 files changed+24−16

compare with master

unifiedsplit

elm-compiler.cabal+1−1 src/AST/Module.hs+2−1 src/CommandLineRouter.hs+2−2 src/Elm/Compiler.hs+10−1 src/Elm/Compiler/Version.hs+3−7 src/Elm/Docs.hs+2−1 src/Elm/Utils.hs+4−3

elm-compiler.cabal+1−1

@@ -42,7 +42,6 @@ Library

4242 Elm.Compiler,

4343 Elm.Compiler.Module,

4444 Elm.Compiler.Type,

45− Elm.Compiler.Version,

4645 Elm.Docs,

4746 Elm.Package,

4847 Elm.Utils

@@ -75,6 +74,7 @@ Library

7574 Docs.Check,

7675 Elm.Compiler.Imports,

7776 Elm.Compiler.Type.Extract,

77+ Elm.Compiler.Version,

7878 Generate.JavaScript,

7979 Generate.JavaScript.Crash,

8080 Generate.JavaScript.Helpers,

src/AST/Module.hs+2−1

@@ -21,6 +21,7 @@ import qualified AST.Expression.Optimized as Optimized

2121import qualified AST.Type as Type

2222import qualified AST.Variable as Var

2323import qualified Docs.AST as Docs

24+import qualified Elm.Package as Package

2425import qualified Elm.Compiler.Version as Compiler

2526import qualified Reporting.Annotation as A

2627

@@ -142,7 +143,7 @@ toInterface :: CanonicalModule -> Interface

142143toInterface modul =

143144 let body' = body modul in

144145 Interface

145− { iVersion = Compiler.version

146+ { iVersion = Package.versionToString Compiler.version

146147 , iExports = exports modul

147148 , iTypes = types body'

148149 , iImports = imports modul

src/CommandLineRouter.hs+2−2

@@ -7,7 +7,7 @@ import System.IO (hPutStrLn, stderr, stdin, stdout)

77import qualified System.Process as Proc

99import qualified Elm.Compiler.Version as Compiler

10−

10+import qualified Elm.Package as Pkg

1111

1212main :: IO ()

1313main =

@@ -47,7 +47,7 @@ attemptToRun command args =

4747

4848usageMessage :: String

4949usageMessage =

50− "Elm Platform " ++ Compiler.version ++ " - a way to run all Elm tools\n\

50+ "Elm Platform " ++ (Pkg.versionToString Compiler.version) ++ " - a way to run all Elm tools\n\

5151 \\n\

5252 \Usage: elm <command> [<args>]\n\

5353 \\n\

src/Elm/Compiler.hs+10−1

@@ -1,6 +1,7 @@

11{-# OPTIONS_GHC -Wall #-}

22module Elm.Compiler

3− ( parseDependencies

3+ ( version

4+ , parseDependencies

45 , compile, Context(..), Result(..)

56 , Dealiaser, dummyDealiaser

67 , Error, errorToString, errorToJson, printError

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

1314import qualified AST.Module as Module

1415import qualified Compile

1516import qualified Docs.Check as Docs

17+import qualified Elm.Compiler.Version

1618import qualified Elm.Compiler.Module as PublicModule

1719import qualified Elm.Docs as Docs

1820import qualified Elm.Package as Package

@@ -27,6 +29,13 @@ import qualified Reporting.Result as Result

2729import qualified Reporting.Warning as Warning

2830

2931

32+-- VERSION

33+

34+version :: Package.Version

35+version =

36+ Elm.Compiler.Version.version

37+

38+

3039-- DEPENDENCIES

3140

3241parseDependencies

src/Elm/Compiler/Version.hs+3−7

@@ -1,21 +1,17 @@

11{-# OPTIONS_GHC -Wall #-}

2−module Elm.Compiler.Version (version, elm) where

2+module Elm.Compiler.Version (version) where

44import qualified Data.Version as Version

55import qualified Paths_elm_compiler as This

66import Elm.Package

8−version :: String

9−version =

10− Version.showVersion This.version

11−

128

139rawVersion :: [Int]

1410rawVersion =

1511 Version.versionBranch This.version

1612

17−elm :: Version

18−elm =

13+version :: Version

14+version =

1915 case rawVersion of

2016 major : minor : patch : _ ->

2117 Version major minor patch

src/Elm/Docs.hs+2−1

@@ -14,6 +14,7 @@ import qualified Docs.AST as Docs

1414import qualified Elm.Compiler.Module as Module

1515import qualified Elm.Compiler.Type as Type

1616import qualified Elm.Compiler.Version as Version

17+import qualified Elm.Package as Pkg

1718import qualified Reporting.Annotation as A

1819

1920

@@ -75,7 +76,7 @@ fromCheckedDocs name (Docs.Docs comment aliases unions values) =

7576 (map toAlias (Map.toList aliases))

7677 (map toUnion (Map.toList unions))

7778 (map toValue (Map.toList values))

78− (Version Version.version)

79+ (Version $ (Pkg.versionToString Version.version))

7980

8081

8182-- PRETTY JSON

src/Elm/Utils.hs+4−3

@@ -20,6 +20,7 @@ import System.Process (readProcessWithExitCode)

2020import qualified AST.Expression.Source as Source

2121import qualified AST.Pattern as Pattern

2222import qualified Elm.Compiler.Version as Version

23+import qualified Elm.Package as Pkg

2324import qualified Parse.Helpers as Parse

2425import qualified Parse.Expression as Parse

2526import qualified Reporting.Annotation as A

@@ -127,8 +128,8 @@ errorNotFound name =

127128 , ""

128129 , " * On Mac it is /usr/local/share/elm"

129130 , " * On Windows it is one of the following:"

130− , " C:/Program Files/Elm Platform/" ++ Version.version ++ "/share"

131− , " C:/Program Files (x86)/Elm Platform/" ++ Version.version ++ "/share"

131+ , " C:/Program Files/Elm Platform/" ++ (Pkg.versionToString Version.version) ++ "/share"

132+ , " C:/Program Files (x86)/Elm Platform/" ++ (Pkg.versionToString Version.version) ++ "/share"

132133 , ""

133134 , "If you installed using npm, you have to set ELM_HOME to a certain directory"

134135 , "of the form .../node_modules/elm/share"

@@ -147,4 +148,4 @@ isDeclaration string =

147148 Just (List.intercalate "$" (Pattern.boundVarList pattern))

148149

149150 _ ->

150− Nothing

151+ Nothing