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

Avoid concatenating Text values in termToPat. #1272

Merged
merged 1 commit into from
Sep 15, 2021
Merged

Avoid concatenating Text values in termToPat. #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions saw-core/src/Verifier/SAW/Conversion.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ resolveArgs (Matcher p m) (defaultArgsMatcher -> args@(ArgsMatcher pl _)) =

-- | Match a global definition.
asGlobalDef :: Ident -> Matcher ()
asGlobalDef ident = Matcher (Net.Atom (identText ident)) f
asGlobalDef ident = Matcher (Net.Atom (identBaseName ident)) f
where f (R.asGlobalDef -> Just o) | ident == o = return ()
f _ = Nothing

Expand Down Expand Up @@ -262,15 +262,15 @@ asRecordSelector m = asVar $ \t -> _1 (runMatcher m) =<< R.asRecordSelector t

-- | Match a constructor
asCtor :: ArgsMatchable v a => Ident -> v a -> Matcher a
asCtor o = resolveArgs $ Matcher (Net.Atom (identText o)) match
asCtor o = resolveArgs $ Matcher (Net.Atom (identBaseName o)) match
where match t = do
CtorApp c params l <- R.asFTermF t
guard (o == primName c)
return (params ++ l)

-- | Match a datatype.
asDataType :: ArgsMatchable v a => PrimName a -> v a -> Matcher a
asDataType o = resolveArgs $ Matcher (Net.Atom (identText (primName o))) match
asDataType o = resolveArgs $ Matcher (Net.Atom (identBaseName (primName o))) match
where match t = do
DataTypeApp dt params l <- R.asFTermF t
guard (primVarIndex dt == primVarIndex o)
Expand Down
8 changes: 4 additions & 4 deletions saw-core/src/Verifier/SAW/Term/Functor.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,15 @@ instance Net.Pattern Term where
termToPat :: Term -> Net.Pat
termToPat t =
case unwrapTermF t of
Constant ec _ -> Net.Atom (toAbsoluteName (ecName ec))
Constant ec _ -> Net.Atom (toShortName (ecName ec))
App t1 t2 -> Net.App (termToPat t1) (termToPat t2)
FTermF (Primitive pn) -> Net.Atom (identText (primName pn))
FTermF (Primitive pn) -> Net.Atom (identBaseName (primName pn))
FTermF (Sort s) -> Net.Atom (Text.pack ('*' : show s))
FTermF (NatLit _) -> Net.Var
FTermF (DataTypeApp c ps ts) ->
foldl Net.App (Net.Atom (identText (primName c))) (map termToPat (ps ++ ts))
foldl Net.App (Net.Atom (identBaseName (primName c))) (map termToPat (ps ++ ts))
FTermF (CtorApp c ps ts) ->
foldl Net.App (Net.Atom (identText (primName c))) (map termToPat (ps ++ ts))
foldl Net.App (Net.Atom (identBaseName (primName c))) (map termToPat (ps ++ ts))
_ -> Net.Var

unwrapTermF :: Term -> TermF Term
Expand Down