Skip to content

Commit 5a85e31

Browse files
committed
Adjust expected output: extended json parse errors, error call stacks, one permutation of config fields
1 parent 12b0d07 commit 5a85e31

31 files changed

Lines changed: 268 additions & 8 deletions

test/imp/sum-save-proofs-spec.k.save-proofs.kore.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ module haskell-backend-saved-claims-43943e50-f723-47cd-99fd-07104d664c6d
6767
/* InternalMap: */ Lbl'Unds'Map'Unds'{}(
6868
/* concrete element: */ Lbl'UndsPipe'-'-GT-Unds'{}(
6969
/* Inj: */ inj{SortId{}, SortKItem{}}(
70-
\dv{SortId{}}("n")
70+
\dv{SortId{}}("sum")
7171
),
7272
/* Inj: */ inj{SortInt{}, SortKItem{}}(
73-
VarN:SortInt{}
73+
VarS:SortInt{}
7474
)
7575
),
7676
/* concrete element: */ Lbl'UndsPipe'-'-GT-Unds'{}(
7777
/* Inj: */ inj{SortId{}, SortKItem{}}(
78-
\dv{SortId{}}("sum")
78+
\dv{SortId{}}("n")
7979
),
8080
/* Inj: */ inj{SortInt{}, SortKItem{}}(
81-
VarS:SortInt{}
81+
VarN:SortInt{}
8282
)
8383
)
8484
)

test/parser/test-bool-2.kore.golden

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,13 @@ Error:
22
module 'BOOL':
33
hooked-sort 'Bool' declaration (test-bool-2.kore 3:17):
44
Expected 0 sort parameters, found 1
5+
HasCallStack backtrace:
6+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
7+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
8+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
9+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
10+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
11+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
12+
throwM, called at src/Kore/Log/ErrorVerify.hs:45:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorVerify
13+
14+

test/parser/test-bool-3.kore.golden

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,13 @@ Error:
33
hooked-symbol 'andBool' declaration (test-bool-3.kore 4:19):
44
In argument sorts:
55
Expected 2 arguments, found 1
6+
HasCallStack backtrace:
7+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
8+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
9+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
10+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
11+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
12+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
13+
throwM, called at src/Kore/Log/ErrorVerify.hs:45:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorVerify
14+
15+

test/parser/test-bool-4.kore.golden

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,13 @@ Error:
1111
unexpected "untru"
1212
expecting "false" or "true"
1313

14+
HasCallStack backtrace:
15+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
16+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
17+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
18+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
19+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
20+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
21+
throwM, called at src/Kore/Log/ErrorVerify.hs:45:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorVerify
22+
23+

test/parser/test-dv-2.kore.golden

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
test-dv-2.kore:3:22: unexpected token TokenOr
22

3+
HasCallStack backtrace:
4+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
5+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
6+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
7+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
8+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
9+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
10+
throwM, called at src/Kore/Log/ErrorParse.hs:41:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorParse
11+
12+

test/parser/test-dv-3.kore.golden

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,13 @@ Error:
44
\dv (test-dv-3.kore 4:18):
55
(test-dv-3.kore 4:18):
66
Sorts used with domain value must have the hasDomainValues attribute.
7+
HasCallStack backtrace:
8+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
9+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
10+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
11+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
12+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
13+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
14+
throwM, called at src/Kore/Log/ErrorVerify.hs:45:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorVerify
15+
16+

test/parser/test-exception-14.kore.golden

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,13 @@ Error:
33
axiom declaration:
44
symbol or alias 'f' (test-exception-14.kore 6:5):
55
Head 'f' not defined.
6+
HasCallStack backtrace:
7+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
8+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
9+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
10+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
11+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
12+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
13+
throwM, called at src/Kore/Log/ErrorVerify.hs:45:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorVerify
14+
15+
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
test-exception-2.kore:6:5: unexpected token TokenSort
22

3+
HasCallStack backtrace:
4+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
5+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
6+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
7+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
8+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
9+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
10+
throwM, called at src/Kore/Log/ErrorParse.hs:41:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorParse
11+
12+
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
test-exception-21.kore:5:10: unexpected token TokenLeftBracket
22

3+
HasCallStack backtrace:
4+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
5+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
6+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
7+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
8+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
9+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
10+
throwM, called at src/Kore/Log/ErrorParse.hs:41:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorParse
11+
12+
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
test-exception-27.kore:5:4: unexpected character 'a'
22

3+
HasCallStack backtrace:
4+
collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:169:13 in ghc-internal:GHC.Internal.Exception
5+
toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
6+
throwIO, called at libraries/exceptions/src/Control/Monad/Catch.hs:308:12 in exceptions-0.10.9-cdd8:Control.Monad.Catch
7+
throwM, called at libraries/exceptions/src/Control/Monad/Catch.hs:427:21 in exceptions-0.10.9-cdd8:Control.Monad.Catch
8+
throwM, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
9+
a type signature in an instance, called at src/Log.hs:227:32 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Log
10+
throwM, called at src/Kore/Log/ErrorParse.hs:41:5 in kore-0.1.0-Cfp0Ejbn7kwLcJ2RkqaBxY:Kore.Log.ErrorParse
11+
12+

0 commit comments

Comments
 (0)