shithub: MicroHs

Info  •  Files  •  Log  •  Branches

Make it work with new ghc.  It has very different error output.

--- a/tests/errmsg.test

+++ b/tests/errmsg.test

@@ -1,6 +1,6 @@

 module M() awhere

 -----

-mhs: "../tmp/E.hs": line 2, col 12:

+"../tmp/E.hs": line 2, col 12:

   found:    awhere

   expected: where

@@ -10,7 +10,7 @@

 x = 1 +

 y = 0

 -----

-mhs: "../tmp/E.hs": line 5, col 1:

+"../tmp/E.hs": line 5, col 1:

   found:    ;

   expected: - LQIdent ( UQIdent [ literal primitive \ case let if QualDo do

@@ -19,7 +19,7 @@

 x :: Int

 x = y

 -----

-mhs: "../tmp/E.hs": line 4, col 5: undefined value: y

+"../tmp/E.hs": line 4, col 5: undefined value: y

 =====

 module E() where

@@ -26,7 +26,7 @@

 x :: Int

 x = A

 -----

-mhs: "../tmp/E.hs": line 4, col 5: undefined value: A

+"../tmp/E.hs": line 4, col 5: undefined value: A

 =====

 module E() where

@@ -33,7 +33,7 @@

 x :: T

 x = 1

 -----

-mhs: "../tmp/E.hs": line 3, col 6: undefined type: T

+"../tmp/E.hs": line 3, col 6: undefined type: T

 =====

 module E() where

@@ -44,7 +44,7 @@

 x :: Int

 x = 3

 -----

-mhs: "../tmp/E.hs": line 4, col 1: duplicate definition E.x

+"../tmp/E.hs": line 4, col 1: duplicate definition E.x

 =====

 module E() where

@@ -53,33 +53,33 @@

 x :: D T

 x = [0]

 -----

-mhs: "../tmp/E.hs": line 5, col 8: bad synonym use

+"../tmp/E.hs": line 5, col 8: bad synonym use

 =====

 module E(module M) where

 -----

-mhs: "../tmp/E.hs": line 2, col 17: undefined module: M

+"../tmp/E.hs": line 2, col 17: undefined module: M

 =====

 module E(T) where

 -----

-mhs: "../tmp/E.hs": line 2, col 10: undefined export: T

+"../tmp/E.hs": line 2, col 10: undefined export: T

 =====

 module E(T(..)) where

 -----

-mhs: "../tmp/E.hs": line 2, col 10: undefined export: T

+"../tmp/E.hs": line 2, col 10: undefined export: T

 =====

 module E(x) where

 -----

-mhs: "../tmp/E.hs": line 2, col 10: undefined export: x

+"../tmp/E.hs": line 2, col 10: undefined export: x

 =====

 module E(lookup) where

 import TestMap

 -----

-mhs: "../tmp/E.hs": line 2, col 10: ambiguous export: lookup [Data.List.lookup,TestMap.lookup]

+"../tmp/E.hs": line 2, col 10: ambiguous export: lookup [Data.List.lookup,TestMap.lookup]

 =====

 module E() where

@@ -87,7 +87,7 @@

 a :: ()

 a = lookup

 -----

-mhs: "../tmp/E.hs": line 5, col 5: ambiguous value: lookup [Data.List.lookup,TestMap.lookup]

+"../tmp/E.hs": line 5, col 5: ambiguous value: lookup [Data.List.lookup,TestMap.lookup]

 =====

 module E() where

@@ -100,7 +100,7 @@

 x :: Int

 x = 1 +++ 2 *** 3

 -----

-mhs: "../tmp/E.hs": line 10, col 13: ambiguous operator expression

+"../tmp/E.hs": line 10, col 13: ambiguous operator expression

 =====

 module E() where

@@ -107,19 +107,19 @@

 a :: Int

 a = 'a'

 -----

-mhs: "../tmp/E.hs": line 4, col 5: Cannot satisfy constraint: (Char ~ Int)

+"../tmp/E.hs": line 4, col 5: Cannot satisfy constraint: (Char ~ Int)

      fully qualified: (Primitives.~ Primitives.Char Primitives.Int)

 =====

 module E() where

 data T = C Maybe

 -----

-mhs: "../tmp/E.hs": line 3, col 12: kind error: cannot unify Type and (_a2 -> _a3)

+"../tmp/E.hs": line 3, col 12: kind error: cannot unify Type and (_a2 -> _a3)

 =====

 module E() where

 data T (a :: X) = T

 -----

-mhs: "../tmp/E.hs": line 3, col 14: undefined kind: X

+"../tmp/E.hs": line 3, col 14: undefined kind: X

 =====

 module E() where

@@ -127,7 +127,7 @@

 x :: Int

 x = let { C a = C (1::Int) } in a

 -----

-mhs: "../tmp/E.hs": line 5, col 11: existentials not allowed in pattern binding

+"../tmp/E.hs": line 5, col 11: existentials not allowed in pattern binding

 =====

 module E() where

@@ -134,7 +134,7 @@

 class C a where { m :: a }

 instance C Int where { x = 1 }

 -----

-mhs: "../tmp/E.hs": line 4, col 24: superflous instance binding

+"../tmp/E.hs": line 4, col 24: superflous instance binding

 =====

 module E() where

@@ -142,7 +142,7 @@

 x = case undefined of

       C -> True

 -----

-mhs: "../tmp/E.hs": line 5, col 7: too few arguments

+"../tmp/E.hs": line 5, col 7: too few arguments

 =====

 module E() where

@@ -150,7 +150,7 @@

 x = case undefined of

       C _ _ -> True

 -----

-mhs: "../tmp/E.hs": line 5, col 7: too many arguments

+"../tmp/E.hs": line 5, col 7: too many arguments

 =====

 END

--- a/tests/errtester.sh

+++ b/tests/errtester.sh

@@ -37,6 +37,6 @@

     #echo "==="

     #echo "next: $line"

     sed -e '/^ *$/d' $terr > $err

-    $comp $* -i../lib -i../tmp E 2>&1 | sed -e 's/^gmhs/mhs/' -e '/CallStack/,$d' -e '/^XX/d' -e 's/^mhs: error:/mhs:/' > $cerr

-    diff $err $cerr || exit 1

+    $comp $* -i../lib -i../tmp E 2>&1 | sed -e 's/^gmhs/mhs/' -e '/CallStack/,$d' -e '/^XX/d' -e 's/^mhs: error:/mhs:/' -e 's/^mhs: //' -e '/Uncaught exception/d' -e '/^ *$/d'  > $cerr

+    diff $err $cerr || (cat ../tmp/E.hs; exit 1)

 done