9fdb02b · elk · git.iko.soy

Merge branch 'master' of https://github.com/elm-lang/elm-compiler into bench

commit9fdb02becd4b01818b6fc23f29a3a413a1a44cba authorjmite <jmitdase@gmail.com> dateFri 21 Aug 2015, 09:48 (11 years ago) parentddf9017 4d7e3f6

2 files changed+14−3

unifiedsplit

src/Canonicalize/Setup.hs+3−3

@@ -56,11 +56,11 @@ importPatches

5656 -> Result.ResultErr [Env.Patch]

5757importPatches allInterfaces (A.A region (importName, method)) =

5858 case restrictToPublicApi <$> Map.lookup importName allInterfaces of

59− Nothing

60− | Module.nameIsNative importName ->

59+ Nothing ->

60+ if Module.nameIsNative importName then

6161 Result.ok []

6262

63− | otherwise ->

63+ else

6464 allInterfaces

6565 |> Map.keys

6666 |> Error.nearbyNames Module.nameToString importName

src/Elm/Compiler/Module.hs+11

@@ -11,6 +11,7 @@ module Elm.Compiler.Module

1111

1212import Control.Monad (mzero)

1313import qualified Data.Aeson as Json

14+import Data.Binary

1415import qualified Data.Char as Char

1516import qualified Data.List as List

1617import qualified Data.Map as Map

@@ -110,3 +111,13 @@ instance Json.FromJSON Name where

110111 Just name -> return name

111112

112113 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