Skip to content

Commit 9491e54

Browse files
Use source location in rewrite trace (#3382)
* replace TermLike with SourceLocation in DebugInitialClaim * use instance Pretty SourceLocation Co-authored-by: Ana Pantilie <[email protected]>
1 parent 0d66d72 commit 9491e54

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

kore/src/Kore/Log/DebugRewriteTrace.hs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import Data.Yaml (
3535
toJSON,
3636
(.=),
3737
)
38+
import Kore.Attribute.SourceLocation (SourceLocation (..))
3839
import Kore.Attribute.UniqueId (
3940
UniqueId (..),
4041
)
@@ -83,7 +84,7 @@ import Pretty (
8384
renderText,
8485
)
8586

86-
data DebugInitialClaim = DebugInitialClaim UniqueId (TermLike VariableName)
87+
data DebugInitialClaim = DebugInitialClaim UniqueId SourceLocation
8788
deriving stock (Show)
8889

8990
newtype DebugInitialPattern = DebugInitialPattern (TermLike VariableName)
@@ -131,7 +132,7 @@ instance ToJSON DebugInitialClaim where
131132
toJSON (DebugInitialClaim uniqueId claim) =
132133
object
133134
[ "task" .= ("reachability" :: Text)
134-
, "claim" .= unparseOneLine claim
135+
, "claim" .= show (pretty claim)
135136
, "claim-id" .= maybe Null toJSON (getUniqueId uniqueId)
136137
]
137138

@@ -202,7 +203,7 @@ unparseOneLine = renderText . layoutOneLine . unparse
202203
debugInitialClaim ::
203204
MonadLog log =>
204205
UniqueId ->
205-
TermLike VariableName ->
206+
SourceLocation ->
206207
log ()
207208
debugInitialClaim uniqueId claimPattern = logEntry $ DebugInitialClaim uniqueId claimPattern
208209

kore/src/Kore/Reachability/Prove.hs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ import Kore.Log.DebugTransition (
8787
import Kore.Log.InfoProofDepth
8888
import Kore.Log.WarnStuckClaimState
8989
import Kore.Log.WarnTrivialClaim
90-
import Kore.Reachability.AllPathClaim (
91-
allPathRuleToTerm,
92-
)
9390
import Kore.Reachability.Claim
9491
import Kore.Reachability.ClaimState (
9592
ClaimState,
@@ -98,9 +95,6 @@ import Kore.Reachability.ClaimState (
9895
extractUnproven,
9996
)
10097
import Kore.Reachability.ClaimState qualified as ClaimState
101-
import Kore.Reachability.OnePathClaim (
102-
onePathRuleToTerm,
103-
)
10498
import Kore.Reachability.Prim as Prim (
10599
Prim (..),
106100
)
@@ -291,8 +285,8 @@ proveClaimsWorker
291285
traceExceptT D_OnePath_verifyClaim [debugArg "rule" claim] $ do
292286
debugBeginClaim claim
293287
debugInitialClaim (from claim) $ case claim of
294-
OnePath term -> onePathRuleToTerm term
295-
AllPath term -> allPathRuleToTerm term
288+
OnePath onePathClaim -> from $ getOnePathClaim onePathClaim
289+
AllPath allPathClaim -> from $ getAllPathClaim allPathClaim
296290
result <-
297291
lift . lift $
298292
proveClaim

0 commit comments

Comments
 (0)