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

Use numbers instead of primes to distinguish shadowed saw-core variables. #1636

Merged
merged 2 commits into from
Apr 25, 2022
Merged

Use numbers instead of primes to distinguish shadowed saw-core variables. #1636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6e9afc
Use numbers instead of primes to distinguish shadowed saw-core variab…
Apr 22, 2022
e16cc8c
Reduce excessive linebreaks when printing large terms.
Apr 22, 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
18 changes: 15 additions & 3 deletions saw-core/src/Verifier/SAW/Term/Pretty.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module Verifier.SAW.Term.Pretty
, ppName
) where

import Data.Char (intToDigit)
import Data.Char (intToDigit, isDigit)
import Data.Maybe (isJust)
import Control.Monad.Reader
import Control.Monad.State.Strict as State
Expand Down Expand Up @@ -176,9 +176,20 @@ lookupVarName False _ i = Text.pack ('!' : show i)
freshName :: [LocalName] -> LocalName -> LocalName
freshName used name
| name == "_" = name
| elem name used = freshName used (name <> "'")
| elem name used = freshName used (nextName name)
| otherwise = name

-- | Generate a variant of a name by incrementing the number at the
-- end, or appending the number 1 if there is none.
nextName :: LocalName -> LocalName
nextName = Text.pack . reverse . go . reverse . Text.unpack
where
go :: String -> String
go (c : cs)
| c == '9' = '0' : go cs
| isDigit c = succ c : cs
go cs = '1' : cs

-- | Add a new variable with the given base name to the local variable list,
-- returning both the fresh name actually used and the new variable list. As a
-- special case, if the base name is "_", it is not modified.
Expand Down Expand Up @@ -684,7 +695,8 @@ renderSawDoc :: PPOpts -> SawDoc -> String
renderSawDoc ppOpts doc =
Text.Lazy.unpack (renderLazy (style (layoutPretty layoutOpts doc)))
where
layoutOpts = LayoutOptions (AvailablePerLine 80 0.8)
-- ribbon width 64, with effectively unlimited right margin
layoutOpts = LayoutOptions (AvailablePerLine 8000 0.008)
style = if ppColor ppOpts then reAnnotateS colorStyle else unAnnotateS

-- | Pretty-print a term and render it to a string, using the given options
Expand Down