diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-03-02 20:58:40 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-03-02 20:58:40 +0000 |
| commit | 564bc417ac32905cbe338436bc178055955e4b31 (patch) | |
| tree | f3e8050a9cdd6e20d9f9f5d4804554873f3cf7ed /testsuite/tests | |
| parent | 8f8065db8de1c2ab9f9381e98bc0f15795af0136 (diff) | |
| download | haskell-564bc417ac32905cbe338436bc178055955e4b31.tar.gz | |
Update layout tests
Diffstat (limited to 'testsuite/tests')
10 files changed, 26 insertions, 4 deletions
diff --git a/testsuite/tests/ghc-regress/layout/Makefile b/testsuite/tests/ghc-regress/layout/Makefile index 81ec35633c..16f94f9f7c 100644 --- a/testsuite/tests/ghc-regress/layout/Makefile +++ b/testsuite/tests/ghc-regress/layout/Makefile @@ -9,4 +9,7 @@ layout001 layout002 layout003 layout004 layout005 layout006 layout007 layout008 $(RM) $*.hi $*.o echo Running with -XAlternativeLayoutRule -"$(TEST_HC)" -v0 -XAlternativeLayoutRule -c $*.hs 2>&1 + $(RM) $*.hi $*.o + echo Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional + -"$(TEST_HC)" -v0 -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional -c $*.hs 2>&1 diff --git a/testsuite/tests/ghc-regress/layout/layout001.stdout b/testsuite/tests/ghc-regress/layout/layout001.stdout index f473c7bee8..be1cd62b20 100644 --- a/testsuite/tests/ghc-regress/layout/layout001.stdout +++ b/testsuite/tests/ghc-regress/layout/layout001.stdout @@ -2,3 +2,8 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule layout001.hs:6:3: parse error on input `where' +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional + +layout001.hs:6:3: + transitional layout will not be accepted in the future: + `where' clause at the same depth as implicit layout block diff --git a/testsuite/tests/ghc-regress/layout/layout002.stdout b/testsuite/tests/ghc-regress/layout/layout002.stdout index fdbfcd4fda..7197cdaa39 100644 --- a/testsuite/tests/ghc-regress/layout/layout002.stdout +++ b/testsuite/tests/ghc-regress/layout/layout002.stdout @@ -1,4 +1,3 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule - -layout002.hs:4:31: parse error on input `else' +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional diff --git a/testsuite/tests/ghc-regress/layout/layout003.stdout b/testsuite/tests/ghc-regress/layout/layout003.stdout index 339c2c3ed6..e40bac2077 100644 --- a/testsuite/tests/ghc-regress/layout/layout003.stdout +++ b/testsuite/tests/ghc-regress/layout/layout003.stdout @@ -2,3 +2,8 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule layout003.hs:11:4: parse error on input `|' +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional + +layout003.hs:11:4: + transitional layout will not be accepted in the future: + `|' at the same depth as implicit layout block diff --git a/testsuite/tests/ghc-regress/layout/layout004.stdout b/testsuite/tests/ghc-regress/layout/layout004.stdout index a16179a773..bb5cb0661b 100644 --- a/testsuite/tests/ghc-regress/layout/layout004.stdout +++ b/testsuite/tests/ghc-regress/layout/layout004.stdout @@ -2,3 +2,6 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule layout004.hs:7:14: parse error on input `,' +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional + +layout004.hs:7:14: parse error on input `,' diff --git a/testsuite/tests/ghc-regress/layout/layout005.stdout b/testsuite/tests/ghc-regress/layout/layout005.stdout index 8463361fa1..7197cdaa39 100644 --- a/testsuite/tests/ghc-regress/layout/layout005.stdout +++ b/testsuite/tests/ghc-regress/layout/layout005.stdout @@ -1,4 +1,3 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule - -layout005.hs:9:13: parse error on input `else' +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional diff --git a/testsuite/tests/ghc-regress/layout/layout006.stdout b/testsuite/tests/ghc-regress/layout/layout006.stdout index 8027f8dd71..ab33a6e1fe 100644 --- a/testsuite/tests/ghc-regress/layout/layout006.stdout +++ b/testsuite/tests/ghc-regress/layout/layout006.stdout @@ -2,3 +2,8 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule layout006.hs:12:2: parse error on input `|' +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional + +layout006.hs:12:2: + transitional layout will not be accepted in the future: + `|' at the same depth as implicit layout block diff --git a/testsuite/tests/ghc-regress/layout/layout007.stdout b/testsuite/tests/ghc-regress/layout/layout007.stdout index 8826545235..7197cdaa39 100644 --- a/testsuite/tests/ghc-regress/layout/layout007.stdout +++ b/testsuite/tests/ghc-regress/layout/layout007.stdout @@ -1,2 +1,3 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional diff --git a/testsuite/tests/ghc-regress/layout/layout008.stdout b/testsuite/tests/ghc-regress/layout/layout008.stdout index 8826545235..7197cdaa39 100644 --- a/testsuite/tests/ghc-regress/layout/layout008.stdout +++ b/testsuite/tests/ghc-regress/layout/layout008.stdout @@ -1,2 +1,3 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional diff --git a/testsuite/tests/ghc-regress/layout/layout009.stdout b/testsuite/tests/ghc-regress/layout/layout009.stdout index 8826545235..7197cdaa39 100644 --- a/testsuite/tests/ghc-regress/layout/layout009.stdout +++ b/testsuite/tests/ghc-regress/layout/layout009.stdout @@ -1,2 +1,3 @@ Running with -XNoAlternativeLayoutRule Running with -XAlternativeLayoutRule +Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional |