git.iko.soy/elk
on master help sign in
Switch to Data.Utf8 and Elm.Version modules
commit7feccac31b0422160831e6f86f19e66ccf2c3b31 authorEvan Czaplicki <evancz@users.noreply.github.com> dateSat 29 Dec 2018, 19:26 (8 years ago) parent3f6492f
4 files changed+14−17
compare with master
unifiedsplit
builder/src/Reporting/Exit/Compile.hs+5−6 terminal/src/Init.hs+4−4 terminal/src/Main.hs+2−3 terminal/src/Terminal/Args.hs+3−4
builder/src/Reporting/Exit/Compile.hs+5−6
@@ -9,7 +9,6 @@ module Reporting.Exit.Compile
99
1010
1111import qualified Data.List as List
12−import qualified Data.Text as Text
1312import qualified Data.Time.Clock as Time
1413
1514import qualified Elm.Compiler as Compiler
@@ -27,7 +26,7 @@ data Exit =
2726 { _name :: ModuleName.Raw
2827 , _path :: FilePath
2928 , _time :: Time.UTCTime
30− , _source :: Text.Text
29+ , _source :: String
3130 , _errors :: [Compiler.Error]
3231 }
3332
@@ -71,13 +70,13 @@ exitToDoc (Exit _name path _time source errors) =
7170separator :: ModuleName.Raw -> ModuleName.Raw -> D.Doc
7271separator beforeName afterName =
7372 let
74− before = ModuleName.nameToString beforeName ++ " ↑ "
75− after = " ↓ " ++ ModuleName.nameToString afterName
73+ before = ModuleName.nameToChars beforeName ++ " ↑ "
74+ after = " ↓ " ++ ModuleName.nameToChars afterName
7675 in
7776 D.dullred $ D.vcat $
78− [ D.indent (80 - length before) (D.fromString before)
77+ [ D.indent (80 - length before) (D.fromChars before)
7978 , "====o======================================================================o===="
80− , D.fromString after
79+ , D.fromChars after
8180 , D.empty
8281 , D.empty
8382 ]
terminal/src/Init.hs+4−4
@@ -13,10 +13,10 @@ import qualified System.Directory as Dir
1313import qualified Deps.Cache as Cache
1414import qualified Deps.Explorer as Explorer
1515import qualified Deps.Solver as Solver
16−import qualified Elm.Compiler.Version as Compiler
16+import qualified Elm.Constraint as Con
1717import qualified Elm.Package as Pkg
18−import qualified Elm.Project.Constraint as Con
1918import qualified Elm.Project.Json as Project
19+import qualified Elm.Version as V
2020import qualified Reporting.Doc as D
2121import qualified Reporting.Exit as Exit
2222import qualified Reporting.Exit.Init as E
@@ -58,7 +58,7 @@ question =
5858 \ my project? How do I see it in the browser? How will my code grow? Do I need\
5959 \ more directories? What about tests? Etc."
6060 , D.fillSep
61− ["Check","out",D.cyan (D.fromString (D.makeLink "init"))
61+ ["Check","out",D.cyan (D.fromChars (D.makeLink "init"))
6262 ,"for","all","the","answers!"
6363 ]
6464 , "Knowing all that, would you like me to create an elm.json file now? [Y/n]: "
@@ -85,7 +85,7 @@ init =
8585 liftIO $
8686 do Dir.createDirectoryIfMissing True "src"
8787 Project.write "." $ Project.App $
88− Project.AppInfo Compiler.version ["src"] directs indirects Map.empty Map.empty
88+ Project.AppInfo V.compiler ["src"] directs indirects Map.empty Map.empty
8989
9090 Nothing ->
9191 Task.throw (Exit.Init (E.NoSolution (Map.keys defaults)))
terminal/src/Main.hs+2−3
@@ -12,9 +12,8 @@ import qualified Text.PrettyPrint.ANSI.Leijen as P
1212import Text.PrettyPrint.ANSI.Leijen ((<>))
1313import Text.Read (readMaybe)
1414
15−import qualified Elm.Compiler as Compiler
1615import qualified Elm.Diff as Diff
17−import qualified Elm.Package as Pkg
16+import qualified Elm.Version as V
1817import qualified Generate.Output as Output
1918import Terminal.Args
2019import Terminal.Args.Helpers
@@ -54,7 +53,7 @@ intro =
5453 [ P.fillSep
5554 ["Hi,","thank","you","for","trying","out"
5655 ,P.green "Elm"
57− ,P.green (P.text (Pkg.versionToString Compiler.version)) <> "."
56+ ,P.green (P.text (V.toChars V.compiler)) <> "."
5857 ,"I hope you like it!"
5958 ]
6059 , ""
terminal/src/Terminal/Args.hs+3−4
@@ -24,8 +24,7 @@ import System.IO (hPutStr, hPutStrLn, stdout)
2424import qualified Text.PrettyPrint.ANSI.Leijen as P
2525import qualified Text.Read as Read
2626
27−import qualified Elm.Compiler as Compiler
28−import qualified Elm.Package as Pkg
27+import qualified Elm.Version as V
2928import Terminal.Args.Internal
3029import qualified Terminal.Args.Chomp as Chomp
3130import qualified Terminal.Args.Error as Error
@@ -40,7 +39,7 @@ simple details example args_ flags_ callback =
4039 do argStrings <- Env.getArgs
4140 case argStrings of
4241 ["--version"] ->
43− do hPutStrLn stdout (Pkg.versionToString Compiler.version)
42+ do hPutStrLn stdout (V.toChars V.compiler)
4443 Exit.exitSuccess
4544
4645 chunks ->
@@ -67,7 +66,7 @@ complex intro outro interfaces =
6766 Error.exitWithOverview intro outro interfaces
6867
6968 ["--version"] ->
70− do hPutStrLn stdout (Pkg.versionToString Compiler.version)
69+ do hPutStrLn stdout (V.toChars V.compiler)
7170 Exit.exitSuccess
7271
7372 command : chunks ->