From: Marek Safar <marek.safar@gmail.com>
Date: Thu, 18 Sep 2008 18:18:57 +0000 (-0000)
Subject: New test, update
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=60132eb05c1c899377cf452bdf013b9de5a07183;p=mono.git

New test, update


svn path=/trunk/mcs/; revision=113447
---

diff --git a/mcs/errors/cs0120-10.cs b/mcs/errors/cs0120-10.cs
index bf442a9c540..39e66305546 100644
--- a/mcs/errors/cs0120-10.cs
+++ b/mcs/errors/cs0120-10.cs
@@ -1,4 +1,4 @@
-// CS0120: `TestNamespace.TestClass.HelloWorld()': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `TestNamespace.TestClass.HelloWorld()'
 // Line: 31
 
 using System;
diff --git a/mcs/errors/cs0120-11.cs b/mcs/errors/cs0120-11.cs
index 3e587550904..db295e62f63 100644
--- a/mcs/errors/cs0120-11.cs
+++ b/mcs/errors/cs0120-11.cs
@@ -1,4 +1,4 @@
-// CS0120: `Program.x': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `Program.x'
 // Line: 6
 
 class Program {
diff --git a/mcs/errors/cs0120-12.cs b/mcs/errors/cs0120-12.cs
new file mode 100755
index 00000000000..860e75a60e3
--- /dev/null
+++ b/mcs/errors/cs0120-12.cs
@@ -0,0 +1,24 @@
+// CS0120: An object reference is required to access non-static member `Foo.Bar()'
+// Line: 22
+
+using System;
+
+public class Foo
+{
+	public string Bar ()
+	{
+		return "hello";
+	}
+	public static string Bar (string thing)
+	{
+		return string.Format ("hello {0}", thing);
+	}
+}
+
+public class MainClass
+{
+	public static void Main ()
+	{
+		Console.WriteLine (Foo.Bar ());
+	}
+}
diff --git a/mcs/errors/cs0120-2.cs b/mcs/errors/cs0120-2.cs
index 7a117afb22e..4cea50bc12c 100644
--- a/mcs/errors/cs0120-2.cs
+++ b/mcs/errors/cs0120-2.cs
@@ -1,4 +1,4 @@
-// cs0120-2.cs: `Test.Add8(int)': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `Test.Add8(int)'
 // Line: 12
 
 using System;
diff --git a/mcs/errors/cs0120-3.cs b/mcs/errors/cs0120-3.cs
index cb1941fb794..9b68b817119 100644
--- a/mcs/errors/cs0120-3.cs
+++ b/mcs/errors/cs0120-3.cs
@@ -1,4 +1,4 @@
-// cs0120-3.cs: `X.method()': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `X.method()'
 // Line: 11
 
 class X {
diff --git a/mcs/errors/cs0120-4.cs b/mcs/errors/cs0120-4.cs
index 3fc6b8f3e7e..3efae67aa1e 100644
--- a/mcs/errors/cs0120-4.cs
+++ b/mcs/errors/cs0120-4.cs
@@ -1,4 +1,4 @@
-// cs0120-4.cs: `X.Y': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `X.Y'
 // Line: 11
 
 using System;
diff --git a/mcs/errors/cs0120-5.cs b/mcs/errors/cs0120-5.cs
index b5f01540447..5ebe5ae3114 100644
--- a/mcs/errors/cs0120-5.cs
+++ b/mcs/errors/cs0120-5.cs
@@ -1,4 +1,4 @@
-// cs0120-5.cs: `Babble.Protocol.Auth.Account': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `Babble.Protocol.Auth.Account'
 // Line: 28
 
 using System;
diff --git a/mcs/errors/cs0120-6.cs b/mcs/errors/cs0120-6.cs
index 15197b483b3..194fa582a9b 100644
--- a/mcs/errors/cs0120-6.cs
+++ b/mcs/errors/cs0120-6.cs
@@ -1,4 +1,4 @@
-// cs0120-6.cs: `MemRefMonoBug.Int32': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `MemRefMonoBug.Int32'
 // Line: 11
 
 using System;
@@ -11,4 +11,3 @@ public class MemRefMonoBug {
 		Int32 = 0;	// mcs crashes in this line
 	}
 }
-
diff --git a/mcs/errors/cs0120-7.cs b/mcs/errors/cs0120-7.cs
index f168aaa3ea2..0c38581f1ec 100644
--- a/mcs/errors/cs0120-7.cs
+++ b/mcs/errors/cs0120-7.cs
@@ -1,4 +1,4 @@
-// cs0120-7.cs: `MemRefMonoBug.String': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `MemRefMonoBug.String'
 // Line: 11
 
 using System;
diff --git a/mcs/errors/cs0120-8.cs b/mcs/errors/cs0120-8.cs
index 0f6178a28b5..9f52ab348c7 100644
--- a/mcs/errors/cs0120-8.cs
+++ b/mcs/errors/cs0120-8.cs
@@ -1,4 +1,4 @@
-// cs0120-8.cs: `Test.ArrayList': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `Test.ArrayList'
 // Line: 10
 
 using System.Collections;
diff --git a/mcs/errors/cs0120-9.cs b/mcs/errors/cs0120-9.cs
index 607cb9760ee..1bc1835214c 100644
--- a/mcs/errors/cs0120-9.cs
+++ b/mcs/errors/cs0120-9.cs
@@ -1,4 +1,4 @@
-// cs0120-9.cs: `X.Y(System.Text.StringBuilder)': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `X.Y(System.Text.StringBuilder)'
 // Line: 8
 
 using System.Text;
diff --git a/mcs/errors/cs0120.cs b/mcs/errors/cs0120.cs
index 10554d1c582..c11560612ee 100644
--- a/mcs/errors/cs0120.cs
+++ b/mcs/errors/cs0120.cs
@@ -1,4 +1,4 @@
-// cs0120.cs: `test.method()': An object reference is required for the nonstatic field, method or property
+// CS0120: An object reference is required to access non-static member `test.method()'
 // Line: 11
 
 class test {