Author: juraj
Date: 2006-06-16 07:40:51 -0400 (Fri, 16 Jun 2006)
New Revision: 61792

Modified:
   trunk/mcs/mcs/ChangeLog
   trunk/mcs/mcs/ecore.cs
Log:
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.


Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog     2006-06-16 08:31:50 UTC (rev 61791)
+++ trunk/mcs/mcs/ChangeLog     2006-06-16 11:40:51 UTC (rev 61792)
@@ -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-04  Marek Safar  <[EMAIL PROTECTED]>
 
        * parameter.cs (Parameter.ApplyAttributeBuilder): More DefaultValue

Modified: trunk/mcs/mcs/ecore.cs
===================================================================
--- trunk/mcs/mcs/ecore.cs      2006-06-16 08:31:50 UTC (rev 61791)
+++ trunk/mcs/mcs/ecore.cs      2006-06-16 11:40:51 UTC (rev 61792)
@@ -1840,14 +1840,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)
@@ -2469,7 +2465,7 @@
                                return;
 
                        if (InstanceExpression == EmptyExpression.Null) {
-                               SimpleName.Error_ObjectRefRequired (ec, loc, 
Name);
+                               SimpleName.Error_ObjectRefRequired (ec, loc, 
GetSignatureForError ());
                                return;
                        }
                                
@@ -2777,7 +2773,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;
                                }
 
@@ -3265,7 +3261,7 @@
                        }
 
                        if (InstanceExpression == null) {
-                               SimpleName.Error_ObjectRefRequired (ec, loc, 
PropertyInfo.Name);
+                               SimpleName.Error_ObjectRefRequired (ec, loc, 
GetSignatureForError ());
                                return false;
                        }
 
@@ -3598,7 +3594,7 @@
                        }
 
                        if (InstanceExpression == null) {
-                               SimpleName.Error_ObjectRefRequired (ec, loc, 
EventInfo.Name);
+                               SimpleName.Error_ObjectRefRequired (ec, loc, 
GetSignatureForError ());
                                return false;
                        }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to