git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Remove importedFilenames field of PSCiState

It's not really needed, as that information is already available via the _pcsiLoadedModules field. Additionally: - Change the Either P.RebuildPolicy FilePath to a simple FilePath. We were never actually storing Lefts in there. - Change the _psciLoadedModules to a Map mapping each filename to a list of modules. This way, we avoid accidentally creating duplicate modules (which aren't really duplicates).

commitf835dcdfdc750bf59e4dac9bceb905765753ee36 authorHarry Garrood <harry@garrood.me> dateFri 18 Dec 2015, 22:12 (11 years ago) parente66c773
3 files changed+49−56
compare with golang
unifiedsplit
psci/PSCi.hs+17−18 psci/Types.hs+31−37 psci/tests/Main.hs+1−1
psci/PSCi.hs+17−18
@@ -113,12 +113,12 @@ loadModule filename = do
113113-- |
114114-- Load all modules.
115115--
116−loadAllModules :: [FilePath] -> IO (Either P.MultipleErrors [(Either P.RebuildPolicy FilePath, P.Module)])
116+loadAllModules :: [FilePath] -> IO (Either P.MultipleErrors [(FilePath, P.Module)])
117117loadAllModules files = do
118118 filesAndContent <- forM files $ \filename -> do
119119 content <- readFile filename
120− return (Right filename, content)
121− return $ P.parseModulesFromFiles (either (const "") id) filesAndContent
120+ return (filename, content)
121+ return $ P.parseModulesFromFiles id filesAndContent
122122
123123-- |
124124-- Load all modules, updating the application state
@@ -248,13 +248,14 @@ makeIO f io = do
248248 e <- liftIO $ tryIOError io
249249 either (throwError . P.singleError . f) return e
250250
251−make :: PSCiState -> [(Either P.RebuildPolicy FilePath, P.Module)] -> P.Make P.Environment
252−make st@PSCiState{..} ms = P.make actions' (map snd (loadedModules ++ ms))
251+make :: PSCiState -> [P.Module] -> P.Make P.Environment
252+make st@PSCiState{..} ms = P.make actions' (map snd loadedModules ++ ms)
253253 where
254− filePathMap = M.fromList $ (first P.getModuleName . swap) `map` (loadedModules ++ ms)
254+ filePathMap = M.fromList $ (first P.getModuleName . swap) `map` allModules
255255 actions = P.buildMakeActions modulesDir filePathMap psciForeignFiles False
256256 actions' = actions { P.progress = const (return ()) }
257257 loadedModules = psciLoadedModules st
258+ allModules = map (first Right) loadedModules ++ map (Left P.RebuildAlways,) ms
258259
259260-- |
260261-- Takes a value declaration and evaluates it with the current state.
@@ -264,7 +265,7 @@ handleDeclaration val = do
264265 st <- PSCI $ lift get
265266 let m = createTemporaryModule True st val
266267 let nodeArgs = psciNodeFlags st ++ [indexFile]
267− e <- psciIO . runMake $ make st [(Left P.RebuildAlways, supportModule), (Left P.RebuildAlways, m)]
268+ e <- psciIO . runMake $ make st [supportModule, m]
268269 case e of
269270 Left errs -> printErrors errs
270271 Right _ -> do
@@ -285,7 +286,7 @@ handleDecls ds = do
285286 st <- PSCI $ lift get
286287 let st' = updateLets ds st
287288 let m = createTemporaryModule False st' (P.ObjectLiteral [])
288− e <- psciIO . runMake $ make st' [(Left P.RebuildAlways, m)]
289+ e <- psciIO . runMake $ make st' [m]
289290 case e of
290291 Left err -> printErrors err
291292 Right _ -> PSCI $ lift (put st')
@@ -341,7 +342,7 @@ handleImport :: ImportedModule -> PSCI ()
341342handleImport im = do
342343 st <- updateImportedModules im <$> PSCI (lift get)
343344 let m = createTemporaryModuleForImports st
344− e <- psciIO . runMake $ make st [(Left P.RebuildAlways, m)]
345+ e <- psciIO . runMake $ make st [m]
345346 case e of
346347 Left errs -> printErrors errs
347348 Right _ -> do
@@ -355,7 +356,7 @@ handleTypeOf :: P.Expr -> PSCI ()
355356handleTypeOf val = do
356357 st <- PSCI $ lift get
357358 let m = createTemporaryModule False st val
358− e <- psciIO . runMake $ make st [(Left P.RebuildAlways, m)]
359+ e <- psciIO . runMake $ make st [m]
359360 case e of
360361 Left errs -> printErrors errs
361362 Right env' ->
@@ -492,7 +493,7 @@ handleKindOf typ = do
492493 st <- PSCI $ lift get
493494 let m = createTemporaryModuleForKind st typ
494495 mName = P.ModuleName [P.ProperName "$PSCI"]
495− e <- psciIO . runMake $ make st [(Left P.RebuildAlways, m)]
496+ e <- psciIO . runMake $ make st [m]
496497 case e of
497498 Left errs -> printErrors errs
498499 Right env' ->
@@ -534,11 +535,10 @@ handleCommand ShowHelp = PSCI $ outputStrLn helpMessage
534535handleCommand (Import im) = handleImport im
535536handleCommand (Decls l) = handleDecls l
536537handleCommand (LoadFile filePath) = whenFileExists filePath $ \absPath -> do
537− PSCI . lift $ modify (updateImportedFiles absPath)
538538 m <- psciIO $ loadModule absPath
539539 case m of
540540 Left err -> PSCI $ outputStrLn err
541− Right mods -> PSCI . lift $ modify (updateModules (map ((,) (Right absPath)) mods))
541+ Right mods -> PSCI . lift $ modify (updateModules (map (absPath,) mods))
542542handleCommand (LoadForeign filePath) = whenFileExists filePath $ \absPath -> do
543543 foreignsOrError <- psciIO . runMake $ do
544544 foreignFile <- makeIO (const (P.ErrorMessage [] $ P.CannotReadFile absPath)) (readFile absPath)
@@ -549,10 +549,9 @@ handleCommand (LoadForeign filePath) = whenFileExists filePath $ \absPath -> do
549549handleCommand ResetState = do
550550 files <- psciImportedFilenames <$> PSCI (lift get)
551551 PSCI . lift . modify $ \st ->
552− (foldl (flip updateImportedFiles) st files)
553− { psciImportedModules = []
554− , psciLetBindings = []
555− }
552+ st { psciImportedModules = []
553+ , psciLetBindings = []
554+ }
556555 loadAllImportedModules
557556handleCommand (TypeOf val) = handleTypeOf val
558557handleCommand (KindOf typ) = handleKindOf typ
@@ -615,7 +614,7 @@ loop PSCiOptions{..} = do
615614 case foreignsOrError of
616615 Left errs -> putStrLn (P.prettyPrintMultipleErrors False errs) >> exitFailure
617616 Right foreigns ->
618− flip evalStateT (mkPSCiState inputFiles [] modules foreigns [] psciInputNodeFlags) . runInputT (setComplete completion settings) $ do
617+ flip evalStateT (mkPSCiState [] modules foreigns [] psciInputNodeFlags) . runInputT (setComplete completion settings) $ do
619618 outputStrLn prologueMessage
620619 traverse_ (traverse_ (runPSCI . handleCommand)) config
621620 modules' <- lift $ gets psciLoadedModules
psci/Types.hs+31−37
@@ -15,8 +15,7 @@
1515
1616module Types where
1717
18−import Data.Set (Set)
19−import qualified Data.Set as Set
18+import Control.Arrow (second)
2019import Data.Map (Map)
2120import qualified Data.Map as Map
2221import qualified Language.PureScript as P
@@ -35,34 +34,25 @@ data PSCiOptions = PSCiOptions
3534-- because it makes more sense to apply the binding to the final evaluated expression.
3635--
3736data PSCiState = PSCiState
38− { _psciImportedFilenames :: Set FilePath
39− , psciImportedModules :: [ImportedModule]
40− , _psciLoadedModules :: Map P.ModuleName (Either P.RebuildPolicy FilePath, P.Module)
37+ { psciImportedModules :: [ImportedModule]
38+ , _psciLoadedModules :: Map FilePath [P.Module]
4139 , psciForeignFiles :: Map P.ModuleName FilePath
4240 , psciLetBindings :: [P.Declaration]
4341 , psciNodeFlags :: [String]
4442 }
4543
46−-- Public psci state accessors
47−
48−-- | Get the imported filenames as a list.
49−psciImportedFilenames :: PSCiState -> [FilePath]
50−psciImportedFilenames = Set.toList . _psciImportedFilenames
51−
52−-- | Get the loaded modules as a list.
53−psciLoadedModules :: PSCiState -> [(Either P.RebuildPolicy FilePath, P.Module)]
54−psciLoadedModules = Map.elems . _psciLoadedModules
55−
56−mkPSCiState :: [FilePath]
57− -> [ImportedModule]
58− -> [(Either P.RebuildPolicy FilePath, P.Module)]
59− -> Map P.ModuleName FilePath
60− -> [P.Declaration]
61− -> [String]
62− -> PSCiState
63−mkPSCiState files imported loaded foreign lets nodeFlags =
44+initialPSCiState :: PSCiState
45+initialPSCiState =
46+ PSCiState [] Map.empty Map.empty [] []
47+
48+mkPSCiState :: [ImportedModule]
49+ -> [(FilePath, P.Module)]
50+ -> Map P.ModuleName FilePath
51+ -> [P.Declaration]
52+ -> [String]
53+ -> PSCiState
54+mkPSCiState imported loaded foreign lets nodeFlags =
6455 (initialPSCiState
65− |> each files updateImportedFiles
6656 |> each imported updateImportedModules
6757 |> updateModules loaded)
6858 { psciForeignFiles = foreign
@@ -73,9 +63,18 @@ mkPSCiState files imported loaded foreign lets nodeFlags =
7363 x |> f = f x
7464 each xs f st = foldl (flip f) st xs
7565
76−initialPSCiState :: PSCiState
77−initialPSCiState =
78− PSCiState Set.empty [] Map.empty Map.empty [] []
66+-- Public psci state accessors
67+
68+-- | Get the imported filenames as a list.
69+psciImportedFilenames :: PSCiState -> [FilePath]
70+psciImportedFilenames = Map.keys . _psciLoadedModules
71+
72+-- | Get the loaded modules as a list.
73+psciLoadedModules :: PSCiState -> [(FilePath, P.Module)]
74+psciLoadedModules = collect . Map.toList . _psciLoadedModules
75+ where
76+ collect :: [(k, [v])] -> [(k, v)]
77+ collect vss = [ (k, v) | (k, vs) <- vss, v <- vs ]
7978
8079-- | All of the data that is contained by an ImportDeclaration in the AST.
8180-- That is:
@@ -101,12 +100,6 @@ allImportsOf m (PSCiState{psciImportedModules = is}) =
101100
102101-- State helpers
103102
104−-- |
105−-- Updates the state to have more imported files.
106−--
107−updateImportedFiles :: FilePath -> PSCiState -> PSCiState
108−updateImportedFiles filename st = st { _psciImportedFilenames = Set.insert filename (_psciImportedFilenames st) }
109−
110103-- |
111104-- Updates the state to have more imported modules.
112105--
@@ -114,13 +107,14 @@ updateImportedModules :: ImportedModule -> PSCiState -> PSCiState
114107updateImportedModules im st = st { psciImportedModules = im : psciImportedModules st }
115108
116109-- |
117−-- Updates the state to have more loaded files.
110+-- Updates the state to have more loaded modules (available for import, but
111+-- not necessarily imported).
118112--
119−updateModules :: [(Either P.RebuildPolicy FilePath, P.Module)] -> PSCiState -> PSCiState
113+updateModules :: [(FilePath, P.Module)] -> PSCiState -> PSCiState
120114updateModules modules st =
121− st { _psciLoadedModules = foldl (\m mdl -> Map.insert (keyFor mdl) mdl m) (_psciLoadedModules st) modules }
115+ st { _psciLoadedModules = Map.union (go modules) (_psciLoadedModules st) }
122116 where
123− keyFor = P.getModuleName . snd
117+ go = Map.fromListWith (++) . map (second (:[]))
124118
125119-- |
126120-- Updates the state to have more let bindings.
psci/tests/Main.hs+1−1
@@ -142,7 +142,7 @@ getPSCiState = do
142142 print err >> exitFailure
143143 Right modules ->
144144 let imports = [controlMonadSTasST, (P.ModuleName [P.ProperName "Prelude"], P.Implicit True, Nothing)]
145− in return (PSCiState [] imports modules foreigns [] [])
145+ in return (mkPSCiState imports modules foreigns [] [])
146146
147147controlMonadSTasST :: ImportedModule
148148controlMonadSTasST = (s "Control.Monad.ST", P.Implicit True, Just (s "ST"))