merging the Mainsoft branch to the trunk

[mono.git] / mcs / tools / corcompare / MissingField.cs

diff --git a/mcs/tools/corcompare/MissingField.cs b/mcs/tools/corcompare/MissingField.cs
index 6ca6f2040b71dfc534100efeaecfd2225a775c52..12e598a2180aeda8297fdf978e721cf36254c7d9 100644 (file)
--- a/mcs/tools/corcompare/MissingField.cs
+++ b/mcs/tools/corcompare/MissingField.cs
@@ -19,12 +19,58 @@ namespace Mono.Util.CorCompare {
        /// </remarks>
        class MissingField : MissingMember {
                // e.g. <method name="Equals" status="missing"/>
-               public MissingField (MemberInfo info) : base (info) {}
+               public MissingField (MemberInfo infoMono, MemberInfo infoMS) : base (infoMono, infoMS) {}
 
                public override string Type {
                        get {
                                return "field";
                        }
                }
+
+               public override NodeStatus Analyze ()
+               {
+                       base.Analyze ();
+
+                       if (mInfoMono != null && mInfoMS != null)
+                       {
+                               FieldInfo fiMono = (FieldInfo) mInfoMono;
+                               FieldInfo fiMS   = (FieldInfo) mInfoMS;
+
+                               AddFakeAttribute (fiMono.IsNotSerialized, fiMS.IsNotSerialized, "System.NonSerializedAttribute");
+                               AddFakeAttribute (fiMono.IsPinvokeImpl, fiMS.IsPinvokeImpl, "System.PInvokeImplAttribute");
+
+                               AddFlagWarning (fiMono.IsStatic, fiMS.IsStatic, "static");
+                               AddFlagWarning (fiMono.IsLiteral, fiMS.IsLiteral, "const");
+                               AddFlagWarning (fiMono.IsInitOnly, fiMS.IsInitOnly, "readonly");
+
+                               string strTypeMono = fiMono.FieldType.FullName;
+                               string strTypeMS   =   fiMS.FieldType.FullName;
+                               if (strTypeMono != strTypeMS)
+                               {
+                                       Status.AddWarning ("Invalid type: is '"+strTypeMono+"', should be '"+strTypeMS+"'");
+                               }
+
+                               try
+                               {
+                                       if (fiMono.IsStatic && fiMS.IsStatic &&
+                                               fiMono.IsLiteral && fiMS.IsLiteral)
+                                       {
+                                               object objMono = fiMono.GetValue (null);
+                                               object objMS = fiMS.GetValue (null);
+                                               long lMono = Convert.ToInt64 (objMono);
+                                               long lMS = Convert.ToInt64 (objMS);
+
+                                               if (lMono != lMS)
+                                               {
+                                                       string strValMono = ((lMono < 0) ? "-0x" : "0x") + lMono.ToString ("x");
+                                                       string strValMS   = ((lMS   < 0) ? "-0x" : "0x") +   lMS.ToString ("x");
+                                                       Status.AddWarning ("Invalid value: is '"+strValMono+"', should be '"+strValMS+"'");
+                                               }
+                                       }
+                               }
+                               catch (Exception) {}
+                       }
+                       return m_nodeStatus;
+               }
        }
 }