357b7e4 · elk · git.iko.soy

git.iko.soy/elk

Stop holding FilePath in AST.Module

This is not used anywhere. Not all source you want to compile is from a file. That kind of detail can be handled in builder or cli.

commit357b7e48b11667b315d82793339d4c8fe889468d authorEvan Czaplicki <evancz@users.noreply.github.com> dateFri 17 Mar 2017, 15:05 (10 years ago) parentb5b685e

8 files changed+8−9

compare with master

unifiedsplit

src/AST/Module.hs−1 src/Canonicalize/Setup.hs+1−1 src/Elm/Compiler.hs+1−1 src/Generate/JavaScript.hs+1−1 src/Nitpick/PatternMatches.hs+1−1 src/Parse/Parse.hs+1−1 src/Type/Inference.hs+1−1 src/Validate.hs+2−2

src/AST/Module.hs−1

@@ -66,7 +66,6 @@ defaultHeader start end imports_ =

6666data Module phase =

6767 Module

6868 { name :: Name.Canonical

69− , path :: FilePath

7069 , info :: phase

7170 }

7271

src/Canonicalize/Setup.hs+1−1

@@ -35,7 +35,7 @@ environment

3535 -> Module.Interfaces

3636 -> Module.Valid

3737 -> Result Env.Env

38−environment importDict interfaces (Module.Module name _ info) =

38+environment importDict interfaces (Module.Module name info) =

3939 let

4040 (Module.Valid _ _ (defaults, imports) decls effects) =

4141 info

src/Elm/Compiler.hs+1−1

@@ -127,7 +127,7 @@ data Result =

127127

128128

129129docsGen :: Bool -> Module.Optimized -> Result.Result () w Error.Error (Maybe Docs.Documentation)

130−docsGen isExposed (Module.Module name _ info) =

130+docsGen isExposed (Module.Module name info) =

131131 if not isExposed then

132132 Result.ok Nothing

133133

src/Generate/JavaScript.hs+1−1

@@ -21,7 +21,7 @@ import qualified Generate.JavaScript.Variable as Var

2121

2222

2323generate :: Module.Optimized -> LazyText.Text

24−generate (Module.Module moduleName _ info) =

24+generate (Module.Module moduleName info) =

2525 let

2626 genBody =

2727 do defsList <- mapM JS.generateDef (Module.program info)

src/Nitpick/PatternMatches.hs+1−1

@@ -43,7 +43,7 @@ type Result warning a =

4343

4444

4545patternMatches :: Module.Interfaces -> Module.Canonical -> Result wrn DT.VariantDict

46−patternMatches interfaces (Module.Module name _ info) =

46+patternMatches interfaces (Module.Module name info) =

4747 let

4848 arityDict =

4949 toArityDict interfaces name (Module.unions info)

src/Parse/Parse.hs+1−1

@@ -37,7 +37,7 @@ chompProgram pkgName =

3737 endOfFile

3838 let moduleName = ModuleName.Canonical pkgName name

3939 let source = Module.Source tag settings docs exports imports decls

40− return (Module.Module moduleName "" source)

40+ return (Module.Module moduleName source)

4141

4242

4343chompDeclarations :: [Decl.Source] -> Parser [Decl.Source]

src/Type/Inference.hs+1−1

@@ -86,7 +86,7 @@ canonicalizeValues env (moduleName, iface) =

8686

8787

8888canonicalizeUnions :: Module.Interfaces -> Module.Canonical -> [Module.CanonicalUnion]

89−canonicalizeUnions interfaces (Module.Module name _ info) =

89+canonicalizeUnions interfaces (Module.Module name info) =

9090 localUnions ++ importedUnions

9191 where

9292 localUnions :: [Module.CanonicalUnion]

src/Validate.hs+2−2

@@ -37,7 +37,7 @@ type Result warning a =

3737

3838

3939validate :: Module.Source -> Result wrn Module.Valid

40−validate (Module.Module name path info) =

40+validate (Module.Module name info) =

4141 let

4242 (ModuleName.Canonical pkgName _) =

4343 name

@@ -49,7 +49,7 @@ validate (Module.Module name path info) =

4949

5050 validEffects <- validateEffects tag settings ports (D._defs structure)

5151

52− return $ Module.Module name path $

52+ return $ Module.Module name $

5353 Module.Valid docs exports (addDefaults pkgName imports) structure validEffects

5454

5555