0354fad · elk · git.iko.soy

Explicitly list imports for a module.

commit0354fad128d5025b2c88b9abf6a5c599d193eb3c authorevancz <info@elm-lang.org> dateFri 5 Apr 2013, 09:56 (14 years ago) parentd7948ad

3 files changed+4−3

unifiedsplit

compiler/Language/Elm.hs+1−1

@@ -23,7 +23,7 @@ import qualified Ast as Ast

2323import qualified Libraries as Libraries

2424import Data.List (intercalate)

2525import Data.Version (showVersion)

26−import CompileToJS

26+import CompileToJS (showErr, jsModule)

2727import ExtractNoscript

2828import GenerateHtml

2929import Initialize

compiler/Types/Constrain.hs+2−1

@@ -25,7 +25,8 @@ getAliases imports hints = hints ++ concatMap aliasesFrom imports

2525 where aliasesFrom (name,method) =

2626 let values = concatMap (getValue name) hints

2727 in case method of

28− As alias -> map (\(n,t) -> (alias ++ "." ++ n, t)) values

28+ As alias -> if alias == name then [] else

29+ map (\(n,t) -> (alias ++ "." ++ n, t)) values

2930 Hiding vs -> filter (\(n,t) -> n `notElem` vs) values

3031 Importing vs -> filter (\(n,t) -> n `elem` vs) values

3132 getValue inModule (name,tipe) =

libraries/List.elm+1−1

@@ -9,7 +9,7 @@ import Native.List as L

99(::) : a -> [a] -> [a]

1010

1111-- Appends two lists.

12−(++) : [a] -> [a] -> [a]

12+-- (++) : [a] -> [a] -> [a]

1313

1414-- Extract the first element of a list. List must be non-empty.

1515head : [a] -> a