Author: raja
Date: 2006-06-16 07:58:28 -0400 (Fri, 16 Jun 2006)
New Revision: 61793
Modified:
trunk/mcs/errors/cs0120-2.cs
trunk/mcs/errors/cs0120-3.cs
trunk/mcs/errors/cs0120-4.cs
trunk/mcs/errors/cs0120-5.cs
trunk/mcs/errors/cs0120-6.cs
trunk/mcs/errors/cs0120-7.cs
trunk/mcs/errors/cs0120-8.cs
trunk/mcs/errors/cs0120.cs
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/ecore.cs
trunk/mcs/mcs/ChangeLog
Log:
Merge r61792 from mcs. Fix up error testcases to reflect changes
Modified: trunk/mcs/errors/cs0120-2.cs
===================================================================
--- trunk/mcs/errors/cs0120-2.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/errors/cs0120-2.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -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;
Modified: trunk/mcs/errors/cs0120-3.cs
===================================================================
--- trunk/mcs/errors/cs0120-3.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/errors/cs0120-3.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -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 {
Modified: trunk/mcs/errors/cs0120-4.cs
===================================================================
--- trunk/mcs/errors/cs0120-4.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/errors/cs0120-4.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -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;
Modified: trunk/mcs/errors/cs0120-5.cs
===================================================================
--- trunk/mcs/errors/cs0120-5.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/errors/cs0120-5.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -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;
Modified: trunk/mcs/errors/cs0120-6.cs
===================================================================
--- trunk/mcs/errors/cs0120-6.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/errors/cs0120-6.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -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;
Modified: trunk/mcs/errors/cs0120-7.cs
===================================================================
--- trunk/mcs/errors/cs0120-7.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/errors/cs0120-7.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -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;
Modified: trunk/mcs/errors/cs0120-8.cs
===================================================================
--- trunk/mcs/errors/cs0120-8.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/errors/cs0120-8.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -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;
Modified: trunk/mcs/errors/cs0120.cs
===================================================================
--- trunk/mcs/errors/cs0120.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/errors/cs0120.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -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 {
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/gmcs/ChangeLog 2006-06-16 11:58:28 UTC (rev 61793)
@@ -1,3 +1,12 @@
+2006-06-16 Juraj Skripsky <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* statement.cs
Modified: trunk/mcs/gmcs/ecore.cs
===================================================================
--- trunk/mcs/gmcs/ecore.cs 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/gmcs/ecore.cs 2006-06-16 11:58:28 UTC (rev 61793)
@@ -1922,14 +1922,10 @@
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 @@
return;
if (InstanceExpression == EmptyExpression.Null) {
- SimpleName.Error_ObjectRefRequired (ec, loc,
Name);
+ SimpleName.Error_ObjectRefRequired (ec, loc,
GetSignatureForError ());
return;
}
@@ -3081,7 +3077,7 @@
// 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 @@
}
if (InstanceExpression == null) {
- SimpleName.Error_ObjectRefRequired (ec, loc,
PropertyInfo.Name);
+ SimpleName.Error_ObjectRefRequired (ec, loc,
GetSignatureForError ());
return false;
}
@@ -3909,7 +3905,7 @@
}
if (InstanceExpression == null) {
- SimpleName.Error_ObjectRefRequired (ec, loc,
EventInfo.Name);
+ SimpleName.Error_ObjectRefRequired (ec, loc,
GetSignatureForError ());
return false;
}
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2006-06-16 11:40:51 UTC (rev 61792)
+++ trunk/mcs/mcs/ChangeLog 2006-06-16 11:58:28 UTC (rev 61793)
@@ -1,11 +1,11 @@
2006-06-16 Juraj Skripsky <[EMAIL PROTECTED]>
- * 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 <[EMAIL PROTECTED]>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
