Skip to content

update to latest liquid-fixpoint#2282

Merged
nikivazou merged 8 commits into
ucsd-progsys:developfrom
clayrat:elab-set
May 17, 2024
Merged

update to latest liquid-fixpoint#2282
nikivazou merged 8 commits into
ucsd-progsys:developfrom
clayrat:elab-set

Conversation

@clayrat

@clayrat clayrat commented May 14, 2024

Copy link
Copy Markdown
Contributor

Don't merge yet (before ucsd-progsys/liquid-fixpoint#688), the LF submodule currently points to a branch.

Fixes #2272

@ranjitjhala I had to remove two things to make LH work with the develop version of LF:

  1. fTyConP as a parser with the same name was made public at Use SMTLIB style serialization/deserialization for Horn queries liquid-fixpoint#683
  2. conflicting JSON instances for SourcePos which were added at Allow reading/saving horn queries from/to JSON liquid-fixpoint#680

The tests pass without those, but I'm unsure if we should remove them in favor of liquid-fixpoint implementations (as done currently), or if we need to de-duplicate somehow.

@ranjitjhala

Copy link
Copy Markdown
Member

@clayrat -- I couldn't follow, I would suggest using the LF versions (which is the current setup?) if possible? Is that the path of least resistance?

@clayrat

clayrat commented May 14, 2024

Copy link
Copy Markdown
Contributor Author

@clayrat -- I couldn't follow, I would suggest using the LF versions (which is the current setup?) if possible? Is that the path of least resistance?

Indeed, the simplest solution is just to delete the conflicting LH code, I was just worried there might be some non-obvious consequences not covered by the test suite, e.g. the code for fTyConP in LF has clauses for num and Str which are missing in LH version - not sure how important it is that LiquidHaskell will also start accepting those.

@nikivazou

Copy link
Copy Markdown
Member

The latest fixpoint is not compatible with the latest liquid haskell, that is why these changes were required.
It looks good to me (esp since the tests pass).

So, let's merge both pull requests!

@nikivazou

Copy link
Copy Markdown
Member

@clayrat this is WIP only because fixpoint was not fixed yet?

@clayrat

clayrat commented May 16, 2024

Copy link
Copy Markdown
Contributor Author

Yes, I'll point the LF submodule to the latest commit and drop the WIP prefix.

@clayrat clayrat changed the title [WIP] update to latest liquid-fixpoint update to latest liquid-fixpoint May 16, 2024
@clayrat

clayrat commented May 16, 2024

Copy link
Copy Markdown
Contributor Author

@nikivazou done

@nikivazou nikivazou merged commit a38d768 into ucsd-progsys:develop May 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Set measures generate erroneous constraints when applied to non-polymorphic datatypes

3 participants