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

Resolve URI-based names when loading the external SAWCore format #1658

Merged
merged 3 commits into from
May 10, 2022
Merged

Resolve URI-based names when loading the external SAWCore format #1658

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7528e6
Resolve URI-based names when loading the external SAWCore format
chameco May 5, 2022
a7c04d2
Merge branch 'master' into sb/extcore-resolve
chameco May 9, 2022
9d1c02c
Remove a debug print statement
chameco May 9, 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
16 changes: 9 additions & 7 deletions saw-core/src/Verifier/SAW/ExternalFormat.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,13 +272,15 @@ scReadExternal sc input =
lift (scResolveNameByURI sc (moduleIdentToURI ident)) >>= \case
Just vi' -> pure (EC vi' nmi t')
Nothing -> lift $ fail $ "scReadExternal: missing module identifier: " ++ show ident
_ ->
case Map.lookup vi vs of
Just vi' -> pure $ EC vi' nmi t'
Nothing ->
do vi' <- lift $ scFreshGlobalVar sc
State.put (ts, nms, Map.insert vi vi' vs)
pure $ EC vi' nmi t'
ImportedName uri _aliases ->
lift (scResolveNameByURI sc uri) >>= \case
Just vi' -> pure (EC vi' nmi t')
Nothing -> case Map.lookup vi vs of
Just vi' -> pure $ EC vi' nmi t'
Nothing ->
do vi' <- lift $ scFreshGlobalVar sc
State.put (ts, nms, Map.insert vi vi' vs)
pure $ EC vi' nmi t'

readEC :: String -> String -> ReadM (ExtCns Term)
readEC i t =
Expand Down