From 1adb820936e44255735a9066aa33bcc95bc08702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Fri, 3 Nov 2023 09:22:10 -0300 Subject: [PATCH] Update AST construction in Elaborate --- .../src/Language/Haskell/Liquid/Bare/Elaborate.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs index c79454db60..fd5c8592ef 100644 --- a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs +++ b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs @@ -568,7 +568,7 @@ renameBinderSort f = rename mkHsTyConApp :: IdP GhcPs -> [LHsType GhcPs] -> LHsType GhcPs -mkHsTyConApp tyconId tyargs = nlHsTyConApp Prefix tyconId (map HsValArg tyargs) +mkHsTyConApp tyconId tyargs = nlHsTyConApp NotPromoted Prefix tyconId (map HsValArg tyargs) -- | Embed fixpoint expressions into parsed haskell expressions. -- It allows us to bypass the GHC parser and use arbitrary symbols @@ -688,10 +688,11 @@ specTypeToLHsType :: SpecType -> LHsType GhcPs specTypeToLHsType = flip (ghylo (distPara @SpecType) distAna) (fmap pure . project) $ \case RVarF (RTV tv) _ -> nlHsTyVar + NotPromoted -- (GM.notracePpr ("varRdr" ++ F.showpp (F.symbol tv)) $ getRdrName tv) (symbolToRdrNameNs tvName (F.symbol tv)) RFunF _ _ (tin, tin') (_, tout) _ - | isClassType tin -> noLocA $ HsQualTy Ghc.noExtField (Just (noLocA [tin'])) tout + | isClassType tin -> noLocA $ HsQualTy Ghc.noExtField (noLocA [tin']) tout | otherwise -> nlHsFunTy tin' tout RAllTF (ty_var_value -> (RTV tv)) (_, t) _ -> noLocA $ HsForAllTy Ghc.noExtField