git.iko.soy/elk
on master help sign in
Merge branch 'master' of https://github.com/elm-lang/elm-compiler into bench
9fdb02bjmite
src/Canonicalize/Setup.hs+3−3
compare with master
unifiedsplit
@@ -56,11 +56,11 @@ importPatches
56 -> Result.ResultErr [Env.Patch]
56 -> Result.ResultErr [Env.Patch]
57importPatches allInterfaces (A.A region (importName, method)) =
57importPatches allInterfaces (A.A region (importName, method)) =
58 case restrictToPublicApi <$> Map.lookup importName allInterfaces of
58 case restrictToPublicApi <$> Map.lookup importName allInterfaces of
59− Nothing
59+ Nothing ->
60− | Module.nameIsNative importName ->
60+ if Module.nameIsNative importName then
61 Result.ok []
61 Result.ok []
62
62
63− | otherwise ->
63+ else
64 allInterfaces
64 allInterfaces
65 |> Map.keys
65 |> Map.keys
66 |> Error.nearbyNames Module.nameToString importName
66 |> Error.nearbyNames Module.nameToString importName
src/Elm/Compiler/Module.hs+11
@@ -11,6 +11,7 @@ module Elm.Compiler.Module
11
11
12import Control.Monad (mzero)
12import Control.Monad (mzero)
13import qualified Data.Aeson as Json
13import qualified Data.Aeson as Json
14+import Data.Binary
14import qualified Data.Char as Char
15import qualified Data.Char as Char
15import qualified Data.List as List
16import qualified Data.List as List
16import qualified Data.Map as Map
17import qualified Data.Map as Map
@@ -110,3 +111,13 @@ instance Json.FromJSON Name where
110 Just name -> return name
111 Just name -> return name
111
112
112 parseJSON _ = mzero
113 parseJSON _ = mzero
114+
115+
116+-- BINARY for NAME
117+
118+instance Binary Name where
119+ get =
120+ fmap Name get
121+
122+ put (Name names) =
123+ put names