diff --git a/src/Telomare/Eval.hs b/src/Telomare/Eval.hs index a3b3fa5..1fa3944 100644 --- a/src/Telomare/Eval.hs +++ b/src/Telomare/Eval.hs @@ -368,7 +368,7 @@ eval2IExpr extraModuleBindings str = Right x -> case toTelomare x of Just ie -> pure ie _ -> Left $ "eval2IExpr conversion error back to iexpr:\n" <> prettyPrint x - aux = (\str -> Left (DummyLoc :< ImportQualifiedUPF str str)) . fst <$> extraModuleBindings + aux = (\str -> Left (DummyLoc :< ImportUPF str)) . fst <$> extraModuleBindings resolved = resolveAllImports extraModuleBindings aux tagIExprWithEval :: IExpr -> Cofree IExprF (Int, IExpr) diff --git a/src/Telomare/Resolver.hs b/src/Telomare/Resolver.hs index efc43c0..49c1d35 100644 --- a/src/Telomare/Resolver.hs +++ b/src/Telomare/Resolver.hs @@ -640,8 +640,8 @@ resolveAllImports' modules x = then resolved else resolveAllImports' modules resolved -resolveAllImports :: [(String, [Either AnnotatedUPT (String, AnnotatedUPT)])] - -> [Either AnnotatedUPT (String, AnnotatedUPT)] +resolveAllImports :: [(String, [Either AnnotatedUPT (String, AnnotatedUPT)])] -- ^All the modules + -> [Either AnnotatedUPT (String, AnnotatedUPT)] -- ^Module to be resolved (i.e. list of either Import_UPT or top level definitions) -> [(String, AnnotatedUPT)] resolveAllImports x y = removeRights <$> resolveAllImports' x y where