diff --git a/src/Semantic/Util.hs b/src/Semantic/Util.hs index 179737fbb..08720ca96 100644 --- a/src/Semantic/Util.hs +++ b/src/Semantic/Util.hs @@ -72,13 +72,12 @@ evaluateProject' session proxy parser paths = do package <- fmap snd <$> parsePackage parser (Project (takeDirectory (maybe "/" fst (uncons paths))) blobs lang []) modules <- topologicalSort <$> runImportGraphToModules proxy package trace $ "evaluating with load order: " <> show (map (modulePath . moduleInfo) modules) - pure (id @(Evaluator _ Precise (Value _ Precise) _ _) - (runModuleTable + pure (runModuleTable (runModules (ModuleTable.modulePaths (packageModules package)) (raiseHandler (runReader (packageInfo package)) (raiseHandler (evalState (lowerBound @Span)) (raiseHandler (runReader (lowerBound @Span)) - (evaluate proxy (runDomainEffects (evalTerm (withTermSpans (^. span_)))) modules))))))) + (evaluate proxy (runDomainEffects (evalTerm (withTermSpans (^. span_)))) modules)))))) either (die . displayException) pure res parseFile, parseFileQuiet :: Parser term -> FilePath -> IO term