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

Jump to bottom

Throw an exception when no candidates for an uninterpreted name are found #1673

Merged
merged 4 commits into from
Jun 1, 2022
Merged

Throw an exception when no candidates for an uninterpreted name are found #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2551dba
Throw an exception when no uninterpreted names are found
chameco May 21, 2022
e125552
Add an integration test
chameco May 21, 2022
88d5e8e
Merge branch 'master' into sb/resolve-fail
chameco May 23, 2022
3a270ba
Merge branch 'master' into sb/resolve-fail
chameco May 27, 2022
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
1 change: 1 addition & 0 deletions intTests/test_resolve_unint_missing/test.saw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails (prove_print (w4_unint_yices ["foo"]) {{ True }});
4 changes: 4 additions & 0 deletions intTests/test_resolve_unint_missing/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
set -e

$SAW test.saw
8 changes: 5 additions & 3 deletions src/SAWScript/Builtins.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,12 +515,14 @@ resolveName sc nm =
do resolvedName <- io $ scResolveNameByURI sc uri
case resolvedName of
Just vi -> pure $ vi:scnms
Nothing -> pure scnms
_ -> pure scnms
Nothing -> pure scnms
Nothing -> fallback scnms
_ -> fallback scnms
Nothing -> fallback scnms

where
tnm = Text.pack nm
fallback [] = fail $ "Could not resolve name: " <> show nm
fallback scnms = pure scnms


normalize_term :: TypedTerm -> TopLevel TypedTerm
Expand Down