diff options
Diffstat (limited to 'compiler/rename')
| -rw-r--r-- | compiler/rename/RnExpr.hs | 6 | ||||
| -rw-r--r-- | compiler/rename/RnSource.hs | 2 | ||||
| -rw-r--r-- | compiler/rename/RnTypes.hs | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/compiler/rename/RnExpr.hs b/compiler/rename/RnExpr.hs index 3ec24a7a6d..42d38c23e9 100644 --- a/compiler/rename/RnExpr.hs +++ b/compiler/rename/RnExpr.hs @@ -108,11 +108,7 @@ rnUnboundVar v then -- Treat this as a "hole" -- Do not fail right now; instead, return HsUnboundVar -- and let the type checker report the error - do { let occ = rdrNameOcc v - ; uv <- if startsWithUnderscore occ - then return (TrueExprHole occ) - else OutOfScope occ <$> getGlobalRdrEnv - ; return (HsUnboundVar noExtField uv, emptyFVs) } + return (HsUnboundVar noExtField (rdrNameOcc v), emptyFVs) else -- Fail immediately (qualified name) do { n <- reportUnboundName v diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs index 1ab80e755a..ea8cfb5347 100644 --- a/compiler/rename/RnSource.hs +++ b/compiler/rename/RnSource.hs @@ -1141,7 +1141,7 @@ badRuleLhsErr name lhs bad_e text "LHS must be of form (f e1 .. en) where f is not forall'd" where err = case bad_e of - HsUnboundVar _ uv -> notInScopeErr (mkRdrUnqual (unboundVarOcc uv)) + HsUnboundVar _ uv -> notInScopeErr (mkRdrUnqual uv) _ -> text "Illegal expression:" <+> ppr bad_e {- ************************************************************** diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs index 5f0a1c62c7..87f364011e 100644 --- a/compiler/rename/RnTypes.hs +++ b/compiler/rename/RnTypes.hs @@ -1180,7 +1180,7 @@ mkOpAppRn e1 op fix e2 -- Default case, no rearrangment -- | Name of an operator in an operator application or section data OpName = NormalOp Name -- ^ A normal identifier | NegateOp -- ^ Prefix negation - | UnboundOp UnboundVar -- ^ An unbound indentifier + | UnboundOp OccName -- ^ An unbound indentifier | RecFldOp (AmbiguousFieldOcc GhcRn) -- ^ A (possibly ambiguous) record field occurrence @@ -1347,7 +1347,7 @@ checkSectionPrec direction section op arg lookupFixityOp :: OpName -> RnM Fixity lookupFixityOp (NormalOp n) = lookupFixityRn n lookupFixityOp NegateOp = lookupFixityRn negateName -lookupFixityOp (UnboundOp u) = lookupFixityRn (mkUnboundName (unboundVarOcc u)) +lookupFixityOp (UnboundOp u) = lookupFixityRn (mkUnboundName u) lookupFixityOp (RecFldOp f) = lookupFieldFixityRn f |