2004-10-24 Marek Safar <marek.safar@seznam.cz>

	* cs82??.cs: Renumber some 82xx errors.

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

diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog
index 9eeccaae5deb416425526c53da713c0a21feca92..cf203121929e56eae31ee004b4a25a4eca3eb8d2 100644 (file)
--- a/mcs/errors/ChangeLog
+++ b/mcs/errors/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-24 Marek Safar <marek.safar@seznam.cz>
+
+       * cs82??.cs: Renumber some 82xx errors.
+
 2004-10-21  Raja R Harinath  <rharinath@novell.com>
 
        * do-tests.pl: Make robust to being invoked in parallel for

diff --git a/mcs/errors/cs8200.cs b/mcs/errors/cs8200.cs
deleted file mode 100644 (file)
index d9819f6..0000000
--- a/mcs/errors/cs8200.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// cs8200.cs: Do not allow type-parameter-constraint-clauses when
-// there is no type-parameter list
-//
-using System.Collections;
-class Dingus where T : IEnumerable {
-}
-
-class D {
-       static void Main ()
-       {
-       }
-}

diff --git a/mcs/errors/cs8202.cs b/mcs/errors/cs8202.cs
deleted file mode 100644 (file)
index c4afd39..0000000
--- a/mcs/errors/cs8202.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// The type parameters introduce the names into the class namespace, so it is
-// not possible to have members with the same name as a parameter
-//
-
-// First error.
-class X <T> {
-       int T;
-}
-
-// Second error: type parameter is the same name as the class
-
-class Y <Y> {
-}
-
-class W {
-       static void Main () {}
-}

diff --git a/mcs/errors/cs8203.cs b/mcs/errors/cs8203.cs
deleted file mode 100644 (file)
index b113719..0000000
--- a/mcs/errors/cs8203.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// The type parameters introduce the names into the class namespace, so it is
-// not possible to have members with the same name as a parameter
-//
-
-
-// type parameter is the same name as the class
-
-class Y <Y> {
-}
-

diff --git a/mcs/errors/cs8204.cs b/mcs/errors/cs8204.cs
deleted file mode 100644 (file)
index 1dd56c7..0000000
--- a/mcs/errors/cs8204.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-// 
-// Two type parameters might not have the same name
-//
-class X <A,A> {
-}

diff --git a/mcs/errors/cs8213.cs b/mcs/errors/cs8213.cs
deleted file mode 100644 (file)
index c67e23e..0000000
--- a/mcs/errors/cs8213.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-// cs8213.cs: This feature requires MCS v2 support (pass the -v2 flag to mcs)
-// Line: 3
-class X<V> : V
-{
-}
-

diff --git a/mcs/errors/cs8214.cs b/mcs/errors/cs8214.cs
deleted file mode 100644 (file)
index c044ef5..0000000
--- a/mcs/errors/cs8214.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// cs8214.cs: Generic type can not derive from Attribute class
-// Line: 5
-using System;
-
-class X<T> : Attribute {
-}
-
-class D { static void Main () {}}

diff --git a/mcs/errors/cs8217.cs b/mcs/errors/cs8217.cs
deleted file mode 100644 (file)
index 5a87378..0000000
--- a/mcs/errors/cs8217.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// CS8217: Generic type `Stack' takes 1 type parameters, but specified 2.
-// line: 10
-class Stack<T> {
-}
-
-class Test {
-}
-
-class T {
-       Stack<Test,Test> a;
-
-       static void Main()
-       {
-       }
-}

diff --git a/mcs/errors/gcs0080.cs b/mcs/errors/gcs0080.cs
new file mode 100644 (file)
index 0000000..d9819f6
--- /dev/null
+++ b/mcs/errors/gcs0080.cs
@@ -0,0 +1,12 @@
+// cs8200.cs: Do not allow type-parameter-constraint-clauses when
+// there is no type-parameter list
+//
+using System.Collections;
+class Dingus where T : IEnumerable {
+}
+
+class D {
+       static void Main ()
+       {
+       }
+}

diff --git a/mcs/errors/gcs0102.cs b/mcs/errors/gcs0102.cs
new file mode 100644 (file)
index 0000000..1df3a66
--- /dev/null
+++ b/mcs/errors/gcs0102.cs
@@ -0,0 +1,13 @@
+//
+// The type parameters introduce the names into the class namespace, so it is
+// not possible to have members with the same name as a parameter
+//
+
+// First error.
+class X <T> {
+       int T;
+}
+
+class W {
+       static void Main () {}
+}

diff --git a/mcs/errors/gcs0305-4.cs b/mcs/errors/gcs0305-4.cs
new file mode 100644 (file)
index 0000000..5a87378
--- /dev/null
+++ b/mcs/errors/gcs0305-4.cs
@@ -0,0 +1,15 @@
+// CS8217: Generic type `Stack' takes 1 type parameters, but specified 2.
+// line: 10
+class Stack<T> {
+}
+
+class Test {
+}
+
+class T {
+       Stack<Test,Test> a;
+
+       static void Main()
+       {
+       }
+}

diff --git a/mcs/errors/gcs0692.cs b/mcs/errors/gcs0692.cs
new file mode 100644 (file)
index 0000000..1dd56c7
--- /dev/null
+++ b/mcs/errors/gcs0692.cs
@@ -0,0 +1,5 @@
+// 
+// Two type parameters might not have the same name
+//
+class X <A,A> {
+}

diff --git a/mcs/errors/gcs0694.cs b/mcs/errors/gcs0694.cs
new file mode 100644 (file)
index 0000000..b113719
--- /dev/null
+++ b/mcs/errors/gcs0694.cs
@@ -0,0 +1,11 @@
+//
+// The type parameters introduce the names into the class namespace, so it is
+// not possible to have members with the same name as a parameter
+//
+
+
+// type parameter is the same name as the class
+
+class Y <Y> {
+}
+

diff --git a/mcs/errors/gcs0698.cs b/mcs/errors/gcs0698.cs
index e54582279fa6d745b5e890a23ec8a73d21d93d19..d79b3e167cb012051da13c18fcaa4f231efaddaa 100644 (file)
--- a/mcs/errors/gcs0698.cs
+++ b/mcs/errors/gcs0698.cs
@@ -1,3 +1,6 @@
+// cs0698.cs: Generic type can not derive from Attribute class
+// Line: 5
+
 using System;
 
 class Stack<T> : Attribute

diff --git a/mcs/errors/gcs1644-2.cs b/mcs/errors/gcs1644-2.cs
new file mode 100644 (file)
index 0000000..f06075a
--- /dev/null
+++ b/mcs/errors/gcs1644-2.cs
@@ -0,0 +1,7 @@
+// cs1644.cs: Feature 'generics' cannot be used because it is not part of the standardized ISO C# language specification
+// Line: 5
+// Compiler options: -langversion:ISO-1
+
+class X<V> : V
+{
+}

diff --git a/mcs/errors/mcs-expect-wrong-error b/mcs/errors/mcs-expect-wrong-error
index 96f9b1bb5eef07ebff3156d5cb2b63dcb62eb052..c926efd8cb3527381e60c42769851f90a15465f6 100644 (file)
--- a/mcs/errors/mcs-expect-wrong-error
+++ b/mcs/errors/mcs-expect-wrong-error
@@ -85,14 +85,7 @@ cs1676.cs
 cs1677.cs
 cs1678.cs
 cs2007.cs
-cs8200.cs
 cs8201.cs
-cs8202.cs
-cs8203.cs
-cs8204.cs
 cs8210.cs
-cs8213.cs
-cs8214.cs
-cs8217.cs
 
 cs0182-2.cs #64221