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.

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

Tests and documentation for normalization of boolean values #277

Merged
merged 21 commits into from
Feb 5, 2025

Conversation

langston-barrett
Copy link
Contributor

  • Introduce a ConjMap newtype around BoolMap for readability of pattern matches and type signatures
  • Document the annotation on BoolMap
  • Document and introduce tests for normal forms of boolean expressions

@langston-barrett langston-barrett self-assigned this Feb 3, 2025
@langston-barrett
Copy link
Contributor Author

I don't understand these CI failures:

    Z3
      Test itself is valid and completes (2.27 s): OK (292.02s)
      Test runs past timeout:                      OK (1.40s)
      Test with goal timeout (0.25 s):             FAIL (expected: goal timeouts feature not effective) (1.40s)
        test/OnlineSolverTest.hs:485:
        solver goal timeout didn't occur (expected failure)
    CVC4
      Test itself is valid and completes (7.5 s):  OK (8.13s)
      Test runs past timeout:                      FAIL (2.80s)
        test/OnlineSolverTest.hs:463:
        Solver check query not interruptible (2.8026422220000002 s > expected 1.4 s)
        Use -p '/CVC4.Test runs past timeout/' to rerun this test only.

@langston-barrett
Copy link
Contributor Author

The CI failure is #278.

@langston-barrett langston-barrett marked this pull request as ready for review February 4, 2025 19:33
@langston-barrett
Copy link
Contributor Author

Rebased onto #283 for CI fixes.

Copy link
Contributor

@RyanGlScott RyanGlScott left a comment

Choose a reason for hiding this comment

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

LGTM, although the CI is failing now for an unrelated reason: the code uses ImportQualifiedPost, which is only available in GHC 8.10 or later. We could drop support for GHC 8.8 to support this, although this might be better done in a separate patch.

@langston-barrett
Copy link
Contributor Author

Removed, thanks!

@langston-barrett langston-barrett merged commit ebf9ac0 into master Feb 5, 2025
31 checks passed
@langston-barrett langston-barrett deleted the lb/bool-map branch February 5, 2025 18:47
RyanGlScott added a commit to GaloisInc/saw-script that referenced this pull request Feb 17, 2025
…anges

This bumps the `what4` submodule to bring in the `BoolMap`/`ConjMap`-related
changes from GaloisInc/what4#277. (In turn, this requires bumping the
`crucible` submodule to bring in the changes from GaloisInc/crucible#1306, as
well as the `macaw` submodule to bring in the changes from
GaloisInc/macaw#462). This requires some minor changes in `saw-core-what4` to
accommodate.

Fixes #2223.
RyanGlScott added a commit to GaloisInc/saw-script that referenced this pull request Feb 17, 2025
Bump `what4` submodule (and friends) to bring in GaloisInc/what4#277 changes
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.

2 participants