diff options
| author | Paolo Capriotti <p.capriotti@gmail.com> | 2012-09-03 10:52:00 +0100 |
|---|---|---|
| committer | Paolo Capriotti <p.capriotti@gmail.com> | 2012-09-03 10:53:39 +0100 |
| commit | a0fa6c37dc263ee8517a372f7ce509728b84eb98 (patch) | |
| tree | b146bd5ca93ff4eb85ed42632553ade975a916cb /testsuite/tests/ghci/scripts | |
| parent | 490e006fc24e971155c31f177a5b89d8412a996e (diff) | |
| download | haskell-a0fa6c37dc263ee8517a372f7ce509728b84eb98.tar.gz | |
Adapt tests to the removal of the MR in GHCi
Diffstat (limited to 'testsuite/tests/ghci/scripts')
| -rw-r--r-- | testsuite/tests/ghci/scripts/2816.script | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/2976.script | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T5130.script | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T5130.stderr | 6 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci042.script | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci055.script | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci057.stdout | 1 |
7 files changed, 6 insertions, 11 deletions
diff --git a/testsuite/tests/ghci/scripts/2816.script b/testsuite/tests/ghci/scripts/2816.script index 5fd8477b64..3f4ce8aefb 100644 --- a/testsuite/tests/ghci/scripts/2816.script +++ b/testsuite/tests/ghci/scripts/2816.script @@ -1,5 +1,5 @@ α -let α = 4 +let α = 4 :: Integer α 4 :type α diff --git a/testsuite/tests/ghci/scripts/2976.script b/testsuite/tests/ghci/scripts/2976.script index f4fe8d7122..32a5472b05 100644 --- a/testsuite/tests/ghci/scripts/2976.script +++ b/testsuite/tests/ghci/scripts/2976.script @@ -1,4 +1,4 @@ -let test = 0 +let test = 0 :: Integer :show bindings :force test :show bindings diff --git a/testsuite/tests/ghci/scripts/T5130.script b/testsuite/tests/ghci/scripts/T5130.script index cb4e9d0d6b..ad8625736b 100644 --- a/testsuite/tests/ghci/scripts/T5130.script +++ b/testsuite/tests/ghci/scripts/T5130.script @@ -1,3 +1,3 @@ :set -XScopedTypeVariables -(\(x :: a, y :: a) -> [x, "hi"]) +let f = (\(x :: a, y :: a) -> [x, "hi"]) diff --git a/testsuite/tests/ghci/scripts/T5130.stderr b/testsuite/tests/ghci/scripts/T5130.stderr deleted file mode 100644 index 3c31593991..0000000000 --- a/testsuite/tests/ghci/scripts/T5130.stderr +++ /dev/null @@ -1,6 +0,0 @@ - -<interactive>:3:27: - Couldn't match expected type `a' with actual type `[Char]' - In the expression: "hi" - In the expression: [x, "hi"] - In the expression: (\ (x :: a, y :: a) -> [x, "hi"]) diff --git a/testsuite/tests/ghci/scripts/ghci042.script b/testsuite/tests/ghci/scripts/ghci042.script index f33d7423a1..548f18c4b5 100644 --- a/testsuite/tests/ghci/scripts/ghci042.script +++ b/testsuite/tests/ghci/scripts/ghci042.script @@ -2,7 +2,7 @@ data T = A {a :: Int} :i A :i a -let a = 3 +let a = 3 :: Integer :i a a data R = B {a :: Int} diff --git a/testsuite/tests/ghci/scripts/ghci055.script b/testsuite/tests/ghci/scripts/ghci055.script index 46a08a2bc3..5f19cfdd5c 100644 --- a/testsuite/tests/ghci/scripts/ghci055.script +++ b/testsuite/tests/ghci/scripts/ghci055.script @@ -1,5 +1,5 @@ let x=undefined -let y=3 +let y=3 :: Integer :force x :show bindings -- in 7.3 and earlier this used to print just "*** Exception: diff --git a/testsuite/tests/ghci/scripts/ghci057.stdout b/testsuite/tests/ghci/scripts/ghci057.stdout index f97ea30c3d..ef6644d023 100644 --- a/testsuite/tests/ghci/scripts/ghci057.stdout +++ b/testsuite/tests/ghci/scripts/ghci057.stdout @@ -40,6 +40,7 @@ base language is: Haskell2010 with the following modifiers: -XGADTs -XGADTSyntax + -XNoMonomorphismRestriction -XNoDatatypeContexts -XNondecreasingIndentation -XMonoLocalBinds |