on master help sign in
Stop holding FilePath in AST.Module
357b7e4Evan Czaplicki
src/AST/Module.hs−1
@@ -66,7 +66,6 @@ defaultHeader start end imports_ =
66data Module phase =
66data Module phase =
67 Module
67 Module
68 { name :: Name.Canonical
68 { name :: Name.Canonical
69− , path :: FilePath
70 , info :: phase
69 , info :: phase
71 }
70 }
72
71
src/Canonicalize/Setup.hs+1−1
@@ -35,7 +35,7 @@ environment
35 -> Module.Interfaces
35 -> Module.Interfaces
36 -> Module.Valid
36 -> Module.Valid
37 -> Result Env.Env
37 -> Result Env.Env
38−environment importDict interfaces (Module.Module name _ info) =
38+environment importDict interfaces (Module.Module name info) =
39 let
39 let
40 (Module.Valid _ _ (defaults, imports) decls effects) =
40 (Module.Valid _ _ (defaults, imports) decls effects) =
41 info
41 info
src/Elm/Compiler.hs+1−1
@@ -127,7 +127,7 @@ data Result =
127
127
128
128
129docsGen :: Bool -> Module.Optimized -> Result.Result () w Error.Error (Maybe Docs.Documentation)
129docsGen :: 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) =
131 if not isExposed then
131 if not isExposed then
132 Result.ok Nothing
132 Result.ok Nothing
133
133
src/Generate/JavaScript.hs+1−1
@@ -21,7 +21,7 @@ import qualified Generate.JavaScript.Variable as Var
21
21
22
22
23generate :: Module.Optimized -> LazyText.Text
23generate :: Module.Optimized -> LazyText.Text
24−generate (Module.Module moduleName _ info) =
24+generate (Module.Module moduleName info) =
25 let
25 let
26 genBody =
26 genBody =
27 do defsList <- mapM JS.generateDef (Module.program info)
27 do defsList <- mapM JS.generateDef (Module.program info)
src/Nitpick/PatternMatches.hs+1−1
@@ -43,7 +43,7 @@ type Result warning a =
43
43
44
44
45patternMatches :: Module.Interfaces -> Module.Canonical -> Result wrn DT.VariantDict
45patternMatches :: Module.Interfaces -> Module.Canonical -> Result wrn DT.VariantDict
46−patternMatches interfaces (Module.Module name _ info) =
46+patternMatches interfaces (Module.Module name info) =
47 let
47 let
48 arityDict =
48 arityDict =
49 toArityDict interfaces name (Module.unions info)
49 toArityDict interfaces name (Module.unions info)
src/Parse/Parse.hs+1−1
@@ -37,7 +37,7 @@ chompProgram pkgName =
37 endOfFile
37 endOfFile
38 let moduleName = ModuleName.Canonical pkgName name
38 let moduleName = ModuleName.Canonical pkgName name
39 let source = Module.Source tag settings docs exports imports decls
39 let source = Module.Source tag settings docs exports imports decls
40− return (Module.Module moduleName "" source)
40+ return (Module.Module moduleName source)
41
41
42
42
43chompDeclarations :: [Decl.Source] -> Parser [Decl.Source]
43chompDeclarations :: [Decl.Source] -> Parser [Decl.Source]
src/Type/Inference.hs+1−1
@@ -86,7 +86,7 @@ canonicalizeValues env (moduleName, iface) =
86
86
87
87
88canonicalizeUnions :: Module.Interfaces -> Module.Canonical -> [Module.CanonicalUnion]
88canonicalizeUnions :: Module.Interfaces -> Module.Canonical -> [Module.CanonicalUnion]
89−canonicalizeUnions interfaces (Module.Module name _ info) =
89+canonicalizeUnions interfaces (Module.Module name info) =
90 localUnions ++ importedUnions
90 localUnions ++ importedUnions
91 where
91 where
92 localUnions :: [Module.CanonicalUnion]
92 localUnions :: [Module.CanonicalUnion]
src/Validate.hs+2−2
@@ -37,7 +37,7 @@ type Result warning a =
37
37
38
38
39validate :: Module.Source -> Result wrn Module.Valid
39validate :: Module.Source -> Result wrn Module.Valid
40−validate (Module.Module name path info) =
40+validate (Module.Module name info) =
41 let
41 let
42 (ModuleName.Canonical pkgName _) =
42 (ModuleName.Canonical pkgName _) =
43 name
43 name
@@ -49,7 +49,7 @@ validate (Module.Module name path info) =
49
49
50 validEffects <- validateEffects tag settings ports (D._defs structure)
50 validEffects <- validateEffects tag settings ports (D._defs structure)
51
51
52− return $ Module.Module name path $
52+ return $ Module.Module name $
53 Module.Valid docs exports (addDefaults pkgName imports) structure validEffects
53 Module.Valid docs exports (addDefaults pkgName imports) structure validEffects
54
54
55
55