diff options
Diffstat (limited to 'testsuite/tests/backpack')
93 files changed, 433 insertions, 175 deletions
diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout index 2f17fdffcd..e4c791fc0e 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout +++ b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout @@ -4,3 +4,4 @@ for bkpcabal01-0.1.0.0.. Preprocessing library 'q' for bkpcabal01-0.1.0.0.. Building library 'q' instantiated with H = <H> for bkpcabal01-0.1.0.0.. +[2 of 2] Instantiating bkpcabal01-0.1.0.0-8qvodD6NJy6K0RGaf4qK7Y-p diff --git a/testsuite/tests/backpack/reexport/bkpreex01.stderr b/testsuite/tests/backpack/reexport/bkpreex01.stderr index ac80b79800..43d54e7db7 100644 --- a/testsuite/tests/backpack/reexport/bkpreex01.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex01.stderr @@ -1,6 +1,7 @@ [1 of 2] Processing h [1 of 1] Compiling H[sig] ( h/H.hsig, nothing ) [2 of 2] Processing p - [1 of 3] Compiling B ( p/B.hs, nothing ) - [2 of 3] Compiling H[sig] ( p/H.hsig, nothing ) - [3 of 3] Compiling A ( p/A.hs, nothing ) + [1 of 4] Compiling B ( p/B.hs, nothing ) + [2 of 4] Compiling H[sig] ( p/H.hsig, nothing ) + [3 of 4] Compiling A ( p/A.hs, nothing ) + [4 of 4] Instantiating h diff --git a/testsuite/tests/backpack/reexport/bkpreex02.stderr b/testsuite/tests/backpack/reexport/bkpreex02.stderr index 8ae6714f33..97d5e44b6b 100644 --- a/testsuite/tests/backpack/reexport/bkpreex02.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex02.stderr @@ -5,9 +5,10 @@ Instantiating timpl [1 of 1] Compiling TImpl ( timpl/TImpl.hs, nothing ) [3 of 5] Processing q - [1 of 3] Compiling T[sig] ( q/T.hsig, nothing ) - [2 of 3] Compiling H[sig] ( q/H.hsig, nothing ) - [3 of 3] Compiling A ( q/A.hs, nothing ) + [1 of 4] Compiling T[sig] ( q/T.hsig, nothing ) + [2 of 4] Compiling H[sig] ( q/H.hsig, nothing ) + [3 of 4] Compiling A ( q/A.hs, nothing ) + [4 of 4] Instantiating p [4 of 5] Processing r-impl Instantiating r-impl [1 of 1] Including timpl @@ -22,6 +23,8 @@ Instantiating p[H=r-impl:H,T=r-impl:T] [1 of 2] Compiling T[sig] ( p/T.hsig, nothing ) [2 of 2] Compiling H[sig] ( p/H.hsig, nothing ) - [1 of 3] Compiling T[sig] ( q/T.hsig, nothing ) - [2 of 3] Compiling H[sig] ( q/H.hsig, nothing ) - [3 of 3] Compiling A ( q/A.hs, nothing ) + [1 of 4] Compiling T[sig] ( q/T.hsig, nothing ) + [2 of 4] Compiling H[sig] ( q/H.hsig, nothing ) + [3 of 4] Compiling A ( q/A.hs, nothing ) + [4 of 4] Instantiating p + [1 of 1] Instantiating q diff --git a/testsuite/tests/backpack/reexport/bkpreex06.stderr b/testsuite/tests/backpack/reexport/bkpreex06.stderr index 225a8aacc8..6b8b2978b7 100644 --- a/testsuite/tests/backpack/reexport/bkpreex06.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex06.stderr @@ -4,5 +4,7 @@ [2 of 3] Processing q [1 of 1] Compiling A2[sig] ( q/A2.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A1[sig] ( r/A1.hsig, nothing ) - [2 of 2] Compiling A2[sig] ( r/A2.hsig, nothing ) + [1 of 4] Compiling A1[sig] ( r/A1.hsig, nothing ) + [2 of 4] Compiling A2[sig] ( r/A2.hsig, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q diff --git a/testsuite/tests/backpack/reexport/bkpreex08.stderr b/testsuite/tests/backpack/reexport/bkpreex08.stderr index 41983efaed..ce8f6df39a 100644 --- a/testsuite/tests/backpack/reexport/bkpreex08.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex08.stderr @@ -4,5 +4,6 @@ [2 of 3] Processing p2 [1 of 1] Compiling A[sig] ( p2/A.hsig, nothing ) [3 of 3] Processing p - [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) - [2 of 2] Compiling M ( p/M.hs, nothing ) + [1 of 3] Compiling A[sig] ( p/A.hsig, nothing ) + [2 of 3] Compiling M ( p/M.hs, nothing ) + [3 of 3] Instantiating p2 diff --git a/testsuite/tests/backpack/reexport/bkpreex09.stderr b/testsuite/tests/backpack/reexport/bkpreex09.stderr index d4bedc39f5..f0af09ac03 100644 --- a/testsuite/tests/backpack/reexport/bkpreex09.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex09.stderr @@ -1,5 +1,6 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 2] Compiling M ( q/M.hs, nothing ) + [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 3] Compiling M ( q/M.hs, nothing ) + [3 of 3] Instantiating p diff --git a/testsuite/tests/backpack/reexport/bkpreex10.stderr b/testsuite/tests/backpack/reexport/bkpreex10.stderr index d4bedc39f5..f0af09ac03 100644 --- a/testsuite/tests/backpack/reexport/bkpreex10.stderr +++ b/testsuite/tests/backpack/reexport/bkpreex10.stderr @@ -1,5 +1,6 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 2] Compiling M ( q/M.hs, nothing ) + [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 3] Compiling M ( q/M.hs, nothing ) + [3 of 3] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/T13140.stderr b/testsuite/tests/backpack/should_compile/T13140.stderr index c40b6bc1df..d15a891968 100644 --- a/testsuite/tests/backpack/should_compile/T13140.stderr +++ b/testsuite/tests/backpack/should_compile/T13140.stderr @@ -20,9 +20,12 @@ [3 of 3] Including p[A=q3:A] Instantiating p[A=q3:A] [1 of 1] Compiling A[sig] ( p/A.hsig, T13140.out/p/p-200ijkYDy133WhdgYYHZ24/A.o ) + [1 of 1] Instantiating p [6 of 7] Processing p2 [1 of 2] Compiling A[sig] ( p2/A.hsig, nothing ) [2 of 2] Compiling M ( p2/M.hs, nothing ) [7 of 7] Processing p3 - [1 of 2] Compiling A[sig] ( p3/A.hsig, nothing ) - [2 of 2] Compiling M2 ( p3/M2.hs, nothing ) + [1 of 4] Compiling A[sig] ( p3/A.hsig, nothing ) + [2 of 4] Compiling M2 ( p3/M2.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating p2 diff --git a/testsuite/tests/backpack/should_compile/T13214.stderr b/testsuite/tests/backpack/should_compile/T13214.stderr index dea6d06ff4..fc07a2511a 100644 --- a/testsuite/tests/backpack/should_compile/T13214.stderr +++ b/testsuite/tests/backpack/should_compile/T13214.stderr @@ -7,12 +7,15 @@ [1 of 2] Compiling A ( q/A.hs, T13214.out/q/A.o ) [2 of 2] Compiling A2 ( q/A2.hs, T13214.out/q/A2.o ) [3 of 5] Processing r1 - [1 of 2] Compiling H[sig] ( r1/H.hsig, nothing ) - [2 of 2] Compiling C ( r1/C.hs, nothing ) + [1 of 3] Compiling H[sig] ( r1/H.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Compiling C ( r1/C.hs, nothing ) [4 of 5] Processing r2 - [1 of 2] Compiling H[sig] ( r2/H.hsig, nothing ) - [2 of 2] Compiling C ( r2/C.hs, nothing ) + [1 of 3] Compiling H[sig] ( r2/H.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Compiling C ( r2/C.hs, nothing ) [5 of 5] Processing r3 - [1 of 3] Compiling X[sig] ( r3/X.hsig, nothing ) - [2 of 3] Compiling H[sig] ( r3/H.hsig, nothing ) - [3 of 3] Compiling D ( r3/D.hs, nothing ) + [1 of 4] Compiling X[sig] ( r3/X.hsig, nothing ) + [2 of 4] Compiling H[sig] ( r3/H.hsig, nothing ) + [3 of 4] Instantiating p + [4 of 4] Compiling D ( r3/D.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/T13250.stderr b/testsuite/tests/backpack/should_compile/T13250.stderr index fc79c05623..3f8a6e14eb 100644 --- a/testsuite/tests/backpack/should_compile/T13250.stderr +++ b/testsuite/tests/backpack/should_compile/T13250.stderr @@ -8,3 +8,4 @@ [1 of 1] Including p[A=q:A] Instantiating p[A=q:A] [1 of 1] Compiling A[sig] ( p/A.hsig, T13250.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o ) + [1 of 1] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/T13323.stderr b/testsuite/tests/backpack/should_compile/T13323.stderr index 3d6a510ea1..eb49bcbfab 100644 --- a/testsuite/tests/backpack/should_compile/T13323.stderr +++ b/testsuite/tests/backpack/should_compile/T13323.stderr @@ -10,4 +10,5 @@ Instantiating p[A=q:A] [1 of 2] Compiling A[sig] ( p/A.hsig, T13323.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o ) [2 of 2] Compiling P ( p/P.hs, T13323.out/p/p-HVmFlcYSefiK5n1aDP1v7x/P.o ) - [1 of 1] Compiling R ( r/R.hs, T13323.out/r/R.o ) + [1 of 2] Compiling R ( r/R.hs, T13323.out/r/R.o ) + [2 of 2] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp01.stderr b/testsuite/tests/backpack/should_compile/bkp01.stderr index 51cc4b7cdd..6b191ebecd 100644 --- a/testsuite/tests/backpack/should_compile/bkp01.stderr +++ b/testsuite/tests/backpack/should_compile/bkp01.stderr @@ -2,7 +2,8 @@ [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) [2 of 2] Compiling A ( p/A.hs, nothing ) [2 of 4] Processing q - [1 of 1] Compiling H[sig] ( q/H.hsig, nothing ) + [1 of 2] Compiling H[sig] ( q/H.hsig, nothing ) + [2 of 2] Instantiating p [3 of 4] Processing h Instantiating h [1 of 1] Compiling H ( h/H.hs, bkp01.out/h/H.o ) @@ -15,4 +16,6 @@ Instantiating p[H=h:H] [1 of 2] Compiling H[sig] ( p/H.hsig, bkp01.out/p/p-6KeuBvYi0jvLWqVbkSAZMq/H.o ) [2 of 2] Compiling A ( p/A.hs, bkp01.out/p/p-6KeuBvYi0jvLWqVbkSAZMq/A.o ) - [1 of 1] Compiling H[sig] ( q/H.hsig, bkp01.out/q/q-6KeuBvYi0jvLWqVbkSAZMq/H.o ) + [1 of 2] Compiling H[sig] ( q/H.hsig, bkp01.out/q/q-6KeuBvYi0jvLWqVbkSAZMq/H.o ) + [2 of 2] Instantiating p + [1 of 1] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp02.stderr b/testsuite/tests/backpack/should_compile/bkp02.stderr index ace97e4b63..cd5cbf9902 100644 --- a/testsuite/tests/backpack/should_compile/bkp02.stderr +++ b/testsuite/tests/backpack/should_compile/bkp02.stderr @@ -11,4 +11,5 @@ Instantiating p[H=q:H] [1 of 2] Compiling H[sig] ( p/H.hsig, bkp02.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/H.o ) [2 of 2] Compiling A ( p/A.hs, bkp02.out/p/p-D5Mg3foBSCrDbQDKH4WGSG/A.o ) - [1 of 1] Compiling R ( r/R.hs, bkp02.out/r/R.o ) + [1 of 2] Compiling R ( r/R.hs, bkp02.out/r/R.o ) + [2 of 2] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp07.stderr b/testsuite/tests/backpack/should_compile/bkp07.stderr index 2ccfaac56a..4ab181e9bd 100644 --- a/testsuite/tests/backpack/should_compile/bkp07.stderr +++ b/testsuite/tests/backpack/should_compile/bkp07.stderr @@ -1,5 +1,6 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 2] Compiling B ( q/B.hs, nothing ) + [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 3] Compiling B ( q/B.hs, nothing ) + [3 of 3] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp08.stderr b/testsuite/tests/backpack/should_compile/bkp08.stderr index e81e013bc1..22313331c2 100644 --- a/testsuite/tests/backpack/should_compile/bkp08.stderr +++ b/testsuite/tests/backpack/should_compile/bkp08.stderr @@ -9,4 +9,5 @@ [2 of 2] Including r[H=q:H] Instantiating r[H=q:H] [1 of 1] Compiling H[sig] ( r/H.hsig, bkp08.out/r/r-D5Mg3foBSCrDbQDKH4WGSG/H.o ) - [1 of 1] Compiling M ( p/M.hs, bkp08.out/p/M.o ) + [1 of 2] Compiling M ( p/M.hs, bkp08.out/p/M.o ) + [2 of 2] Instantiating r diff --git a/testsuite/tests/backpack/should_compile/bkp09.stderr b/testsuite/tests/backpack/should_compile/bkp09.stderr index 24abba259f..7428ab3eb8 100644 --- a/testsuite/tests/backpack/should_compile/bkp09.stderr +++ b/testsuite/tests/backpack/should_compile/bkp09.stderr @@ -6,8 +6,10 @@ bkp09.bkp:1:26: warning: [2 of 5] Processing q [1 of 1] Compiling H[sig] ( q/H.hsig, nothing ) [3 of 5] Processing r - [1 of 2] Compiling H[sig] ( r/H.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 4] Compiling H[sig] ( r/H.hsig, nothing ) + [2 of 4] Compiling M ( r/M.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q [4 of 5] Processing h-impl Instantiating h-impl [1 of 1] Compiling H ( h-impl/H.hs, bkp09.out/h-impl/H.o ) @@ -22,5 +24,8 @@ bkp09.bkp:1:26: warning: [2 of 2] Including q[H=h-impl:H] Instantiating q[H=h-impl:H] [1 of 1] Compiling H[sig] ( q/H.hsig, bkp09.out/q/q-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [1 of 2] Compiling H[sig] ( r/H.hsig, bkp09.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [2 of 2] Compiling M ( r/M.hs, bkp09.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [1 of 4] Compiling H[sig] ( r/H.hsig, bkp09.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) + [2 of 4] Compiling M ( r/M.hs, bkp09.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q + [1 of 1] Instantiating r diff --git a/testsuite/tests/backpack/should_compile/bkp10.stderr b/testsuite/tests/backpack/should_compile/bkp10.stderr index 350670e6d4..95f8e632c9 100644 --- a/testsuite/tests/backpack/should_compile/bkp10.stderr +++ b/testsuite/tests/backpack/should_compile/bkp10.stderr @@ -2,5 +2,6 @@ [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) [2 of 2] Compiling A ( p/A.hs, nothing ) [2 of 2] Processing q - [1 of 2] Compiling H2[sig] ( q/H2.hsig, nothing ) - [2 of 2] Compiling B ( q/B.hs, nothing ) + [1 of 3] Compiling H2[sig] ( q/H2.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Compiling B ( q/B.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/bkp11.stderr b/testsuite/tests/backpack/should_compile/bkp11.stderr index a804563b2d..e27ed54cec 100644 --- a/testsuite/tests/backpack/should_compile/bkp11.stderr +++ b/testsuite/tests/backpack/should_compile/bkp11.stderr @@ -3,5 +3,6 @@ [2 of 3] Compiling H2[sig] ( p/H2.hsig, nothing ) [3 of 3] Compiling A ( p/A.hs, nothing ) [2 of 2] Processing q - [1 of 2] Compiling H[sig] ( q/H.hsig, nothing ) - [2 of 2] Compiling B ( q/B.hs, nothing ) + [1 of 3] Compiling H[sig] ( q/H.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Compiling B ( q/B.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/bkp12.stderr b/testsuite/tests/backpack/should_compile/bkp12.stderr index dc4debe3f3..648322e351 100644 --- a/testsuite/tests/backpack/should_compile/bkp12.stderr +++ b/testsuite/tests/backpack/should_compile/bkp12.stderr @@ -1,8 +1,9 @@ [1 of 4] Processing p [1 of 1] Compiling H[sig] ( p/H.hsig, nothing ) [2 of 4] Processing r - [1 of 2] Compiling H[sig] ( r/H.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 3] Compiling H[sig] ( r/H.hsig, nothing ) + [2 of 3] Compiling M ( r/M.hs, nothing ) + [3 of 3] Instantiating p [3 of 4] Processing h-impl Instantiating h-impl [1 of 1] Compiling H ( h-impl/H.hs, bkp12.out/h-impl/H.o ) @@ -14,5 +15,7 @@ [1 of 1] Including p[H=h-impl:H] Instantiating p[H=h-impl:H] [1 of 1] Compiling H[sig] ( p/H.hsig, bkp12.out/p/p-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [1 of 2] Compiling H[sig] ( r/H.hsig, bkp12.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [2 of 2] Compiling M ( r/M.hs, bkp12.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [1 of 3] Compiling H[sig] ( r/H.hsig, bkp12.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) + [2 of 3] Compiling M ( r/M.hs, bkp12.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [3 of 3] Instantiating p + [1 of 1] Instantiating r diff --git a/testsuite/tests/backpack/should_compile/bkp14.stderr b/testsuite/tests/backpack/should_compile/bkp14.stderr index b5b40b7eff..fadce50f3e 100644 --- a/testsuite/tests/backpack/should_compile/bkp14.stderr +++ b/testsuite/tests/backpack/should_compile/bkp14.stderr @@ -7,5 +7,6 @@ [1 of 2] Compiling F ( impl/F.hs, bkp14.out/impl/F.o ) [2 of 2] Compiling H ( impl/H.hs, bkp14.out/impl/H.o ) [3 of 3] Processing q - [1 of 2] Compiling Y[sig] ( q/Y.hsig, nothing ) - [2 of 2] Compiling X ( q/X.hs, nothing ) + [1 of 3] Compiling Y[sig] ( q/Y.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Compiling X ( q/X.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/bkp15.stderr b/testsuite/tests/backpack/should_compile/bkp15.stderr index 904ab2d4cb..d1f29fae2c 100644 --- a/testsuite/tests/backpack/should_compile/bkp15.stderr +++ b/testsuite/tests/backpack/should_compile/bkp15.stderr @@ -6,8 +6,10 @@ bkp15.bkp:1:26: warning: [2 of 5] Processing q [1 of 1] Compiling H[sig] ( q/H.hsig, nothing ) [3 of 5] Processing r - [1 of 2] Compiling H[sig] ( r/H.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 4] Compiling H[sig] ( r/H.hsig, nothing ) + [2 of 4] Compiling M ( r/M.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q [4 of 5] Processing h-impl Instantiating h-impl [1 of 1] Compiling H ( h-impl/H.hs, bkp15.out/h-impl/H.o ) @@ -21,5 +23,8 @@ bkp15.bkp:1:26: warning: [2 of 2] Including q[H=h-impl:H] Instantiating q[H=h-impl:H] [1 of 1] Compiling H[sig] ( q/H.hsig, bkp15.out/q/q-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [1 of 2] Compiling H[sig] ( r/H.hsig, bkp15.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [2 of 2] Compiling M ( r/M.hs, bkp15.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [1 of 4] Compiling H[sig] ( r/H.hsig, bkp15.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) + [2 of 4] Compiling M ( r/M.hs, bkp15.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q + [1 of 1] Instantiating r diff --git a/testsuite/tests/backpack/should_compile/bkp16.stderr b/testsuite/tests/backpack/should_compile/bkp16.stderr index d09d6e6823..5d105c204b 100644 --- a/testsuite/tests/backpack/should_compile/bkp16.stderr +++ b/testsuite/tests/backpack/should_compile/bkp16.stderr @@ -6,3 +6,4 @@ Instantiating p[Int=base-4.13.0.0:GHC.Exts] [1 of 1] Including ghc-prim-0.8.0 [1 of 1] Compiling Int[sig] ( p/Int.hsig, bkp16.out/p/p-97PZnzqiJmd2hTwUNGdjod/Int.o ) + [1 of 1] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp17.stderr b/testsuite/tests/backpack/should_compile/bkp17.stderr index a52394dcaf..151f9e197c 100644 --- a/testsuite/tests/backpack/should_compile/bkp17.stderr +++ b/testsuite/tests/backpack/should_compile/bkp17.stderr @@ -8,3 +8,4 @@ [1 of 1] Including p[H=q:M] Instantiating p[H=q:M] [1 of 1] Compiling H[sig] ( p/H.hsig, bkp17.out/p/p-Bk81HcBu6NbDb1eswyn055/H.o ) + [1 of 1] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp18.stderr b/testsuite/tests/backpack/should_compile/bkp18.stderr index e14b99431c..5fa98e552d 100644 --- a/testsuite/tests/backpack/should_compile/bkp18.stderr +++ b/testsuite/tests/backpack/should_compile/bkp18.stderr @@ -11,3 +11,4 @@ Instantiating r[H=h-impl:H] [1 of 2] Compiling H[sig] ( r/H.hsig, bkp18.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) [2 of 2] Compiling M ( r/M.hs, bkp18.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [1 of 1] Instantiating r diff --git a/testsuite/tests/backpack/should_compile/bkp19.stderr b/testsuite/tests/backpack/should_compile/bkp19.stderr index 952fd0ae0c..55e170f32b 100644 --- a/testsuite/tests/backpack/should_compile/bkp19.stderr +++ b/testsuite/tests/backpack/should_compile/bkp19.stderr @@ -11,3 +11,4 @@ Instantiating r[H=h-impl:H] [1 of 2] Compiling H[sig] ( r/H.hsig, bkp19.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) [2 of 2] Compiling M ( r/M.hs, bkp19.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [1 of 1] Instantiating r diff --git a/testsuite/tests/backpack/should_compile/bkp20.stderr b/testsuite/tests/backpack/should_compile/bkp20.stderr index 4dfdd7c337..ed2f5bda1a 100644 --- a/testsuite/tests/backpack/should_compile/bkp20.stderr +++ b/testsuite/tests/backpack/should_compile/bkp20.stderr @@ -3,8 +3,10 @@ [2 of 5] Processing q [1 of 1] Compiling H[sig] ( q/H.hsig, nothing ) [3 of 5] Processing r - [1 of 2] Compiling H[sig] ( r/H.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 4] Compiling H[sig] ( r/H.hsig, nothing ) + [2 of 4] Compiling M ( r/M.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q [4 of 5] Processing h-impl Instantiating h-impl [1 of 1] Compiling H ( h-impl/H.hs, bkp20.out/h-impl/H.o ) @@ -18,5 +20,8 @@ [2 of 2] Including q[H=h-impl:H] Instantiating q[H=h-impl:H] [1 of 1] Compiling H[sig] ( q/H.hsig, bkp20.out/q/q-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [1 of 2] Compiling H[sig] ( r/H.hsig, bkp20.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) - [2 of 2] Compiling M ( r/M.hs, bkp20.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [1 of 4] Compiling H[sig] ( r/H.hsig, bkp20.out/r/r-5FYQgnNkfSvBT5yogOxPpf/H.o ) + [2 of 4] Compiling M ( r/M.hs, bkp20.out/r/r-5FYQgnNkfSvBT5yogOxPpf/M.o ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q + [1 of 1] Instantiating r diff --git a/testsuite/tests/backpack/should_compile/bkp21.stderr b/testsuite/tests/backpack/should_compile/bkp21.stderr index abfe9ceffc..35cfa8e3ad 100644 --- a/testsuite/tests/backpack/should_compile/bkp21.stderr +++ b/testsuite/tests/backpack/should_compile/bkp21.stderr @@ -3,8 +3,14 @@ [2 of 5] Processing q [1 of 1] Compiling H[sig] ( q/H.hsig, nothing ) [3 of 5] Processing pq0 - [1 of 1] Compiling H[sig] ( pq0/H.hsig, nothing ) + [1 of 3] Compiling H[sig] ( pq0/H.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Instantiating q [4 of 5] Processing pq1 - [1 of 1] Compiling H[sig] ( pq1/H.hsig, nothing ) + [1 of 3] Compiling H[sig] ( pq1/H.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Instantiating q [5 of 5] Processing pq2 - [1 of 1] Compiling H[sig] ( pq2/H.hsig, nothing ) + [1 of 3] Compiling H[sig] ( pq2/H.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp23.stderr b/testsuite/tests/backpack/should_compile/bkp23.stderr index ea30294f15..18d96656fa 100644 --- a/testsuite/tests/backpack/should_compile/bkp23.stderr +++ b/testsuite/tests/backpack/should_compile/bkp23.stderr @@ -3,22 +3,27 @@ [2 of 3] Compiling B[sig] ( p/B.hsig, nothing ) [3 of 3] Compiling M ( p/M.hs, nothing ) [2 of 6] Processing q1 - [1 of 3] Compiling A[sig] ( q1/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q1/B.hsig, nothing ) - [3 of 3] Compiling Q ( q1/Q.hs, nothing ) + [1 of 4] Compiling A[sig] ( q1/A.hsig, nothing ) + [2 of 4] Compiling B[sig] ( q1/B.hsig, nothing ) + [3 of 4] Instantiating p + [4 of 4] Compiling Q ( q1/Q.hs, nothing ) [3 of 6] Processing q2 - [1 of 3] Compiling A[sig] ( q2/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q2/B.hsig, nothing ) - [3 of 3] Compiling Q ( q2/Q.hs, nothing ) + [1 of 4] Compiling A[sig] ( q2/A.hsig, nothing ) + [2 of 4] Compiling B[sig] ( q2/B.hsig, nothing ) + [3 of 4] Instantiating p + [4 of 4] Compiling Q ( q2/Q.hs, nothing ) [4 of 6] Processing q3 - [1 of 3] Compiling A[sig] ( q3/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q3/B.hsig, nothing ) - [3 of 3] Compiling Q ( q3/Q.hs, nothing ) + [1 of 4] Compiling A[sig] ( q3/A.hsig, nothing ) + [2 of 4] Compiling B[sig] ( q3/B.hsig, nothing ) + [3 of 4] Instantiating p + [4 of 4] Compiling Q ( q3/Q.hs, nothing ) [5 of 6] Processing q4 - [1 of 3] Compiling A[sig] ( q4/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q4/B.hsig, nothing ) - [3 of 3] Compiling Q ( q4/Q.hs, nothing ) + [1 of 4] Compiling A[sig] ( q4/A.hsig, nothing ) + [2 of 4] Compiling B[sig] ( q4/B.hsig, nothing ) + [3 of 4] Instantiating p + [4 of 4] Compiling Q ( q4/Q.hs, nothing ) [6 of 6] Processing q5 - [1 of 3] Compiling A[sig] ( q5/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q5/B.hsig, nothing ) - [3 of 3] Compiling Q ( q5/Q.hs, nothing ) + [1 of 4] Compiling A[sig] ( q5/A.hsig, nothing ) + [2 of 4] Compiling B[sig] ( q5/B.hsig, nothing ) + [3 of 4] Instantiating p + [4 of 4] Compiling Q ( q5/Q.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/bkp24.stderr b/testsuite/tests/backpack/should_compile/bkp24.stderr index ddafe4150b..11c9352b55 100644 --- a/testsuite/tests/backpack/should_compile/bkp24.stderr +++ b/testsuite/tests/backpack/should_compile/bkp24.stderr @@ -9,8 +9,9 @@ Instantiating b [1 of 1] Compiling B ( b/B.hs, bkp24.out/b/B.o ) [4 of 5] Processing q - [1 of 2] Compiling B[sig] ( q/B.hsig, nothing ) - [2 of 2] Compiling Q ( q/Q.hs, nothing ) + [1 of 3] Compiling B[sig] ( q/B.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Compiling Q ( q/Q.hs, nothing ) [5 of 5] Processing r Instantiating r [1 of 2] Including q[B=b:B] @@ -21,7 +22,9 @@ [2 of 3] Compiling B[sig] ( p/B.hsig, bkp24.out/p/p-BVwzUlgOVR6H8V9umpUZ2h/B.o ) [3 of 3] Compiling P ( p/P.hs, bkp24.out/p/p-BVwzUlgOVR6H8V9umpUZ2h/P.o ) [2 of 2] Including a - [1 of 2] Compiling B[sig] ( q/B.hsig, bkp24.out/q/q-3IeW1YRs0cYLmV4oNjoWji/B.o ) - [2 of 2] Compiling Q ( q/Q.hs, bkp24.out/q/q-3IeW1YRs0cYLmV4oNjoWji/Q.o ) + [1 of 3] Compiling B[sig] ( q/B.hsig, bkp24.out/q/q-3IeW1YRs0cYLmV4oNjoWji/B.o ) + [2 of 3] Compiling Q ( q/Q.hs, bkp24.out/q/q-3IeW1YRs0cYLmV4oNjoWji/Q.o ) + [3 of 3] Instantiating p [2 of 2] Including b - [1 of 1] Compiling R ( r/R.hs, bkp24.out/r/R.o ) + [1 of 2] Compiling R ( r/R.hs, bkp24.out/r/R.o ) + [2 of 2] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp25.stderr b/testsuite/tests/backpack/should_compile/bkp25.stderr index 55d6e4850a..583577587c 100644 --- a/testsuite/tests/backpack/should_compile/bkp25.stderr +++ b/testsuite/tests/backpack/should_compile/bkp25.stderr @@ -6,6 +6,7 @@ Instantiating r [1 of 1] Compiling Impl ( r/Impl.hs, bkp25.out/r/Impl.o ) [3 of 3] Processing q - [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q/B.hsig, nothing ) - [3 of 3] Compiling M ( q/M.hs, nothing ) + [1 of 4] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 4] Compiling B[sig] ( q/B.hsig, nothing ) + [3 of 4] Instantiating p + [4 of 4] Compiling M ( q/M.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/bkp26.stderr b/testsuite/tests/backpack/should_compile/bkp26.stderr index 64960b15c7..1afdcc57bc 100644 --- a/testsuite/tests/backpack/should_compile/bkp26.stderr +++ b/testsuite/tests/backpack/should_compile/bkp26.stderr @@ -10,4 +10,5 @@ Instantiating p[A=r:A] [1 of 2] Compiling A[sig] ( p/A.hsig, bkp26.out/p/p-8YQRY0unRYZCev5HBjXieS/A.o ) [2 of 2] Compiling P ( p/P.hs, bkp26.out/p/p-8YQRY0unRYZCev5HBjXieS/P.o ) - [1 of 1] Compiling M ( q/M.hs, bkp26.out/q/M.o ) + [1 of 2] Compiling M ( q/M.hs, bkp26.out/q/M.o ) + [2 of 2] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp27.stderr b/testsuite/tests/backpack/should_compile/bkp27.stderr index 72722ed2ea..88848886dc 100644 --- a/testsuite/tests/backpack/should_compile/bkp27.stderr +++ b/testsuite/tests/backpack/should_compile/bkp27.stderr @@ -11,4 +11,5 @@ [1 of 2] Compiling A[sig] ( p/A.hsig, bkp27.out/p/p-8YQRY0unRYZCev5HBjXieS/A.o ) [2 of 2] Compiling P ( p/P.hs, bkp27.out/p/p-8YQRY0unRYZCev5HBjXieS/P.o ) [2 of 2] Including r - [1 of 1] Compiling M ( q/M.hs, bkp27.out/q/M.o ) + [1 of 2] Compiling M ( q/M.hs, bkp27.out/q/M.o ) + [2 of 2] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp28.stderr b/testsuite/tests/backpack/should_compile/bkp28.stderr index 9ea43fcb45..6aced9716c 100644 --- a/testsuite/tests/backpack/should_compile/bkp28.stderr +++ b/testsuite/tests/backpack/should_compile/bkp28.stderr @@ -4,5 +4,6 @@ [2 of 3] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [3 of 3] Processing q - [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 2] Compiling B ( q/B.hs, nothing ) + [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 3] Compiling B ( q/B.hs, nothing ) + [3 of 3] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp29.stderr b/testsuite/tests/backpack/should_compile/bkp29.stderr index 1f4652b3a2..9906ca14f5 100644 --- a/testsuite/tests/backpack/should_compile/bkp29.stderr +++ b/testsuite/tests/backpack/should_compile/bkp29.stderr @@ -3,5 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling B[sig] ( q/B.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling C[sig] ( r/C.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 4] Compiling C[sig] ( r/C.hsig, nothing ) + [2 of 4] Compiling M ( r/M.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp30.stderr b/testsuite/tests/backpack/should_compile/bkp30.stderr index 1f4652b3a2..9906ca14f5 100644 --- a/testsuite/tests/backpack/should_compile/bkp30.stderr +++ b/testsuite/tests/backpack/should_compile/bkp30.stderr @@ -3,5 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling B[sig] ( q/B.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling C[sig] ( r/C.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 4] Compiling C[sig] ( r/C.hsig, nothing ) + [2 of 4] Compiling M ( r/M.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp31.stderr b/testsuite/tests/backpack/should_compile/bkp31.stderr index 523a635d3a..dfac74a509 100644 --- a/testsuite/tests/backpack/should_compile/bkp31.stderr +++ b/testsuite/tests/backpack/should_compile/bkp31.stderr @@ -2,7 +2,8 @@ [1 of 2] Compiling A[sig] ( ab-sigs/A.hsig, nothing ) [2 of 2] Compiling B[sig] ( ab-sigs/B.hsig, nothing ) [2 of 2] Processing abcd-holes - [1 of 4] Compiling C ( abcd-holes/C.hs, nothing ) - [2 of 4] Compiling B[sig] ( abcd-holes/B.hsig, nothing ) - [3 of 4] Compiling A[sig] ( abcd-holes/A.hsig, nothing ) - [4 of 4] Compiling D ( abcd-holes/D.hs, nothing ) + [1 of 5] Compiling C ( abcd-holes/C.hs, nothing ) + [2 of 5] Compiling B[sig] ( abcd-holes/B.hsig, nothing ) + [3 of 5] Compiling A[sig] ( abcd-holes/A.hsig, nothing ) + [4 of 5] Compiling D ( abcd-holes/D.hs, nothing ) + [5 of 5] Instantiating ab-sigs diff --git a/testsuite/tests/backpack/should_compile/bkp32.stderr b/testsuite/tests/backpack/should_compile/bkp32.stderr index c2cea8c2b0..3bdff93eb6 100644 --- a/testsuite/tests/backpack/should_compile/bkp32.stderr +++ b/testsuite/tests/backpack/should_compile/bkp32.stderr @@ -1,33 +1,51 @@ [ 1 of 11] Processing prelude-sig [1 of 1] Compiling Prel[sig] ( prelude-sig/Prel.hsig, nothing ) [ 2 of 11] Processing arrays-sig - [1 of 2] Compiling Prel[sig] ( arrays-sig/Prel.hsig, nothing ) - [2 of 2] Compiling Array[sig] ( arrays-sig/Array.hsig, nothing ) + [1 of 3] Compiling Prel[sig] ( arrays-sig/Prel.hsig, nothing ) + [2 of 3] Compiling Array[sig] ( arrays-sig/Array.hsig, nothing ) + [3 of 3] Instantiating prelude-sig [ 3 of 11] Processing structures - [1 of 5] Compiling Prel[sig] ( structures/Prel.hsig, nothing ) - [2 of 5] Compiling Array[sig] ( structures/Array.hsig, nothing ) - [3 of 5] Compiling Graph ( structures/Graph.hs, nothing ) - [4 of 5] Compiling Tree ( structures/Tree.hs, nothing ) - [5 of 5] Compiling Set ( structures/Set.hs, nothing ) + [1 of 6] Compiling Prel[sig] ( structures/Prel.hsig, nothing ) + [2 of 6] Compiling Array[sig] ( structures/Array.hsig, nothing ) + [3 of 6] Compiling Graph ( structures/Graph.hs, nothing ) + [4 of 6] Compiling Tree ( structures/Tree.hs, nothing ) + [5 of 6] Compiling Set ( structures/Set.hs, nothing ) + [6 of 6] Instantiating arrays-sig [ 4 of 11] Processing arrays-a - [1 of 2] Compiling Prel[sig] ( arrays-a/Prel.hsig, nothing ) - [2 of 2] Compiling Array ( arrays-a/Array.hs, nothing ) + [1 of 3] Compiling Prel[sig] ( arrays-a/Prel.hsig, nothing ) + [2 of 3] Compiling Array ( arrays-a/Array.hs, nothing ) + [3 of 3] Instantiating prelude-sig [ 5 of 11] Processing arrays-b - [1 of 2] Compiling Prel[sig] ( arrays-b/Prel.hsig, nothing ) - [2 of 2] Compiling Array ( arrays-b/Array.hs, nothing ) + [1 of 3] Compiling Prel[sig] ( arrays-b/Prel.hsig, nothing ) + [2 of 3] Compiling Array ( arrays-b/Array.hs, nothing ) + [3 of 3] Instantiating prelude-sig [ 6 of 11] Processing graph-a - [1 of 1] Compiling Prel[sig] ( graph-a/Prel.hsig, nothing ) + [1 of 3] Compiling Prel[sig] ( graph-a/Prel.hsig, nothing ) + [2 of 3] Instantiating arrays-a + [3 of 3] Instantiating structures [ 7 of 11] Processing graph-b - [1 of 1] Compiling Prel[sig] ( graph-b/Prel.hsig, nothing ) + [1 of 3] Compiling Prel[sig] ( graph-b/Prel.hsig, nothing ) + [2 of 3] Instantiating arrays-b + [3 of 3] Instantiating structures [ 8 of 11] Processing multiinst - [1 of 2] Compiling Prel[sig] ( multiinst/Prel.hsig, nothing ) - [2 of 2] Compiling Client ( multiinst/Client.hs, nothing ) + [1 of 6] Compiling Prel[sig] ( multiinst/Prel.hsig, nothing ) + [2 of 6] Instantiating arrays-a + [3 of 6] Instantiating arrays-b + [4 of 6] Instantiating structures + [5 of 6] Instantiating structures + [6 of 6] Compiling Client ( multiinst/Client.hs, nothing ) [ 9 of 11] Processing applic-left - [1 of 2] Compiling Prel[sig] ( applic-left/Prel.hsig, nothing ) - [2 of 2] Compiling Left ( applic-left/Left.hs, nothing ) + [1 of 4] Compiling Prel[sig] ( applic-left/Prel.hsig, nothing ) + [2 of 4] Instantiating arrays-a + [3 of 4] Instantiating structures + [4 of 4] Compiling Left ( applic-left/Left.hs, nothing ) [10 of 11] Processing applic-right - [1 of 2] Compiling Prel[sig] ( applic-right/Prel.hsig, nothing ) - [2 of 2] Compiling Right ( applic-right/Right.hs, nothing ) + [1 of 4] Compiling Prel[sig] ( applic-right/Prel.hsig, nothing ) + [2 of 4] Instantiating arrays-a + [3 of 4] Instantiating structures + [4 of 4] Compiling Right ( applic-right/Right.hs, nothing ) [11 of 11] Processing applic-bot - [1 of 2] Compiling Prel[sig] ( applic-bot/Prel.hsig, nothing ) - [2 of 2] Compiling Bot ( applic-bot/Bot.hs, nothing ) + [1 of 4] Compiling Prel[sig] ( applic-bot/Prel.hsig, nothing ) + [2 of 4] Instantiating applic-left + [3 of 4] Instantiating applic-right + [4 of 4] Compiling Bot ( applic-bot/Bot.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/bkp33.stderr b/testsuite/tests/backpack/should_compile/bkp33.stderr index 4fa8b755b0..2e88ce8b7f 100644 --- a/testsuite/tests/backpack/should_compile/bkp33.stderr +++ b/testsuite/tests/backpack/should_compile/bkp33.stderr @@ -11,4 +11,5 @@ [1 of 2] Compiling A[sig] ( sig/A.hsig, bkp33.out/sig/sig-HyoWTHt34SDIRGEX0vZ8iN/A.o ) [2 of 2] Compiling M ( sig/M.hs, bkp33.out/sig/sig-HyoWTHt34SDIRGEX0vZ8iN/M.o ) [2 of 2] Including mod - [1 of 1] Compiling S ( join/S.hs, bkp33.out/join/S.o ) + [1 of 2] Compiling S ( join/S.hs, bkp33.out/join/S.o ) + [2 of 2] Instantiating sig diff --git a/testsuite/tests/backpack/should_compile/bkp34.stderr b/testsuite/tests/backpack/should_compile/bkp34.stderr index 14aa7a843b..44b689db74 100644 --- a/testsuite/tests/backpack/should_compile/bkp34.stderr +++ b/testsuite/tests/backpack/should_compile/bkp34.stderr @@ -3,5 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling R ( r/R.hs, nothing ) + [1 of 4] Compiling A[sig] ( r/A.hsig, nothing ) + [2 of 4] Compiling R ( r/R.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp35.stderr b/testsuite/tests/backpack/should_compile/bkp35.stderr index 14aa7a843b..44b689db74 100644 --- a/testsuite/tests/backpack/should_compile/bkp35.stderr +++ b/testsuite/tests/backpack/should_compile/bkp35.stderr @@ -3,5 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling R ( r/R.hs, nothing ) + [1 of 4] Compiling A[sig] ( r/A.hsig, nothing ) + [2 of 4] Compiling R ( r/R.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp36.stderr b/testsuite/tests/backpack/should_compile/bkp36.stderr index 45ade1412f..2538ed6582 100644 --- a/testsuite/tests/backpack/should_compile/bkp36.stderr +++ b/testsuite/tests/backpack/should_compile/bkp36.stderr @@ -5,5 +5,6 @@ [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Compiling P ( p/P.hs, nothing ) [3 of 3] Processing q - [1 of 2] Compiling B[sig] ( q/B.hsig, nothing ) - [2 of 2] Compiling Q ( q/Q.hs, nothing ) + [1 of 3] Compiling B[sig] ( q/B.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Compiling Q ( q/Q.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/bkp37.stderr b/testsuite/tests/backpack/should_compile/bkp37.stderr index 90438e8c8a..d8bd7a980a 100644 --- a/testsuite/tests/backpack/should_compile/bkp37.stderr +++ b/testsuite/tests/backpack/should_compile/bkp37.stderr @@ -8,3 +8,4 @@ [1 of 1] Including p[A=q:A] Instantiating p[A=q:A] [1 of 1] Compiling A[sig] ( p/A.hsig, bkp37.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o ) + [1 of 1] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp38.stderr b/testsuite/tests/backpack/should_compile/bkp38.stderr index bb9ef66c27..7e144fc8ce 100644 --- a/testsuite/tests/backpack/should_compile/bkp38.stderr +++ b/testsuite/tests/backpack/should_compile/bkp38.stderr @@ -8,3 +8,4 @@ [1 of 1] Including p[A=q:A] Instantiating p[A=q:A] [1 of 1] Compiling A[sig] ( p/A.hsig, bkp38.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o ) + [1 of 1] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp39.stderr b/testsuite/tests/backpack/should_compile/bkp39.stderr index 924785c9da..a6a991610c 100644 --- a/testsuite/tests/backpack/should_compile/bkp39.stderr +++ b/testsuite/tests/backpack/should_compile/bkp39.stderr @@ -10,3 +10,4 @@ Instantiating p[A=q:A] [1 of 2] Compiling A[sig] ( p/A.hsig, bkp39.out/p/p-HVmFlcYSefiK5n1aDP1v7x/A.o ) [2 of 2] Compiling M ( p/M.hs, bkp39.out/p/p-HVmFlcYSefiK5n1aDP1v7x/M.o ) + [1 of 1] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp40.stderr b/testsuite/tests/backpack/should_compile/bkp40.stderr index 00176aabd2..f250951578 100644 --- a/testsuite/tests/backpack/should_compile/bkp40.stderr +++ b/testsuite/tests/backpack/should_compile/bkp40.stderr @@ -17,3 +17,5 @@ Instantiating user[Map=eqmap:Map] [1 of 2] Compiling Map[sig] ( user/Map.hsig, bkp40.out/user/user-9YyTxEeqz3GG5thfDXwuAf/Map.o ) [2 of 2] Compiling User ( user/User.hs, bkp40.out/user/user-9YyTxEeqz3GG5thfDXwuAf/User.o ) + [1 of 2] Instantiating user + [2 of 2] Instantiating user diff --git a/testsuite/tests/backpack/should_compile/bkp41.stderr b/testsuite/tests/backpack/should_compile/bkp41.stderr index 0dfe754666..766317718c 100644 --- a/testsuite/tests/backpack/should_compile/bkp41.stderr +++ b/testsuite/tests/backpack/should_compile/bkp41.stderr @@ -11,3 +11,4 @@ Instantiating sig[B=impl:B] [1 of 2] Compiling B[sig] ( sig/B.hsig, bkp41.out/sig/sig-HVnmSw44WZeBfwnUur4wzl/B.o ) [2 of 2] Compiling App ( sig/App.hs, bkp41.out/sig/sig-HVnmSw44WZeBfwnUur4wzl/App.o ) + [1 of 1] Instantiating sig diff --git a/testsuite/tests/backpack/should_compile/bkp42.stderr b/testsuite/tests/backpack/should_compile/bkp42.stderr index 69d8d7cf14..ae2bb75c51 100644 --- a/testsuite/tests/backpack/should_compile/bkp42.stderr +++ b/testsuite/tests/backpack/should_compile/bkp42.stderr @@ -12,3 +12,4 @@ Instantiating sig[B=impl:C] [1 of 2] Compiling B[sig] ( sig/B.hsig, bkp42.out/sig/sig-Ko6MwJiRFc509cOdDShPV5/B.o ) [2 of 2] Compiling App ( sig/App.hs, bkp42.out/sig/sig-Ko6MwJiRFc509cOdDShPV5/App.o ) + [1 of 1] Instantiating sig diff --git a/testsuite/tests/backpack/should_compile/bkp43.stderr b/testsuite/tests/backpack/should_compile/bkp43.stderr index 6915f14f1c..e8beb8c76f 100644 --- a/testsuite/tests/backpack/should_compile/bkp43.stderr +++ b/testsuite/tests/backpack/should_compile/bkp43.stderr @@ -1,8 +1,9 @@ [1 of 4] Processing sig [1 of 1] Compiling A[sig] ( sig/A.hsig, nothing ) [2 of 4] Processing blub - [1 of 2] Compiling A[sig] ( blub/A.hsig, nothing ) - [2 of 2] Compiling M ( blub/M.hs, nothing ) + [1 of 3] Compiling A[sig] ( blub/A.hsig, nothing ) + [2 of 3] Compiling M ( blub/M.hs, nothing ) + [3 of 3] Instantiating sig [3 of 4] Processing impl Instantiating impl [1 of 1] Compiling A ( impl/A.hs, bkp43.out/impl/A.o ) @@ -12,3 +13,4 @@ Instantiating blub[A=impl:A] [1 of 2] Compiling A[sig] ( blub/A.hsig, bkp43.out/blub/blub-EMBMWyCjWt1EWXmIjSqmRG/A.o ) [2 of 2] Compiling M ( blub/M.hs, bkp43.out/blub/blub-EMBMWyCjWt1EWXmIjSqmRG/M.o ) + [1 of 1] Instantiating blub diff --git a/testsuite/tests/backpack/should_compile/bkp44.stderr b/testsuite/tests/backpack/should_compile/bkp44.stderr index 020dfa67ca..83a8578dcd 100644 --- a/testsuite/tests/backpack/should_compile/bkp44.stderr +++ b/testsuite/tests/backpack/should_compile/bkp44.stderr @@ -2,9 +2,10 @@ [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Compiling B[sig] ( p/B.hsig, nothing ) [2 of 4] Processing q - [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 3] Compiling B[sig] ( q/B.hsig, nothing ) - [3 of 3] Compiling M ( q/M.hs, nothing ) + [1 of 4] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 4] Compiling B[sig] ( q/B.hsig, nothing ) + [3 of 4] Compiling M ( q/M.hs, nothing ) + [4 of 4] Instantiating p [3 of 4] Processing pimpl Instantiating pimpl [1 of 2] Compiling A ( pimpl/A.hs, bkp44.out/pimpl/A.o ) @@ -16,3 +17,4 @@ [1 of 3] Compiling A[sig] ( q/A.hsig, bkp44.out/q/q-BxPafal3NcFHV8AOBzU3fg/A.o ) [2 of 3] Compiling B[sig] ( q/B.hsig, bkp44.out/q/q-BxPafal3NcFHV8AOBzU3fg/B.o ) [3 of 3] Compiling M ( q/M.hs, bkp44.out/q/q-BxPafal3NcFHV8AOBzU3fg/M.o ) + [1 of 1] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp45.stderr b/testsuite/tests/backpack/should_compile/bkp45.stderr index 4a6f1d68aa..aaefe2a527 100644 --- a/testsuite/tests/backpack/should_compile/bkp45.stderr +++ b/testsuite/tests/backpack/should_compile/bkp45.stderr @@ -3,5 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling B ( r/B.hs, nothing ) + [1 of 4] Compiling A[sig] ( r/A.hsig, nothing ) + [2 of 4] Compiling B ( r/B.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp46.stderr b/testsuite/tests/backpack/should_compile/bkp46.stderr index 220eb96ab3..5706fd457d 100644 --- a/testsuite/tests/backpack/should_compile/bkp46.stderr +++ b/testsuite/tests/backpack/should_compile/bkp46.stderr @@ -10,3 +10,4 @@ Instantiating p[A=i:A] [1 of 2] Compiling A[sig] ( p/A.hsig, bkp46.out/p/p-CtJxD03mJqIIVJzOga8l4X/A.o ) [2 of 2] Compiling B ( p/B.hs, bkp46.out/p/p-CtJxD03mJqIIVJzOga8l4X/B.o ) + [1 of 1] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp47.stderr b/testsuite/tests/backpack/should_compile/bkp47.stderr index 0cc25d58c1..134cbd4f42 100644 --- a/testsuite/tests/backpack/should_compile/bkp47.stderr +++ b/testsuite/tests/backpack/should_compile/bkp47.stderr @@ -3,10 +3,12 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling B ( r/B.hs, nothing ) + [1 of 4] Compiling A[sig] ( r/A.hsig, nothing ) + [2 of 4] Compiling B ( r/B.hs, nothing ) bkp47.bkp:19:18: warning: [-Wmissing-methods (in -Wdefault)] • No explicit implementation for either ‘f’ or ‘g’ • In the instance declaration for ‘C Int’ + [3 of 4] Instantiating p + [4 of 4] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp48.stderr b/testsuite/tests/backpack/should_compile/bkp48.stderr index ae6c7fc575..e1d0213493 100644 --- a/testsuite/tests/backpack/should_compile/bkp48.stderr +++ b/testsuite/tests/backpack/should_compile/bkp48.stderr @@ -3,7 +3,9 @@ [2 of 5] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 5] Processing r - [1 of 1] Compiling A[sig] ( r/A.hsig, nothing ) + [1 of 3] Compiling A[sig] ( r/A.hsig, nothing ) + [2 of 3] Instantiating p + [3 of 3] Instantiating q [4 of 5] Processing i Instantiating i [1 of 1] Compiling A ( i/A.hs, bkp48.out/i/A.o ) @@ -17,6 +19,11 @@ [2 of 2] Including q[A=i:A] Instantiating q[A=i:A] [1 of 1] Compiling A[sig] ( q/A.hsig, bkp48.out/q/q-CtJxD03mJqIIVJzOga8l4X/A.o ) - [1 of 1] Compiling A[sig] ( r/A.hsig, bkp48.out/r/r-CtJxD03mJqIIVJzOga8l4X/A.o ) + [1 of 3] Compiling A[sig] ( r/A.hsig, bkp48.out/r/r-CtJxD03mJqIIVJzOga8l4X/A.o ) + [2 of 3] Instantiating p + [3 of 3] Instantiating q [2 of 3] Including p[A=i:A] [3 of 3] Including q[A=i:A] + [1 of 3] Instantiating r + [2 of 3] Instantiating p + [3 of 3] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp49.stderr b/testsuite/tests/backpack/should_compile/bkp49.stderr index d8f64f0657..e18512573b 100644 --- a/testsuite/tests/backpack/should_compile/bkp49.stderr +++ b/testsuite/tests/backpack/should_compile/bkp49.stderr @@ -1,4 +1,5 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 2] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp50.stderr b/testsuite/tests/backpack/should_compile/bkp50.stderr index d8f64f0657..e18512573b 100644 --- a/testsuite/tests/backpack/should_compile/bkp50.stderr +++ b/testsuite/tests/backpack/should_compile/bkp50.stderr @@ -1,4 +1,5 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 2] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp51.stderr b/testsuite/tests/backpack/should_compile/bkp51.stderr index 652f309735..9ce49d116b 100644 --- a/testsuite/tests/backpack/should_compile/bkp51.stderr +++ b/testsuite/tests/backpack/should_compile/bkp51.stderr @@ -8,15 +8,20 @@ [2 of 3] Compiling H[sig] ( q/H.hsig, nothing ) [3 of 3] Compiling C ( q/C.hs, nothing ) [3 of 6] Processing r - [1 of 3] Compiling H[sig] ( r/H.hsig, nothing ) - [2 of 3] Compiling B[sig] ( r/B.hsig, nothing ) - [3 of 3] Compiling D ( r/D.hs, nothing ) + [1 of 4] Compiling H[sig] ( r/H.hsig, nothing ) + [2 of 4] Compiling B[sig] ( r/B.hsig, nothing ) + [3 of 4] Compiling D ( r/D.hs, nothing ) + [4 of 4] Instantiating q [4 of 6] Processing s - [1 of 2] Compiling H[sig] ( s/H.hsig, nothing ) - [2 of 2] Compiling E ( s/E.hs, nothing ) + [1 of 3] Compiling H[sig] ( s/H.hsig, nothing ) + [2 of 3] Instantiating r + [3 of 3] Compiling E ( s/E.hs, nothing ) [5 of 6] Processing t - [1 of 2] Compiling H[sig] ( t/H.hsig, nothing ) - [2 of 2] Compiling F ( t/F.hs, nothing ) + [1 of 4] Compiling H[sig] ( t/H.hsig, nothing ) + [2 of 4] Instantiating s + [3 of 4] Instantiating r + [4 of 4] Compiling F ( t/F.hs, nothing ) [6 of 6] Processing u - [1 of 2] Compiling H[sig] ( u/H.hsig, nothing ) - [2 of 2] Compiling G ( u/G.hs, nothing ) + [1 of 3] Compiling H[sig] ( u/H.hsig, nothing ) + [2 of 3] Instantiating q + [3 of 3] Compiling G ( u/G.hs, nothing ) diff --git a/testsuite/tests/backpack/should_compile/bkp53.stderr b/testsuite/tests/backpack/should_compile/bkp53.stderr index a2b19452b2..ccf948619f 100644 --- a/testsuite/tests/backpack/should_compile/bkp53.stderr +++ b/testsuite/tests/backpack/should_compile/bkp53.stderr @@ -3,5 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling M ( r/M.hs, nothing ) + [1 of 4] Compiling A[sig] ( r/A.hsig, nothing ) + [2 of 4] Compiling M ( r/M.hs, nothing ) + [3 of 4] Instantiating p + [4 of 4] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp54.stderr b/testsuite/tests/backpack/should_compile/bkp54.stderr index f3aafc1258..75815bb8b6 100644 --- a/testsuite/tests/backpack/should_compile/bkp54.stderr +++ b/testsuite/tests/backpack/should_compile/bkp54.stderr @@ -1,5 +1,6 @@ [1 of 2] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [2 of 2] Processing p - [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) - [2 of 2] Compiling M ( p/M.hs, nothing ) + [1 of 3] Compiling A[sig] ( p/A.hsig, nothing ) + [2 of 3] Compiling M ( p/M.hs, nothing ) + [3 of 3] Instantiating q diff --git a/testsuite/tests/backpack/should_compile/bkp55.stderr b/testsuite/tests/backpack/should_compile/bkp55.stderr index 9213c9c84f..5c55e4e992 100644 --- a/testsuite/tests/backpack/should_compile/bkp55.stderr +++ b/testsuite/tests/backpack/should_compile/bkp55.stderr @@ -1,5 +1,6 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 2] Compiling B[sig] ( q/B.hsig, nothing ) - [2 of 2] Compiling M ( q/M.hs, nothing ) + [1 of 3] Compiling B[sig] ( q/B.hsig, nothing ) + [2 of 3] Compiling M ( q/M.hs, nothing ) + [3 of 3] Instantiating p diff --git a/testsuite/tests/backpack/should_compile/bkp57.stderr b/testsuite/tests/backpack/should_compile/bkp57.stderr index 96f769a402..dc2eeb19cc 100644 --- a/testsuite/tests/backpack/should_compile/bkp57.stderr +++ b/testsuite/tests/backpack/should_compile/bkp57.stderr @@ -16,4 +16,5 @@ [1 of 1] Including common [1 of 2] Compiling Instance[sig] ( consumer-abs/Instance.hsig, bkp57.out/consumer-abs/consumer-abs-EtqPCpl4Hcf9otzJUe9fPM/Instance.o ) [2 of 2] Compiling Downstream ( consumer-abs/Downstream.hs, bkp57.out/consumer-abs/consumer-abs-EtqPCpl4Hcf9otzJUe9fPM/Downstream.o ) - [1 of 1] Compiling Tie ( tie/Tie.hs, bkp57.out/tie/Tie.o ) + [1 of 2] Compiling Tie ( tie/Tie.hs, bkp57.out/tie/Tie.o ) + [2 of 2] Instantiating consumer-abs diff --git a/testsuite/tests/backpack/should_compile/bkp59.stderr b/testsuite/tests/backpack/should_compile/bkp59.stderr index 364d6c2601..6938021c4a 100644 --- a/testsuite/tests/backpack/should_compile/bkp59.stderr +++ b/testsuite/tests/backpack/should_compile/bkp59.stderr @@ -16,4 +16,5 @@ [1 of 1] Including common [1 of 2] Compiling Instance[sig] ( consumer-abs/Instance.hsig, bkp59.out/consumer-abs/consumer-abs-EtqPCpl4Hcf9otzJUe9fPM/Instance.o ) [2 of 2] Compiling Downstream ( consumer-abs/Downstream.hs, bkp59.out/consumer-abs/consumer-abs-EtqPCpl4Hcf9otzJUe9fPM/Downstream.o ) - [1 of 1] Compiling Tie ( tie/Tie.hs, bkp59.out/tie/Tie.o ) + [1 of 2] Compiling Tie ( tie/Tie.hs, bkp59.out/tie/Tie.o ) + [2 of 2] Instantiating consumer-abs diff --git a/testsuite/tests/backpack/should_fail/all.T b/testsuite/tests/backpack/should_fail/all.T index b9d1eeba3e..5e0d6fdeea 100644 --- a/testsuite/tests/backpack/should_fail/all.T +++ b/testsuite/tests/backpack/should_fail/all.T @@ -45,3 +45,7 @@ test('bkpfail46', normal, backpack_compile_fail, ['']) test('bkpfail47', normal, backpack_compile_fail, ['']) test('bkpfail48', normal, backpack_compile_fail, ['']) test('bkpfail49', normal, backpack_compile_fail, ['']) +test('bkpfail50', normal, backpack_compile_fail, ['']) +test('bkpfail51', normal, backpack_compile_fail, ['']) +test('bkpfail52', normal, backpack_compile_fail, ['']) +test('bkpfail53', normal, backpack_compile_fail, ['']) diff --git a/testsuite/tests/backpack/should_fail/bkpfail04.stderr b/testsuite/tests/backpack/should_fail/bkpfail04.stderr index 0cb8d9cfe0..397cd24851 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail04.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail04.stderr @@ -3,7 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) + [1 of 4] Compiling A[sig] ( r/A.hsig, nothing ) bkpfail04.bkp:7:9: error: • Type constructor ‘A’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail05.stderr b/testsuite/tests/backpack/should_fail/bkpfail05.stderr index b231bbdb5b..da996cfb7e 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail05.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail05.stderr @@ -4,7 +4,8 @@ Instantiating t-impl [1 of 1] Compiling T ( t-impl/T.hs, bkpfail05.out/t-impl/T.o ) [3 of 5] Processing p - [1 of 1] Compiling H[sig] ( p/H.hsig, nothing ) + [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) + [2 of 2] Instantiating h [4 of 5] Processing h-impl Instantiating h-impl [1 of 1] Including t-impl diff --git a/testsuite/tests/backpack/should_fail/bkpfail07.stderr b/testsuite/tests/backpack/should_fail/bkpfail07.stderr index 05277035dd..251fd67f0b 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail07.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail07.stderr @@ -5,7 +5,9 @@ [2 of 3] Compiling H ( h/H.hs, nothing ) [3 of 3] Compiling A[sig] ( h/A.hsig, nothing ) [3 of 3] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 3] Instantiating h + [3 of 3] Instantiating p bkpfail07.bkp:6:9: error: • Type constructor ‘T’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail09.stderr b/testsuite/tests/backpack/should_fail/bkpfail09.stderr index b33c3b4b77..de1d100a34 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail09.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail09.stderr @@ -5,6 +5,8 @@ Instantiating q [1 of 1] Compiling H ( q/H.hs, bkpfail09.out/q/H.o ) [3 of 3] Processing r + [1 of 3] Compiling H2[sig] ( r/H2.hsig, nothing ) + [2 of 3] Instantiating p Command line argument: -unit-id p[H=H]:0:0: error: • ‘H’ is exported by the hsig file, but not exported by the implementing module ‘q:H’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail12.stderr b/testsuite/tests/backpack/should_fail/bkpfail12.stderr index 0526da438c..f240d2f058 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail12.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail12.stderr @@ -5,6 +5,8 @@ Instantiating q [1 of 1] Compiling Q ( q/Q.hs, bkpfail12.out/q/Q.o ) [3 of 3] Processing r + [1 of 3] Compiling H[sig] ( r/H.hsig, nothing ) + [2 of 3] Instantiating p bkpfail12.bkp:8:9: error: • Identifier ‘f’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail13.stderr b/testsuite/tests/backpack/should_fail/bkpfail13.stderr index afd4474f35..13d227a617 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail13.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail13.stderr @@ -5,6 +5,8 @@ Instantiating q [1 of 1] Compiling QMe ( q/QMe.hs, bkpfail13.out/q/QMe.o ) [3 of 3] Processing r + [1 of 3] Compiling H[sig] ( r/H.hsig, nothing ) + [2 of 3] Instantiating p bkpfail13.bkp:8:9: error: • Identifier ‘f’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail14.stderr b/testsuite/tests/backpack/should_fail/bkpfail14.stderr index d89e6cab28..401cab2286 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail14.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail14.stderr @@ -8,6 +8,8 @@ [2 of 3] Compiling Q ( q/Q.hs, bkpfail14.out/q/Q.o ) [3 of 3] Compiling Q2 ( q/Q2.hs, bkpfail14.out/q/Q2.o ) [3 of 3] Processing r + [1 of 3] Compiling H[sig] ( r/H.hsig, nothing ) + [2 of 3] Instantiating p bkpfail14.bkp:9:9: error: • Identifier ‘f’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail15.stderr b/testsuite/tests/backpack/should_fail/bkpfail15.stderr index f32cd6dcf7..cf30efe6f8 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail15.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail15.stderr @@ -6,7 +6,8 @@ Instantiating q [1 of 1] Compiling Q ( q/Q.hs, bkpfail15.out/q/Q.o ) [3 of 3] Processing r - [1 of 1] Compiling A[sig] ( r/A.hsig, nothing ) + [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) + [2 of 2] Instantiating p bkpfail15.bkp:8:9: error: • Identifier ‘f’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail20.stderr b/testsuite/tests/backpack/should_fail/bkpfail20.stderr index 4e95695a15..bd450f9f8c 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail20.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail20.stderr @@ -3,7 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 1] Compiling B[sig] ( r/B.hsig, nothing ) + [1 of 3] Compiling B[sig] ( r/B.hsig, nothing ) bkpfail20.bkp:1:1: error: • While merging export lists, could not unify Data.STRef.Lazy.newSTRef with GHC.STRef.newSTRef diff --git a/testsuite/tests/backpack/should_fail/bkpfail21.stderr b/testsuite/tests/backpack/should_fail/bkpfail21.stderr index 693135bd45..bc40bbc344 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail21.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail21.stderr @@ -5,9 +5,9 @@ [1 of 2] Compiling B[sig] ( q/B.hsig, nothing ) [2 of 2] Compiling C[sig] ( q/C.hsig, nothing ) [3 of 3] Processing r - [1 of 3] Compiling H2[sig] ( r/H2.hsig, nothing ) - [2 of 3] Compiling H1[sig] ( r/H1.hsig, nothing ) - [3 of 3] Compiling H3[sig] ( r/H3.hsig, nothing ) + [1 of 5] Compiling H2[sig] ( r/H2.hsig, nothing ) + [2 of 5] Compiling H1[sig] ( r/H1.hsig, nothing ) + [3 of 5] Compiling H3[sig] ( r/H3.hsig, nothing ) bkpfail21.bkp:1:1: error: • While merging export lists, could not unify {H1.T} with {H2.T} diff --git a/testsuite/tests/backpack/should_fail/bkpfail28.stderr b/testsuite/tests/backpack/should_fail/bkpfail28.stderr index 4428da9a41..4850e19240 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail28.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail28.stderr @@ -3,8 +3,8 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) - [2 of 2] Compiling R ( r/R.hs, nothing ) + [1 of 4] Compiling A[sig] ( r/A.hsig, nothing ) + [2 of 4] Compiling R ( r/R.hs, nothing ) bkpfail28.bkp:18:13: error: • Overlapping instances for Show (K a) arising from a use of ‘show’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail29.stderr b/testsuite/tests/backpack/should_fail/bkpfail29.stderr index dde8978471..dc4f64768a 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail29.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail29.stderr @@ -3,7 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 2] Compiling A[sig] ( r/A.hsig, nothing ) + [1 of 4] Compiling A[sig] ( r/A.hsig, nothing ) bkpfail29.bkp:8:9: error: • Cycle in type synonym declarations: diff --git a/testsuite/tests/backpack/should_fail/bkpfail31.stderr b/testsuite/tests/backpack/should_fail/bkpfail31.stderr index b5c9bc7b1f..ab599229ad 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail31.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail31.stderr @@ -1,7 +1,7 @@ [1 of 4] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 4] Processing q - [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) <no location info>: error: The identifier T does not exist in the local signature. diff --git a/testsuite/tests/backpack/should_fail/bkpfail33.stderr b/testsuite/tests/backpack/should_fail/bkpfail33.stderr index 4da8897b68..addc8d9733 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail33.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail33.stderr @@ -1,7 +1,7 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) bkpfail33.bkp:5:18: error: • Not in scope: type constructor or class ‘T’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail34.stderr b/testsuite/tests/backpack/should_fail/bkpfail34.stderr index 225e491406..cbe8a1bdbe 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail34.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail34.stderr @@ -1,7 +1,7 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) <no location info>: error: The identifier T does not exist in the local signature. diff --git a/testsuite/tests/backpack/should_fail/bkpfail35.stderr b/testsuite/tests/backpack/should_fail/bkpfail35.stderr index cbb2152f7f..893a8dd2ae 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail35.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail35.stderr @@ -2,7 +2,8 @@ [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Compiling B ( p/B.hs, nothing ) [2 of 4] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 2] Instantiating p [3 of 4] Processing aimpl Instantiating aimpl [1 of 1] Compiling A ( aimpl/A.hs, bkpfail35.out/aimpl/A.o ) diff --git a/testsuite/tests/backpack/should_fail/bkpfail36.stderr b/testsuite/tests/backpack/should_fail/bkpfail36.stderr index cd65f67384..e031625aac 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail36.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail36.stderr @@ -2,8 +2,8 @@ [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Compiling B[sig] ( p/B.hsig, nothing ) [2 of 2] Processing q - [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 2] Compiling B[sig] ( q/B.hsig, nothing ) + [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 3] Compiling B[sig] ( q/B.hsig, nothing ) <no location info>: error: The identifier T does not exist in the signature for <A> diff --git a/testsuite/tests/backpack/should_fail/bkpfail38.stderr b/testsuite/tests/backpack/should_fail/bkpfail38.stderr index df4a1d0483..264e150783 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail38.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail38.stderr @@ -3,7 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 1] Compiling A[sig] ( r/A.hsig, nothing ) + [1 of 3] Compiling A[sig] ( r/A.hsig, nothing ) bkpfail38.bkp:8:9: error: • Identifier ‘op’ has conflicting fixities in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail41.stderr b/testsuite/tests/backpack/should_fail/bkpfail41.stderr index 6cd72dcad1..6f58345fe7 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail41.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail41.stderr @@ -5,7 +5,8 @@ Instantiating i [1 of 1] Compiling A ( i/A.hs, bkpfail41.out/i/A.o ) [3 of 3] Processing r - [1 of 1] Compiling B[sig] ( r/B.hsig, nothing ) + [1 of 2] Compiling B[sig] ( r/B.hsig, nothing ) + [2 of 2] Instantiating p bkpfail41.bkp:10:9: error: • Class ‘C’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail42.stderr b/testsuite/tests/backpack/should_fail/bkpfail42.stderr index 5b078910f9..aa6857e9a1 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail42.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail42.stderr @@ -1,7 +1,7 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) + [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) bkpfail42.bkp:9:9: error: • Type constructor ‘F’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail47.stderr b/testsuite/tests/backpack/should_fail/bkpfail47.stderr index 0eb58d8ee4..d7f7c174d6 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail47.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail47.stderr @@ -3,7 +3,7 @@ [2 of 3] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [3 of 3] Processing r - [1 of 1] Compiling A[sig] ( r/A.hsig, nothing ) + [1 of 3] Compiling A[sig] ( r/A.hsig, nothing ) bkpfail47.bkp:9:9: error: • Type constructor ‘T’ has conflicting definitions in the module diff --git a/testsuite/tests/backpack/should_fail/bkpfail48.stderr b/testsuite/tests/backpack/should_fail/bkpfail48.stderr index cb0740d8bf..27a1f25ac0 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail48.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail48.stderr @@ -1,7 +1,7 @@ [1 of 2] Processing q [1 of 1] Compiling A[sig] ( q/A.hsig, nothing ) [2 of 2] Processing p - [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) + [1 of 2] Compiling A[sig] ( p/A.hsig, nothing ) bkpfail48.bkp:6:18: error: • The export item ‘module Data.Bool’ is not imported diff --git a/testsuite/tests/backpack/should_fail/bkpfail49.stderr b/testsuite/tests/backpack/should_fail/bkpfail49.stderr index c2236e5375..27892ec8cf 100644 --- a/testsuite/tests/backpack/should_fail/bkpfail49.stderr +++ b/testsuite/tests/backpack/should_fail/bkpfail49.stderr @@ -1,8 +1,8 @@ [1 of 2] Processing p [1 of 1] Compiling A[sig] ( p/A.hsig, nothing ) [2 of 2] Processing q - [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) - [2 of 2] Compiling M ( q/M.hs, nothing ) + [1 of 3] Compiling A[sig] ( q/A.hsig, nothing ) + [2 of 3] Compiling M ( q/M.hs, nothing ) bkpfail49.bkp:11:13: error: Not in scope: data constructor ‘A.True’ diff --git a/testsuite/tests/backpack/should_fail/bkpfail50.bkp b/testsuite/tests/backpack/should_fail/bkpfail50.bkp new file mode 100644 index 0000000000..1dda1cb119 --- /dev/null +++ b/testsuite/tests/backpack/should_fail/bkpfail50.bkp @@ -0,0 +1,8 @@ +unit p where + signature H where + data T = T Int +unit q where + dependency p[H=<A>] + signature A where + data T = T Bool +-- signatures don't merge diff --git a/testsuite/tests/backpack/should_fail/bkpfail50.stderr b/testsuite/tests/backpack/should_fail/bkpfail50.stderr new file mode 100644 index 0000000000..2d4d171ea7 --- /dev/null +++ b/testsuite/tests/backpack/should_fail/bkpfail50.stderr @@ -0,0 +1,16 @@ +[1 of 2] Processing p + [1 of 1] Compiling H[sig] ( p/H.hsig, nothing ) +[2 of 2] Processing q + [1 of 2] Compiling A[sig] ( q/A.hsig, nothing ) + +bkpfail50.bkp:7:9: error: + • Type constructor ‘T’ has conflicting definitions in the module + and its hsig file + Main module: type T :: * + data T = T Bool + Hsig file: type T :: * + data T = T Int + The constructors do not match: The types for ‘T’ differ + • while merging the signatures from: + • p[H=<A>]:H + • ...and the local signature for A diff --git a/testsuite/tests/backpack/should_fail/bkpfail51.bkp b/testsuite/tests/backpack/should_fail/bkpfail51.bkp new file mode 100644 index 0000000000..e8cfe5938d --- /dev/null +++ b/testsuite/tests/backpack/should_fail/bkpfail51.bkp @@ -0,0 +1,11 @@ +unit p where + signature H where + data T = T Int + module I(module H) where + import H +unit q where + dependency p[H=<A>] + signature A where + import I + type T = H.T +-- cyclic import diff --git a/testsuite/tests/backpack/should_fail/bkpfail51.stderr b/testsuite/tests/backpack/should_fail/bkpfail51.stderr new file mode 100644 index 0000000000..c732e0bcbf --- /dev/null +++ b/testsuite/tests/backpack/should_fail/bkpfail51.stderr @@ -0,0 +1,8 @@ +[1 of 2] Processing p + [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) + [2 of 2] Compiling I ( p/I.hs, nothing ) +[2 of 2] Processing q +Module imports and instantiations form a cycle: + instantiated unit p[H=A] + imports module ‘A’ (q/A.hsig) + which imports instantiated unit p[H=A] diff --git a/testsuite/tests/backpack/should_fail/bkpfail52.bkp b/testsuite/tests/backpack/should_fail/bkpfail52.bkp new file mode 100644 index 0000000000..da5a3c0822 --- /dev/null +++ b/testsuite/tests/backpack/should_fail/bkpfail52.bkp @@ -0,0 +1,11 @@ +unit p where + signature H where + data T = T Int +unit q where + dependency p[H=<A>] + module B where + data T = T Bool + signature A where + import qualified B + type T = B.T +-- signatures don't merge diff --git a/testsuite/tests/backpack/should_fail/bkpfail52.stderr b/testsuite/tests/backpack/should_fail/bkpfail52.stderr new file mode 100644 index 0000000000..888434e33c --- /dev/null +++ b/testsuite/tests/backpack/should_fail/bkpfail52.stderr @@ -0,0 +1,16 @@ +[1 of 2] Processing p + [1 of 1] Compiling H[sig] ( p/H.hsig, nothing ) +[2 of 2] Processing q + [1 of 3] Compiling B ( q/B.hs, nothing ) + [2 of 3] Compiling A[sig] ( q/A.hsig, nothing ) + +bkpfail52.bkp:10:9: error: + • Type constructor ‘T’ has conflicting definitions in the module + and its hsig file + Main module: type T :: * + type T = B.T + Hsig file: type T :: * + data T = T Int + • while merging the signatures from: + • p[H=<A>]:H + • ...and the local signature for A diff --git a/testsuite/tests/backpack/should_fail/bkpfail53.bkp b/testsuite/tests/backpack/should_fail/bkpfail53.bkp new file mode 100644 index 0000000000..47e7c4593c --- /dev/null +++ b/testsuite/tests/backpack/should_fail/bkpfail53.bkp @@ -0,0 +1,21 @@ + +unit p where + signature H where + data T = T Int + module I(module H) where + import H + x :: Int -> T + x = T +unit q where + dependency p[H=<A>] + module B where + data T = T Bool + signature A where + import qualified B + type T = B.T + module C where + import qualified B + import qualified I + x :: Int -> B.T + x = I.x +-- signatures don't merge diff --git a/testsuite/tests/backpack/should_fail/bkpfail53.stderr b/testsuite/tests/backpack/should_fail/bkpfail53.stderr new file mode 100644 index 0000000000..b694bc57ff --- /dev/null +++ b/testsuite/tests/backpack/should_fail/bkpfail53.stderr @@ -0,0 +1,17 @@ +[1 of 2] Processing p + [1 of 2] Compiling H[sig] ( p/H.hsig, nothing ) + [2 of 2] Compiling I ( p/I.hs, nothing ) +[2 of 2] Processing q + [1 of 4] Compiling B ( q/B.hs, nothing ) + [2 of 4] Compiling A[sig] ( q/A.hsig, nothing ) + +bkpfail53.bkp:15:9: error: + • Type constructor ‘T’ has conflicting definitions in the module + and its hsig file + Main module: type T :: * + type T = B.T + Hsig file: type T :: * + data T = T Int + • while merging the signatures from: + • p[H=<A>]:H + • ...and the local signature for A |