From 0b36e0020f306c31f8e1dae9e3d0ad97ccd6aa37 Mon Sep 17 00:00:00 2001 From: sof <unknown> Date: Sun, 24 Jan 1999 13:45:09 +0000 Subject: [PATCH] [project @ 1999-01-24 13:45:05 by sof] Updated desugaring reg. tests --- ghc/tests/deSugar/should_compile/ds002.stderr | 14 +++++----- ghc/tests/deSugar/should_compile/ds003.stderr | 8 +++--- ghc/tests/deSugar/should_compile/ds019.stderr | 10 +++---- ghc/tests/deSugar/should_compile/ds020.stderr | 26 +++++++++---------- ghc/tests/deSugar/should_compile/ds022.stderr | 8 +++--- ghc/tests/deSugar/should_compile/ds033.stderr | 2 -- ghc/tests/deSugar/should_compile/ds034.stderr | 1 - ghc/tests/deSugar/should_compile/ds040.stderr | 7 +++-- ghc/tests/deSugar/should_compile/ds042.hs | 8 ++++++ 9 files changed, 44 insertions(+), 40 deletions(-) create mode 100644 ghc/tests/deSugar/should_compile/ds042.hs diff --git a/ghc/tests/deSugar/should_compile/ds002.stderr b/ghc/tests/deSugar/should_compile/ds002.stderr index facbd68204d3..beaeb336242b 100644 --- a/ghc/tests/deSugar/should_compile/ds002.stderr +++ b/ghc/tests/deSugar/should_compile/ds002.stderr @@ -1,8 +1,8 @@ -ds002.hs:11: - Pattern match(es) are overlapped in the definition of function `g' - x y z = ... -ds002.hs:7: - Pattern match(es) are overlapped in the definition of function `f' - y = ... - z = ... +ds002.hs:7: Pattern match(es) are overlapped in the definition of function `f': + f y = ... + f z = ... + +ds002.hs:11: Pattern match(es) are overlapped in the definition of function `g': + g x y z = ... + diff --git a/ghc/tests/deSugar/should_compile/ds003.stderr b/ghc/tests/deSugar/should_compile/ds003.stderr index 3b040b67fa12..188cae5d4ad9 100644 --- a/ghc/tests/deSugar/should_compile/ds003.stderr +++ b/ghc/tests/deSugar/should_compile/ds003.stderr @@ -1,5 +1,5 @@ -ds003.hs:5: - Pattern match(es) are overlapped in the definition of function `f' - (: x (: x1 (: x2 x3))) ~(y, ys) z = ... - x y True = ... +ds003.hs:5: Pattern match(es) are overlapped in the definition of function `f': + f (x : (x1 : (x2 : x3))) ~(y, ys) z = ... + f x y True = ... + diff --git a/ghc/tests/deSugar/should_compile/ds019.stderr b/ghc/tests/deSugar/should_compile/ds019.stderr index 069a78e757a4..874b393d40e8 100644 --- a/ghc/tests/deSugar/should_compile/ds019.stderr +++ b/ghc/tests/deSugar/should_compile/ds019.stderr @@ -1,6 +1,6 @@ -ds019.hs:5: - Pattern match(es) are overlapped in the definition of function `f' - d (j, k) p = ... - (e, f, g) l q = ... - h (m, n) r = ... +ds019.hs:5: Pattern match(es) are overlapped in the definition of function `f': + f d (j, k) p = ... + f (e, f, g) l q = ... + f h (m, n) r = ... + diff --git a/ghc/tests/deSugar/should_compile/ds020.stderr b/ghc/tests/deSugar/should_compile/ds020.stderr index e1d1baece937..909af82d9a2f 100644 --- a/ghc/tests/deSugar/should_compile/ds020.stderr +++ b/ghc/tests/deSugar/should_compile/ds020.stderr @@ -1,14 +1,14 @@ -ds020.hs:5: - Pattern match(es) are overlapped in the definition of function `a' - ~(~[], ~[], ~[]) = ... -ds020.hs:8: - Pattern match(es) are overlapped in the definition of function `b' - ~(: ~x (: ~xs ~ys)) = ... -ds020.hs:13: - Pattern match(es) are overlapped in the definition of function `d' - ~(n+43) = ... - ~(n+999) = ... -ds020.hs:19: - Pattern match(es) are overlapped in the definition of function `f' - (x@~[]) = ... +ds020.hs:5: Pattern match(es) are overlapped in the definition of function `a': + a ~(~[], ~[], ~[]) = ... + +ds020.hs:8: Pattern match(es) are overlapped in the definition of function `b': + b ~(~x : (~xs : ~ys)) = ... + +ds020.hs:13: Pattern match(es) are overlapped in the definition of function `d': + d ~(n+43) = ... + d ~(n+999) = ... + +ds020.hs:19: Pattern match(es) are overlapped in the definition of function `f': + f (x@~[]) = ... + diff --git a/ghc/tests/deSugar/should_compile/ds022.stderr b/ghc/tests/deSugar/should_compile/ds022.stderr index 1d0291b37151..380086f9a02a 100644 --- a/ghc/tests/deSugar/should_compile/ds022.stderr +++ b/ghc/tests/deSugar/should_compile/ds022.stderr @@ -1,5 +1,5 @@ -ds022.hs:20: - Pattern match(es) are overlapped in the definition of function `i' - 1 1.1 = ... - 2 2.2 = ... +ds022.hs:20: Pattern match(es) are overlapped in the definition of function `i': + i 1 1.1 = ... + i 2 2.2 = ... + diff --git a/ghc/tests/deSugar/should_compile/ds033.stderr b/ghc/tests/deSugar/should_compile/ds033.stderr index 955d1e1e9fe9..e69de29bb2d1 100644 --- a/ghc/tests/deSugar/should_compile/ds033.stderr +++ b/ghc/tests/deSugar/should_compile/ds033.stderr @@ -1,2 +0,0 @@ - -NOTE: Simplifier still going after 4 iterations; bailing out. diff --git a/ghc/tests/deSugar/should_compile/ds034.stderr b/ghc/tests/deSugar/should_compile/ds034.stderr index 0af03cd0f96c..e69de29bb2d1 100644 --- a/ghc/tests/deSugar/should_compile/ds034.stderr +++ b/ghc/tests/deSugar/should_compile/ds034.stderr @@ -1 +0,0 @@ -NOTE: Simplifier still going after 4 iterations; baling out. diff --git a/ghc/tests/deSugar/should_compile/ds040.stderr b/ghc/tests/deSugar/should_compile/ds040.stderr index 60773af411d8..c20c84f9a35b 100644 --- a/ghc/tests/deSugar/should_compile/ds040.stderr +++ b/ghc/tests/deSugar/should_compile/ds040.stderr @@ -1,5 +1,4 @@ -ds040.hs:7: - Pattern match(es) are overlapped - in the definition of function `^^^^' - _ _ = ... +ds040.hs:7: Pattern match(es) are overlapped in the definition of function `^^^^': + ^^^^ _ _ = ... + diff --git a/ghc/tests/deSugar/should_compile/ds042.hs b/ghc/tests/deSugar/should_compile/ds042.hs new file mode 100644 index 000000000000..e3f928d8d940 --- /dev/null +++ b/ghc/tests/deSugar/should_compile/ds042.hs @@ -0,0 +1,8 @@ +-- !!! Guard on a tuple pattern, broke 4.01 due to the +-- !!! special handling of unboxed tuples in desugarer. +module ShouldCompile where + +f :: Int -> (Int,Int) +f x = + case f x of + (a,b) | a > 0 -> f (x-1) -- GitLab