Skip to content

Commit

Permalink
Rename SimplifyImplies to SimplifyImplication for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
geo2a committed Aug 8, 2023
1 parent 1019618 commit 32dbb64
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions kore-rpc-types/src/Kore/JsonRpc/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ instance FromRequest (API 'Req) where
parseParams "simplify" = Just $ fmap (Simplify <$>) parseJSON
parseParams "add-module" = Just $ fmap (AddModule <$>) parseJSON
parseParams "get-model" = Just $ fmap (GetModel <$>) parseJSON
parseParams "simplify-implication" = Just $ fmap (SimplifyImplies <$>) parseJSON
parseParams "simplify-implication" = Just $ fmap (SimplifyImplication <$>) parseJSON
parseParams "cancel" = Just $ const $ return Cancel
parseParams _ = Nothing

Expand Down Expand Up @@ -177,15 +177,15 @@ data GetModelResult = GetModelResult
(FromJSON, ToJSON)
via CustomJSON '[OmitNothingFields, FieldLabelModifier '[CamelToKebab]] GetModelResult

data SimplifyImpliesResult = SimplifyImpliesResult
data SimplifyImplicationResult = SimplifyImplicationResult
{ satisfiable :: SatResult
, substitution :: Maybe KoreJson
, logs :: Maybe [LogEntry]
}
deriving stock (Generic, Show, Eq)
deriving
(FromJSON, ToJSON)
via CustomJSON '[OmitNothingFields, FieldLabelModifier '[CamelToKebab]] SimplifyImpliesResult
via CustomJSON '[OmitNothingFields, FieldLabelModifier '[CamelToKebab]] SimplifyImplicationResult

data SatResult
= Sat
Expand All @@ -204,7 +204,7 @@ data APIMethod
| SimplifyM
| AddModuleM
| GetModelM
| SimplifyImpliesM
| SimplifyImplicationM
deriving stock (Eq, Ord, Show, Enum)

type family APIPayload (api :: APIMethod) (r :: ReqOrRes) where
Expand All @@ -218,16 +218,16 @@ type family APIPayload (api :: APIMethod) (r :: ReqOrRes) where
APIPayload 'AddModuleM 'Res = ()
APIPayload 'GetModelM 'Req = GetModelRequest
APIPayload 'GetModelM 'Res = GetModelResult
APIPayload 'SimplifyImpliesM 'Req = ImpliesRequest
APIPayload 'SimplifyImpliesM 'Res = SimplifyImpliesResult
APIPayload 'SimplifyImplicationM 'Req = ImpliesRequest
APIPayload 'SimplifyImplicationM 'Res = SimplifyImplicationResult

data API (r :: ReqOrRes) where
Execute :: APIPayload 'ExecuteM r -> API r
Implies :: APIPayload 'ImpliesM r -> API r
Simplify :: APIPayload 'SimplifyM r -> API r
AddModule :: APIPayload 'AddModuleM r -> API r
GetModel :: APIPayload 'GetModelM r -> API r
SimplifyImplies :: APIPayload 'SimplifyImpliesM r -> API r
SimplifyImplication :: APIPayload 'SimplifyImplicationM r -> API r
Cancel :: API 'Req

deriving stock instance Show (API 'Req)
Expand All @@ -242,7 +242,7 @@ instance ToJSON (API 'Res) where
Simplify payload -> toJSON payload
AddModule payload -> toJSON payload
GetModel payload -> toJSON payload
SimplifyImplies payload -> toJSON payload
SimplifyImplication payload -> toJSON payload

instance Pretty.Pretty (API 'Req) where
pretty = \case
Expand All @@ -251,7 +251,7 @@ instance Pretty.Pretty (API 'Req) where
Simplify _ -> "simplify"
AddModule _ -> "add-module"
GetModel _ -> "get-model"
SimplifyImplies _ -> "simplify-implication"
SimplifyImplication _ -> "simplify-implication"
Cancel -> "cancel"

rpcJsonConfig :: PrettyJson.Config
Expand Down

0 comments on commit 32dbb64

Please sign in to comment.