summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2013-11-20 10:23:46 +0000
committerJoachim Breitner <mail@joachim-breitner.de>2013-11-22 17:54:12 +0000
commita4c79e3e403d2b37b53e6a225f8fcea0eaf6c578 (patch)
tree17e50258438dcad1f3063b6dbdb91323d6a61d88
parent7055a16c3066fa6b4367e20d95fd6c13a7d0da47 (diff)
downloadhaskell-a4c79e3e403d2b37b53e6a225f8fcea0eaf6c578.tar.gz
Type function application has its own depth counter now
-rw-r--r--testsuite/tests/indexed-types/should_fail/SkolemOccursLoop.hs2
-rw-r--r--testsuite/tests/typecheck/should_fail/ContextStack2.stderr4
-rw-r--r--testsuite/tests/typecheck/should_fail/all.T2
3 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/indexed-types/should_fail/SkolemOccursLoop.hs b/testsuite/tests/indexed-types/should_fail/SkolemOccursLoop.hs
index 1696a454dd..7d06f3f686 100644
--- a/testsuite/tests/indexed-types/should_fail/SkolemOccursLoop.hs
+++ b/testsuite/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/testsuite/tests/typecheck/should_fail/ContextStack2.stderr b/testsuite/tests/typecheck/should_fail/ContextStack2.stderr
index 1a48a623f7..210e22d8db 100644
--- a/testsuite/tests/typecheck/should_fail/ContextStack2.stderr
+++ b/testsuite/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/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index 39a5fc2a51..4776b56cf9 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/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'])