[commit: testsuite] wip/T8503: Type function application has its own depth counter now (701de95)

git at git.haskell.org git at git.haskell.org
Thu Nov 21 16:55:24 UTC 2013


Repository : ssh://git@git.haskell.org/testsuite

On branch  : wip/T8503
Link       : http://ghc.haskell.org/trac/ghc/changeset/701de951c742e3a848fe8e2b18558644da7bca5d/testsuite

>---------------------------------------------------------------

commit 701de951c742e3a848fe8e2b18558644da7bca5d
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Nov 20 10:23:46 2013 +0000

    Type function application has its own depth counter now


>---------------------------------------------------------------

701de951c742e3a848fe8e2b18558644da7bca5d
 tests/indexed-types/should_fail/SkolemOccursLoop.hs |    2 +-
 tests/typecheck/should_fail/ContextStack2.stderr    |    4 ++--
 tests/typecheck/should_fail/all.T                   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/indexed-types/should_fail/SkolemOccursLoop.hs b/tests/indexed-types/should_fail/SkolemOccursLoop.hs
index 1696a45..7d06f3f 100644
--- a/tests/indexed-types/should_fail/SkolemOccursLoop.hs
+++ b/tests/indexed-types/should_fail/SkolemOccursLoop.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fcontext-stack=3 #-}
+{-# OPTIONS_GHC -ftype-function-depth=3 #-}
 {-# LANGUAGE TypeFamilies, FlexibleContexts, EmptyDataDecls #-}
 
 module SkolemOccursLoop where
diff --git a/tests/typecheck/should_fail/ContextStack2.stderr b/tests/typecheck/should_fail/ContextStack2.stderr
index 1a48a62..210e22d 100644
--- a/tests/typecheck/should_fail/ContextStack2.stderr
+++ b/tests/typecheck/should_fail/ContextStack2.stderr
@@ -1,7 +1,7 @@
 
 ContextStack2.hs:8:6:
-    Context reduction stack overflow; size = 11
-    Use -fcontext-stack=N to increase stack size to N
+    Type function application stack overflow; size = 11
+    Use -ftype-function-depth=N to increase stack size to N
       (TF (TF (TF (TF (TF (TF (TF (TF (TF (TF (TF a)))))))))),
        TF (TF (TF (TF (TF (TF (TF (TF (TF (TF (TF Int)))))))))))
       ~ TF (TF (TF (TF (TF (TF (TF (TF (TF (TF a)))))))))
diff --git a/tests/typecheck/should_fail/all.T b/tests/typecheck/should_fail/all.T
index b6530b1..0050d65 100644
--- a/tests/typecheck/should_fail/all.T
+++ b/tests/typecheck/should_fail/all.T
@@ -326,4 +326,4 @@ test('T8428', normal, compile_fail, [''])
 test('T8450', normal, compile_fail, [''])
 test('T8514', normal, compile_fail, [''])
 test('ContextStack1', normal, compile_fail, ['-fcontext-stack=10'])
-test('ContextStack2', normal, compile_fail, ['-fcontext-stack=10'])
+test('ContextStack2', normal, compile_fail, ['-ftype-function-depth=10'])



More information about the ghc-commits mailing list