Merge r61792 from mcs. Fix up error testcases to reflect changes

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

diff --git a/mcs/errors/cs0120-2.cs b/mcs/errors/cs0120-2.cs
index 9ec0a35b3f37e438fc76bb55dac9324d7fb8b806..7a117afb22e60d3d988bf4b4c82266a2135606f1 100644 (file)
--- a/mcs/errors/cs0120-2.cs
+++ b/mcs/errors/cs0120-2.cs
@@ -1,4 +1,4 @@
-// cs0120-2.cs: `Add8(int)': An object reference is required for the nonstatic field, method or property
+// cs0120-2.cs: `Test.Add8(int)': An object reference is required for the nonstatic field, method or property
 // Line: 12
 
 using System;

diff --git a/mcs/errors/cs0120-3.cs b/mcs/errors/cs0120-3.cs
index 85a98327e0eb4364413954cf9449c78c4e40d719..cb1941fb794334fbeaeb402eff88d5528dd13b79 100644 (file)
--- a/mcs/errors/cs0120-3.cs
+++ b/mcs/errors/cs0120-3.cs
@@ -1,4 +1,4 @@
-// cs0120-3.cs: `method()': An object reference is required for the nonstatic field, method or property
+// cs0120-3.cs: `X.method()': An object reference is required for the nonstatic field, method or property
 // Line: 11
 
 class X {

diff --git a/mcs/errors/cs0120-4.cs b/mcs/errors/cs0120-4.cs
index b60b57bd9e511334fc1a989bfa0ef2756ef4ba9a..3fc6b8f3e7ecd621602b5c638426cfe7f25df766 100644 (file)
--- a/mcs/errors/cs0120-4.cs
+++ b/mcs/errors/cs0120-4.cs
@@ -1,4 +1,4 @@
-// cs0120-4.cs: `Y': An object reference is required for the nonstatic field, method or property
+// cs0120-4.cs: `X.Y': An object reference is required for the nonstatic field, method or property
 // Line: 11
 
 using System;

diff --git a/mcs/errors/cs0120-5.cs b/mcs/errors/cs0120-5.cs
index f928fd50252d6324cf06fbc07907361a8a14f9d5..b5f015404471b22c782f2ff8ab9443c3f4f8a828 100644 (file)
--- a/mcs/errors/cs0120-5.cs
+++ b/mcs/errors/cs0120-5.cs
@@ -1,4 +1,4 @@
-// cs0120-5.cs: `Account': An object reference is required for the nonstatic field, method or property
+// cs0120-5.cs: `Babble.Protocol.Auth.Account': An object reference is required for the nonstatic field, method or property
 // Line: 28
 
 using System;

diff --git a/mcs/errors/cs0120-6.cs b/mcs/errors/cs0120-6.cs
index 7dd4fa727d57f3bf5d0b0f15c460cd210bef9e95..15197b483b377d6cb184aa3e4c3badee97719c56 100644 (file)
--- a/mcs/errors/cs0120-6.cs
+++ b/mcs/errors/cs0120-6.cs
@@ -1,4 +1,4 @@
-// cs0120-6.cs: `Int32': An object reference is required for the nonstatic field, method or property
+// cs0120-6.cs: `MemRefMonoBug.Int32': An object reference is required for the nonstatic field, method or property
 // Line: 11
 
 using System;

diff --git a/mcs/errors/cs0120-7.cs b/mcs/errors/cs0120-7.cs
index 803f48c913905fadbe62051204ea124ea36dce82..f168aaa3ea2d02a461fd3f7a4c26d31d90c58eb0 100644 (file)
--- a/mcs/errors/cs0120-7.cs
+++ b/mcs/errors/cs0120-7.cs
@@ -1,4 +1,4 @@
-// cs0120-7.cs: `String': An object reference is required for the nonstatic field, method or property
+// cs0120-7.cs: `MemRefMonoBug.String': An object reference is required for the nonstatic field, method or property
 // Line: 11
 
 using System;

diff --git a/mcs/errors/cs0120-8.cs b/mcs/errors/cs0120-8.cs
index dcfff66fe2d1df44537d3f757d16b7166600d4ce..0f6178a28b5c6c207d2f201b3c7c065c1102f106 100644 (file)
--- a/mcs/errors/cs0120-8.cs
+++ b/mcs/errors/cs0120-8.cs
@@ -1,4 +1,4 @@
-// cs0120-8.cs: `ArrayList': An object reference is required for the nonstatic field, method or property
+// cs0120-8.cs: `Test.ArrayList': An object reference is required for the nonstatic field, method or property
 // Line: 10
 
 using System.Collections;

diff --git a/mcs/errors/cs0120.cs b/mcs/errors/cs0120.cs
index 704f3cf37ead77045447a09bb3ea0e8c1e2828ef..10554d1c582d9eb04f1e45f0f854d8dac6d75272 100644 (file)
--- a/mcs/errors/cs0120.cs
+++ b/mcs/errors/cs0120.cs
@@ -1,4 +1,4 @@
-// cs0120.cs: `method()': An object reference is required for the nonstatic field, method or property
+// cs0120.cs: `test.method()': An object reference is required for the nonstatic field, method or property
 // Line: 11
 
 class test {

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index bde17d15af31587010b42eeb8afc857a6902e3d0..dd8741c2f04fd525bdb12492df336b9033727fe1 100644 (file)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-16  Juraj Skripsky  <js@hotfeet.ch>
+
+       * ecore.cs (SimpleName.Error_ObjectRefRequired): Do not truncate the name.
+       Fixed bug #78601.
+       (MemberExpr.EmitInstance): Use GetSignatureForError () to get full name.
+       (FieldExpr.DoResolve): likewise.
+       (PropertyExpr.InstanceResolve): likewise.
+       (EventExpr.InstanceResolve): likewise. 
+
 2006-06-15  Martin Baulig  <martin@ximian.com>
 
        * statement.cs

diff --git a/mcs/gmcs/ecore.cs b/mcs/gmcs/ecore.cs
index 57508a94c4e64041ac0201ba8536aadbfe77f769..9dc323da0230a52f364de7d49147d8fc16721067 100644 (file)
--- a/mcs/gmcs/ecore.cs
+++ b/mcs/gmcs/ecore.cs
@@ -1922,14 +1922,10 @@ namespace Mono.CSharp {
                                Report.Error (236, l,
                                        "A field initializer cannot reference the nonstatic field, method, or property `{0}'",
                                        name);
-                       else {
-                               if (name.LastIndexOf ('.') > 0)
-                                       name = name.Substring (name.LastIndexOf ('.') + 1);
-
+                       else
                                Report.Error (
                                        120, l, "`{0}': An object reference is required for the nonstatic field, method or property",
                                        name);
-                       }
                }
 
                public bool IdenticalNameAndTypeName (EmitContext ec, Expression resolved_to, Location loc)
@@ -2710,7 +2706,7 @@ namespace Mono.CSharp {
                                return;
 
                        if (InstanceExpression == EmptyExpression.Null) {
-                               SimpleName.Error_ObjectRefRequired (ec, loc, Name);
+                               SimpleName.Error_ObjectRefRequired (ec, loc, GetSignatureForError ());
                                return;
                        }
                                
@@ -3081,7 +3077,7 @@ namespace Mono.CSharp {
                                        // This can happen when referencing an instance field using
                                        // a fully qualified type expression: TypeName.InstanceField = xxx
                                        // 
-                                       SimpleName.Error_ObjectRefRequired (ec, loc, FieldInfo.Name);
+                                       SimpleName.Error_ObjectRefRequired (ec, loc, GetSignatureForError ());
                                        return null;
                                }
 
@@ -3576,7 +3572,7 @@ namespace Mono.CSharp {
                        }
 
                        if (InstanceExpression == null) {
-                               SimpleName.Error_ObjectRefRequired (ec, loc, PropertyInfo.Name);
+                               SimpleName.Error_ObjectRefRequired (ec, loc, GetSignatureForError ());
                                return false;
                        }
 
@@ -3909,7 +3905,7 @@ namespace Mono.CSharp {
                        }
 
                        if (InstanceExpression == null) {
-                               SimpleName.Error_ObjectRefRequired (ec, loc, EventInfo.Name);
+                               SimpleName.Error_ObjectRefRequired (ec, loc, GetSignatureForError ());
                                return false;
                        }
 

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index d373e615437405bf1a264247f995f66f2a8dfd56..423e1a27bb7c5d6bab97f505a3248106d791788c 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,11 +1,11 @@
 2006-06-16  Juraj Skripsky  <js@hotfeet.ch>
 
-   * ecore.cs (SimpleName.Error_ObjectRefRequired): Do not truncate the name.
-   Fixed bug #78601.
-   (MemberExpr.EmitInstance): Use GetSignatureForError () to get full name.
-   (FieldExpr.DoResolve): likewise.
-   (PropertyExpr.InstanceResolve): likewise.
-   (EventExpr.InstanceResolve): likewise. 
+       * ecore.cs (SimpleName.Error_ObjectRefRequired): Do not truncate the name.
+       Fixed bug #78601.
+       (MemberExpr.EmitInstance): Use GetSignatureForError () to get full name.
+       (FieldExpr.DoResolve): likewise.
+       (PropertyExpr.InstanceResolve): likewise.
+       (EventExpr.InstanceResolve): likewise. 
 
 2006-06-04  Marek Safar  <marek.safar@seznam.cz>