2004-10-04 John Luke <john.luke@gmail.com>

        * cs8205.cs: remove, same as cs1624
        * cs8206.cs: fix yield syntax, and add line number, now passes
        * cs8207.cs: remove, same as cs1623
        * cs8208.cs: remove, same as cs1625
        * cs8209.cs: remove, same as cs1631

svn path=/trunk/mcs/; revision=34695

diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog
index 32957353af50989baf3f3d222624074b5fcd2fe0..17bde415812bba4e80e384e2058ddde1fdfe71ed 100644 (file)
--- a/mcs/errors/ChangeLog
+++ b/mcs/errors/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-04  John Luke  <john.luke@gmail.com>
+
+       * cs8205.cs: remove, same as cs1624
+       * cs8206.cs: fix yield syntax, and add line number, now passes
+       * cs8207.cs: remove, same as cs1623
+       * cs8208.cs: remove, same as cs1625
+       * cs8209.cs: remove, same as cs1631
+
 2004-10-01  John Luke  <john.luke@gmail.com>
 
        * *.cs: fix some incorrect tests by either addding a Main method,

diff --git a/mcs/errors/cs0029-3.cs b/mcs/errors/cs0029-3.cs
index a91f509cd90892138fe0ba061ccd74680ae70db4..0f62b4a5ca8a3733b7b32419fc2f104bd7cba146 100644 (file)
--- a/mcs/errors/cs0029-3.cs
+++ b/mcs/errors/cs0029-3.cs
@@ -1,4 +1,4 @@
-// cs0029.cs: Cannot implicitly conver type 'Helper*' to 'Obsolete*'
+// cs0029.cs: Cannot implicitly convert type 'Helper*' to 'Obsolete*'
 // Line: 18
 // Compiler options: -unsafe
 
@@ -19,4 +19,4 @@ class MainClass {
                 {
                 }
         }
-}
\ No newline at end of file
+}

diff --git a/mcs/errors/cs0029.cs b/mcs/errors/cs0029.cs
index 4f701c4e08500827e052be8dfc02b4cf240b4378..a174d59309600e2f5dddf1daa26ee92c740df902 100755 (executable)
--- a/mcs/errors/cs0029.cs
+++ b/mcs/errors/cs0029.cs
@@ -1,4 +1,4 @@
-// cs0029: cannot implicitly conver type `double' to `decimal'
+// cs0029: cannot implicitly convert type `double' to `decimal'
 // Line: 7
 
 class T {

diff --git a/mcs/errors/cs8205.cs b/mcs/errors/cs8205.cs
deleted file mode 100644 (file)
index 47aa0ee..0000000
--- a/mcs/errors/cs8205.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// cs8205.cs: A method that contains a yield statement does have an incorrect return type
-// Line: 
-using System;
-using System.Collections;
-class X {
-       int Iterator ()
-       {
-               yield 1;
-       }
-
-       static void Main ()
-       {
-       }
-}      

diff --git a/mcs/errors/cs8206.cs b/mcs/errors/cs8206.cs
index c4b9155ecb1f4e981e422e01f8c1791a66afe497..0992eb88f43c566e6e3d76badb7c28a4c33061c4 100644 (file)
--- a/mcs/errors/cs8206.cs
+++ b/mcs/errors/cs8206.cs
@@ -1,12 +1,12 @@
 // cs8206.cs: Return not allowed in iterator method
-// Line:
+// Line: 11
 using System.Collections;
 
 class X {
        IEnumerator MyEnumerator (int a)
        {
                if (a == 0)
-                       yield 1;
+                       yield return 1;
                else
                        return 2;
        }

diff --git a/mcs/errors/cs8207.cs b/mcs/errors/cs8207.cs
deleted file mode 100644 (file)
index 49c5d03..0000000
--- a/mcs/errors/cs8207.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// cs8207.cs: out or ref are not allowed in an iterator method
-//
-using System;
-using System.Collections;
-
-class X {
-
-       IEnumerator GetValue (int b, out int a)
-       {
-               yield 1;
-       }
-       
-       static void Main ()
-       {
-       }
-}

diff --git a/mcs/errors/cs8208.cs b/mcs/errors/cs8208.cs
deleted file mode 100644 (file)
index 8919016..0000000
--- a/mcs/errors/cs8208.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// cs8208.cs: yield can not appear inside the finally clause.
-// Line: 10
-using System.Collections;
-class X {
-
-       IEnumerator GetEnum ()
-       {
-               try {
-               } finally {
-                       yield 1;
-               }
-       }
-       
-       static void Main ()
-       {
-       }
-}

diff --git a/mcs/errors/cs8209.cs b/mcs/errors/cs8209.cs
deleted file mode 100644 (file)
index f4fbae1..0000000
--- a/mcs/errors/cs8209.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// cs8209.cs: yield can not appear inside the catch clause.
-// Line: 10
-using System.Collections;
-class X {
-
-       IEnumerator GetEnum ()
-       {
-               try {
-               } catch {
-                       yield 1;
-               }
-       }
-       
-       static void Main ()
-       {
-       }
-}

diff --git a/mcs/errors/do-tests.pl b/mcs/errors/do-tests.pl
index 08a458b61c4c7db83e20d14741c0cb99a52174f6..93a2fc68ca363f41f79688c46c333857a6d6dfbc 100755 (executable)
--- a/mcs/errors/do-tests.pl
+++ b/mcs/errors/do-tests.pl
@@ -145,7 +145,7 @@ if (scalar @{@status_items [($RESULT_UNEXPECTED_CRASH - 1)]} > 0) {
 }
 
 if (scalar @{@status_items [($RESULT_UNEXPECTED_CORRECT_ERROR - 1)]} > 0) {
-    print scalar @{@status_items [($RESULT_UNEXPECTED_CORRECT_ERROR   - 1)]}, " fixed error report, remove it from expect-wrong-error or expect-no-error !\n";
+    print scalar @{@status_items [($RESULT_UNEXPECTED_CORRECT_ERROR   - 1)]}, " fixed error report(s), remove it from expect-wrong-error or expect-no-error !\n";
     print, print "\n" foreach @{@status_items [($RESULT_UNEXPECTED_CORRECT_ERROR - 1)]};
 }
 
@@ -155,7 +155,7 @@ if (scalar @{@status_items [($RESULT_UNEXPECTED_INCORRECT_ERROR - 1)]} > 0) {
 }
 
 if (scalar @{@status_items [($RESULT_UNEXPECTED_NO_ERROR - 1)]} > 0) {
-    print scalar @{@status_items [($RESULT_UNEXPECTED_NO_ERROR        - 1)]}, " new missing error report !\n";
+    print scalar @{@status_items [($RESULT_UNEXPECTED_NO_ERROR        - 1)]}, " new missing error report(s) !\n";
     print, print "\n" foreach @{@status_items [($RESULT_UNEXPECTED_NO_ERROR - 1)]};
 }
 

diff --git a/mcs/errors/gmcs-expect-wrong-error b/mcs/errors/gmcs-expect-wrong-error
index b2d57a15d07d40ee2fad7668ee812364ed8a7831..749ac191ec81657ab148335b710ee441347167c8 100644 (file)
--- a/mcs/errors/gmcs-expect-wrong-error
+++ b/mcs/errors/gmcs-expect-wrong-error
@@ -71,11 +71,6 @@ cs8201.cs
 cs8202.cs
 cs8203.cs
 cs8204.cs
-cs8205.cs
-cs8206.cs
-cs8207.cs
-cs8208.cs
-cs8209.cs
 cs8210.cs
 cs8213.cs
 cs8214.cs

diff --git a/mcs/errors/mcs-expect-wrong-error b/mcs/errors/mcs-expect-wrong-error
index e381da4e7e2066f64a017d5bfd06832beb0e6c6d..0ab27c53b9cb2b6c3505627ac33553ea4d06d0e9 100644 (file)
--- a/mcs/errors/mcs-expect-wrong-error
+++ b/mcs/errors/mcs-expect-wrong-error
@@ -95,11 +95,6 @@ cs8201.cs
 cs8202.cs
 cs8203.cs
 cs8204.cs
-cs8205.cs
-cs8206.cs
-cs8207.cs
-cs8208.cs
-cs8209.cs
 cs8210.cs
 cs8213.cs
 cs8214.cs