Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix detection of tyvars when generalizing sorts of gsImpAxioms #2455

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Fix detection of tyvars when generalizing sorts of gsImpAxioms #2455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Init.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,16 @@ measEnv sp xts cbs _tcb lt1s lt2s asms itys hs info = CGE
lts = lt1s ++ lt2s
tcb' = []

-- | Given an equation whose sorts are @FObj "a"@, @FObj "b"@, etc,
-- | Given an equation whose sorts are @FObj "a##..."@, @FObj "b##..."@, etc,
-- replaces those with @FVar@s.
eqToPolySort :: F.EquationV v -> F.Sort
eqToPolySort e =
let s = foldr (F.FFunc . snd) (F.eqSort e) (F.eqArgs e)
ss = filter (all isLower . take 1 . F.symbolString) $ S.toList $ F.sortSymbols s
ss = filter (isTyVarName . F.symbolString) $ S.toList $ F.sortSymbols s
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test as it was would consider int and bool type variables as well, which is not what we need here.

su = F.mkSortSubst $ zip ss $ map F.FVar [0..]
in F.mkPoly (length ss - 1) $ F.sortSubst su s
where
isTyVarName s = all isLower (take 1 s) && L.isInfixOf "##" s

assm :: TargetInfo -> [(Var, SpecType)]
assm = assmGrty (giImpVars . giSrc)
Expand Down
Loading