Skip to content

Commit

Permalink
format and fix minor bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
goodlyrottenapple committed Apr 9, 2024
1 parent 4d58673 commit 215fa27
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 74 deletions.
2 changes: 1 addition & 1 deletion library/Booster/Definition/Attributes/Base.hs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ data Concreteness
deriving stock (Eq, Ord, Show, Generic)
deriving anyclass (NFData)

data FunctionType = Partial | Total
data FunctionType = Partial | Total
deriving stock (Eq, Ord, Show, Generic, Data, Lift)
deriving anyclass (NFData, Hashable)

Expand Down
3 changes: 2 additions & 1 deletion library/Booster/Definition/Ceil.hs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ computeCeilRule mllvm def [email protected]{lhs, requires, rhs, attribut

computeCeil :: MonadLoggerIO io => Term -> EquationT io [Either Predicate Term]
computeCeil term@(SymbolApplication symbol _ args)
| symbol.attributes.symbolType /= Booster.Definition.Attributes.Base.Function Booster.Definition.Attributes.Base.Partial =
| symbol.attributes.symbolType
/= Booster.Definition.Attributes.Base.Function Booster.Definition.Attributes.Base.Partial =
concatMapM computeCeil args
| otherwise = do
ceils <- (.definition.ceils) <$> getConfig
Expand Down
15 changes: 10 additions & 5 deletions library/Booster/Pattern/Base.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module Booster.Pattern.Base (
) where

import Booster.Definition.Attributes.Base (
FunctionType (..),
KCollectionMetadata (..),
KCollectionSymbolNames (..),
KListDefinition (..),
Expand All @@ -24,7 +25,7 @@ import Booster.Definition.Attributes.Base (
pattern IsAssoc,
pattern IsNotAssoc,
pattern IsNotIdem,
pattern IsNotMacroOrAlias, FunctionType (..),
pattern IsNotMacroOrAlias,
)
import Booster.Prettyprinter qualified as KPretty

Expand Down Expand Up @@ -848,12 +849,16 @@ instance Pretty Pattern where
<> fmap (Pretty.indent 4 . pretty) (Set.toList patt.constraints)
<> fmap (Pretty.indent 4 . pretty) patt.ceilConditions



pattern ConsApplication :: Symbol -> [Sort] -> [Term] -> Term
pattern ConsApplication sym sorts args <- Term _ (SymbolApplicationF sym@(Symbol _ _ _ _ (SymbolAttributes{symbolType = Constructor})) sorts args)
pattern ConsApplication sym sorts args <-
Term
_
(SymbolApplicationF sym@(Symbol _ _ _ _ (SymbolAttributes{symbolType = Constructor})) sorts args)

pattern FunctionApplication :: Symbol -> [Sort] -> [Term] -> Term
pattern FunctionApplication sym sorts args <- Term _ (SymbolApplicationF sym@(Symbol _ _ _ _ (SymbolAttributes{symbolType = Function _})) sorts args)
pattern FunctionApplication sym sorts args <-
Term
_
(SymbolApplicationF sym@(Symbol _ _ _ _ (SymbolAttributes{symbolType = Function _})) sorts args)

{-# COMPLETE AndTerm, ConsApplication, FunctionApplication, DomainValue, Var, Injection, KMap, KList, KSet #-}
3 changes: 2 additions & 1 deletion library/Booster/Pattern/Bool.hs
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ module Booster.Pattern.Bool (
import Data.ByteString.Char8 (ByteString)

import Booster.Definition.Attributes.Base (
FunctionType (..),
SMTType (SMTHook),
SymbolAttributes (SymbolAttributes),
SymbolType (Function),
pattern CanBeEvaluated,
pattern IsNotAssoc,
pattern IsNotIdem,
pattern IsNotMacroOrAlias, FunctionType (..),
pattern IsNotMacroOrAlias,
)
import Booster.Pattern.Base (
Pattern,
Expand Down
Loading

0 comments on commit 215fa27

Please sign in to comment.