2004-09-23 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / corlib / System.Reflection / MonoField.cs

diff --git a/mcs/class/corlib/System.Reflection/MonoField.cs b/mcs/class/corlib/System.Reflection/MonoField.cs
index 1adf2e1b8ca161660e04157737629855237cbec5..3fdbb36014c0c992d921d113bb93b4557773d7ae 100755 (executable)
--- a/mcs/class/corlib/System.Reflection/MonoField.cs
+++ b/mcs/class/corlib/System.Reflection/MonoField.cs
@@ -1,4 +1,27 @@
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 //
 // System.Reflection/MonoField.cs
 // The class used to represent Fields from the mono runtime.
@@ -16,58 +39,46 @@ using System.Runtime.InteropServices;
 
 namespace System.Reflection {
        
-       internal struct MonoFieldInfo {
-               public Type parent;
-               public Type type;
-               public String name;
-               public FieldAttributes attrs;
-               
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               internal static extern void get_field_info (MonoField field, out MonoFieldInfo info);
-       }
-
        internal class MonoField : FieldInfo {
                internal IntPtr klass;
                internal RuntimeFieldHandle fhandle;
+               string name;
+               Type type;
+               FieldAttributes attrs;
                
                public override FieldAttributes Attributes {
                        get {
-                               MonoFieldInfo info;
-                               MonoFieldInfo.get_field_info (this, out info);
-                               return info.attrs;
+                               return attrs;
                        }
                }
                public override RuntimeFieldHandle FieldHandle {
-                       get {return fhandle;}
+                       get {
+                               return fhandle;
+                       }
                }
 
                public override Type FieldType { 
                        get {
-                               MonoFieldInfo info;
-                               MonoFieldInfo.get_field_info (this, out info);
-                               return info.type;
+                               return type;
                        }
                }
 
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               private extern Type GetParentType (bool declaring);
+
                public override Type ReflectedType {
                        get {
-                               MonoFieldInfo info;
-                               MonoFieldInfo.get_field_info (this, out info);
-                               return info.parent;
+                               return GetParentType (false);
                        }
                }
                public override Type DeclaringType {
                        get {
-                               MonoFieldInfo info;
-                               MonoFieldInfo.get_field_info (this, out info);
-                               return info.parent;
+                               return GetParentType (true);
                        }
                }
                public override string Name {
                        get {
-                               MonoFieldInfo info;
-                               MonoFieldInfo.get_field_info (this, out info);
-                               return info.name;
+                               return name;
                        }
                }
 
@@ -91,9 +102,7 @@ namespace System.Reflection {
                }
 
                public override string ToString () {
-                       MonoFieldInfo info;
-                       MonoFieldInfo.get_field_info (this, out info);
-                       return String.Format ("{0} {1}", info.type, info.name);
+                       return String.Format ("{0} {1}", type, name);
                }
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -105,8 +114,33 @@ namespace System.Reflection {
                                throw new ArgumentNullException ("obj");
                        if (binder == null)
                                binder = Binder.DefaultBinder;
-                       object realval = binder.ChangeType (val, FieldType, culture);
-                       SetValueInternal (this, obj, realval);
+                       if (val != null) {
+                               val = binder.ChangeType (val, type, culture);
+                               if (val == null)
+                                       throw new ArgumentException ("Object type cannot be converted to target type.", "val");
+                       }
+                       SetValueInternal (this, obj, val);
+               }
+
+#if NET_2_0 || BOOTSTRAP_NET_2_0
+               [MonoTODO]
+               public override Type[] OptionalCustomModifiers {
+                       get {
+                               throw new NotImplementedException ();
+                       }
                }
+
+               [MonoTODO]
+               public override Type[] RequiredCustomModifiers {
+                       get {
+                               throw new NotImplementedException ();
+                       }
+               }
+#endif
+
+#if NET_2_0 || BOOTSTRAP_NET_2_0
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               public override extern FieldInfo Mono_GetGenericFieldDefinition ();
+#endif
        }
 }