Edits suggested by Adam

Author: dougalm

makefile

@@ -129,7 +129,7 @@ example-names = mandelbrot pi sierpinski rejection-sampler \
 # TODO: re-enable
 # fft vega-plotting
 
-test-names = uexpr-tests adt-tests type-tests module-tests eval-tests show-tests \
+test-names = uexpr-tests adt-tests type-tests eval-tests show-tests \
              shadow-tests monad-tests io-tests exception-tests sort-tests \
              ad-tests parser-tests serialize-tests parser-combinator-tests \
              record-variant-tests typeclass-tests complex-tests trig-tests \
@@ -148,7 +148,12 @@ doc-example-names = $(example-names:%=doc/examples/%.html)
 
 doc-lib-names = $(lib-names:%=doc/lib/%.html)
 
-tests: quine-tests repl-test
+module-tests:
+	misc/check-quine tests/module-tests.dx \
+           $(dex) --prelude lib/prelude.dx --lib-path tests script --allow-errors
+
+
+tests: quine-tests repl-test module-tests
 
 quine-tests: $(quine-test-targets)
 

src/lib/Builder.hs

@@ -39,7 +39,7 @@ module Builder (
   emitBlock, emitDecls, BuilderEmissions, emitAtomToName,
   TopBuilder (..), TopBuilderT (..), liftTopBuilderTWith, runTopBuilderT, TopBuilder2,
   emitSourceMap, emitSynthCandidates, emitTopLet, emitImpFunBinding,
-  lookupLoadedModule, loadModule, getAllRequiredObjectFiles, extendCache,
+  lookupLoadedModule, bindModule, getAllRequiredObjectFiles, extendCache,
   extendImpCache, queryImpCache, extendObjCache, queryObjCache, getCache, emitObjFile,
   TopEnvFrag (..), lookupModule, emitPartialTopEnvFrag,
   inlineLastDecl, fabricateEmitsEvidence, fabricateEmitsEvidenceM,
@@ -162,8 +162,8 @@ emitTopLet hint letAnn expr = do
 emitImpFunBinding :: (Mut n, TopBuilder m) => NameHint -> ImpFunction n -> m n (ImpFunName n)
 emitImpFunBinding hint f = emitBinding hint $ ImpFunBinding f
 
-loadModule :: (Mut n, TopBuilder m) => ModuleSourceName -> ModuleName n -> m n ()
-loadModule sourceName internalName = do
+bindModule :: (Mut n, TopBuilder m) => ModuleSourceName -> ModuleName n -> m n ()
+bindModule sourceName internalName = do
   let loaded = LoadedModules $ M.singleton sourceName internalName
   emitPartialTopEnvFrag $ mempty {fragLoadedModules = loaded}
 

src/lib/Err.hs

@@ -230,7 +230,7 @@ catchIOExcept :: MonadIO m => IO a -> m (Except a)
 catchIOExcept m = liftIO $ (liftM Success m) `catches`
   [ Handler \(e::Errs)          -> return $ Failure e
   , Handler \(e::IOError)       -> return $ Failure $ Errs [Err DataIOErr   mempty $ show e]
-  -- , Handler \(e::SomeException) -> return $ Failure $ Errs [Err CompilerErr mempty $ show e]
+  , Handler \(e::SomeException) -> return $ Failure $ Errs [Err CompilerErr mempty $ show e]
   ]
 
 liftMaybe :: MonadFail m => Maybe a -> m a

src/lib/Syntax.hs

@@ -304,6 +304,9 @@ type AtomSubstVal = SubstVal AtomNameC Atom :: V
 
 -- === envs and modules ===
 
+-- `ModuleEnv` contains data that only makes sense in the context of evaluating
+-- a particular module. `TopEnv` contains everything that makes sense "between"
+-- evaluating modules.
 data Env n = Env
   { topEnv    :: TopEnv n
   , moduleEnv :: ModuleEnv n }

src/lib/TopLevel.hs

@@ -82,7 +82,6 @@ class Monad m => PassCtxReader m where
 type TopLogger m = (MonadIO m, MonadLogger [Output] m)
 
 class ( forall n. Fallible (m n)
-      -- , forall n. Catchable (m n)
       , forall n. MonadLogger [Output] (m n)
       , forall n. Catchable (m n)
       , forall n. ConfigReader (m n)
@@ -159,7 +158,7 @@ ensureModuleLoaded moduleSourceName = do
   depsRequired <- findDepsTransitively moduleSourceName
   forM_ depsRequired \md -> do
     evaluated <- evalPartiallyParsedUModuleCached md
-    loadModule (umppName md) evaluated
+    bindModule (umppName md) evaluated
 
 evalSourceBlock :: (Topper m, Mut n) => SourceBlock -> m n Result
 evalSourceBlock block = do
@@ -534,15 +533,18 @@ logPass passName cont = do
 
 loadModuleSource :: MonadIO m => EvalConfig -> ModuleSourceName -> m File
 loadModuleSource config moduleName = do
-  fnameStem <- case moduleName of
-    OrdinaryModule moduleName' -> return moduleName'
-    Prelude -> return "prelude"
+  fullPath <- case moduleName of
+    OrdinaryModule moduleName' -> findFullPath $ moduleName' ++ ".dx"
+    Prelude -> case preludeFile config of
+      Nothing -> findFullPath "prelude.dx"
+      Just path -> return path
     Main -> error "shouldn't be trying to load the source for main"
-  let fname = fnameStem ++ ".dx"
-  fullPath <- case libPath config of
+  readFileWithHash fullPath
+  where
+    findFullPath :: MonadIO m => FilePath -> m FilePath
+    findFullPath fname = case libPath config of
       Nothing -> liftIO $ getDataFileName $ "lib/" ++ fname
       Just path -> return $ path </> fname
-  readFileWithHash fullPath
 
 -- === saving cache to disk ===