diff options
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/HscMain.hs | 2 | ||||
| -rw-r--r-- | compiler/main/InteractiveEval.hs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs index 6e6ac04e5e..08374380fe 100644 --- a/compiler/main/HscMain.hs +++ b/compiler/main/HscMain.hs @@ -1678,7 +1678,7 @@ hscParseStmtWithLocation source linenumber stmt = hscParseType :: String -> Hsc (LHsType RdrName) hscParseType = hscParseThing parseType -hscParseIdentifier :: HscEnv -> String -> IO (Located RdrName) +hscParseIdentifier :: HscEnv -> String -> IO (LEmbellished RdrName) hscParseIdentifier hsc_env str = runInteractiveHsc hsc_env $ hscParseThing parseIdentifier str diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs index 1fa269825d..dfab3d4631 100644 --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -775,7 +775,7 @@ getRdrNamesInScope = withSession $ \hsc_env -> do parseName :: GhcMonad m => String -> m [Name] parseName str = withSession $ \hsc_env -> liftIO $ do { lrdr_name <- hscParseIdentifier hsc_env str - ; hscTcRnLookupRdrName hsc_env lrdr_name } + ; hscTcRnLookupRdrName hsc_env $ unLEmb lrdr_name } -- | Returns @True@ if passed string is a statement. isStmt :: DynFlags -> String -> Bool @@ -890,7 +890,8 @@ dynCompileExpr expr = do parsed_expr <- parseExpr expr -- > Data.Dynamic.toDyn expr let loc = getLoc parsed_expr - to_dyn_expr = mkHsApp (L loc . HsVar . L loc $ getRdrName toDynName) + to_dyn_expr = mkHsApp (L loc . HsVar . L loc $ EName + $ getRdrName toDynName) parsed_expr hval <- compileParsedExpr to_dyn_expr return (unsafeCoerce# hval :: Dynamic) |