New test, update

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

diff --git a/mcs/errors/cs0120-10.cs b/mcs/errors/cs0120-10.cs
index bf442a9c540143f5ed6059a8d3e4fcde0f23e4a7..39e66305546215dd4a7de01cb6cede7a6355bf48 100644 (file)
--- 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 3e587550904dbc20f1ee62e7b5202340fe65d636..db295e62f637b6e042e1e9f5f5b6a170c236fffa 100644 (file)
--- 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 (executable)
index 0000000..860e75a
--- /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 7a117afb22e60d3d988bf4b4c82266a2135606f1..4cea50bc12c8b6b885afddc54c387f505995c63c 100644 (file)
--- 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 cb1941fb794334fbeaeb402eff88d5528dd13b79..9b68b81711952fc400820703206d4b13b308459b 100644 (file)
--- 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 3fc6b8f3e7ecd621602b5c638426cfe7f25df766..3efae67aa1ec1b8c7d9e3472e19251665c9053e1 100644 (file)
--- 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 b5f015404471b22c782f2ff8ab9443c3f4f8a828..5ebe5ae31147260a0103b5bab7c23377a8750fc5 100644 (file)
--- 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 15197b483b377d6cb184aa3e4c3badee97719c56..194fa582a9bdfa33898d11087ee587164af037f9 100644 (file)
--- 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 f168aaa3ea2d02a461fd3f7a4c26d31d90c58eb0..0c38581f1ec7d703c4244d1409c2fca260888c49 100644 (file)
--- 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 0f6178a28b5c6c207d2f201b3c7c065c1102f106..9f52ab348c7b8a642e573fe1446790cf9476ab6b 100644 (file)
--- 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 607cb9760ee4ee17eb2a1c207ca5b41dd58cd45b..1bc1835214c20a0f078b65fc4a9bcfa6e2e699a7 100644 (file)
--- 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 10554d1c582d9eb04f1e45f0f854d8dac6d75272..c11560612ee7db8f15ea594ca57cb4727ef2d513 100644 (file)
--- 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 {