Author: toshok
Date: 2008-01-14 16:44:28 -0500 (Mon, 14 Jan 2008)
New Revision: 92906
Modified:
trunk/mono-tools/gui-compare/CecilMetadata.cs
trunk/mono-tools/gui-compare/ChangeLog
trunk/mono-tools/gui-compare/CompareContext.cs
trunk/mono-tools/gui-compare/InfoManager.cs
trunk/mono-tools/gui-compare/MasterMetadata.cs
trunk/mono-tools/gui-compare/Metadata.cs
Log:
* Metadata.cs: add GetLiteralValue() abstract method to CompField.
* InfoManager.cs: wex might be null here since we're in the else
branch, so don't look in it.
* MasterMetadata.cs: implement MasterField.GetLiteralField.
* CecilMetadata.cs: Implement CecilField.GetLiteralValue.
* CompareContext.cs: check literal field values (fixes enum comparing)
Modified: trunk/mono-tools/gui-compare/CecilMetadata.cs
===================================================================
--- trunk/mono-tools/gui-compare/CecilMetadata.cs 2008-01-14 21:37:18 UTC
(rev 92905)
+++ trunk/mono-tools/gui-compare/CecilMetadata.cs 2008-01-14 21:44:28 UTC
(rev 92906)
@@ -642,6 +642,13 @@
return attributes;
}
+ public override string GetLiteralValue ()
+ {
+ if (field_def.IsLiteral)
+ return field_def.Constant.ToString();
+ return null;
+ }
+
FieldDefinition field_def;
List<CompNamed> attributes;
}
Modified: trunk/mono-tools/gui-compare/ChangeLog
===================================================================
--- trunk/mono-tools/gui-compare/ChangeLog 2008-01-14 21:37:18 UTC (rev
92905)
+++ trunk/mono-tools/gui-compare/ChangeLog 2008-01-14 21:44:28 UTC (rev
92906)
@@ -1,3 +1,12 @@
+2008-01-14 Chris Toshok <[EMAIL PROTECTED]>
+
+ * Metadata.cs: add GetLiteralValue() abstract method to CompField.
+ * InfoManager.cs: wex might be null here since we're in the else
branch, so
+ don't look in it.
+ * MasterMetadata.cs: implement MasterField.GetLiteralField.
+ * CecilMetadata.cs: Implement CecilField.GetLiteralValue.
+ * CompareContext.cs: check literal field values (fixes enum comparing)
+
2008-01-13 Chris Toshok <[EMAIL PROTECTED]>
* InfoManager.cs: fix this obvious brokenness.
Modified: trunk/mono-tools/gui-compare/CompareContext.cs
===================================================================
--- trunk/mono-tools/gui-compare/CompareContext.cs 2008-01-14 21:37:18 UTC
(rev 92905)
+++ trunk/mono-tools/gui-compare/CompareContext.cs 2008-01-14 21:44:28 UTC
(rev 92906)
@@ -318,7 +318,7 @@
}
}
- if (reference_list[m] is CompMethod &&
target_list[a] is CompMethod) {
+ if (reference_list[m] is CompMethod) {
if
(((CompMethod)target_list[a]).ThrowsNotImplementedException ()
&&
!((CompMethod)reference_list[m]).ThrowsNotImplementedException ()) {
@@ -327,14 +327,24 @@
}
}
- if (reference_list[m] is
ICompAttributeContainer && target_list[a] is ICompAttributeContainer) {
+ if (reference_list[m] is CompField) {
+ if
(((CompField)reference_list[m]).GetLiteralValue() !=
+
((CompField)target_list[a]).GetLiteralValue()) {
+ comparison.AddError
(String.Format ("reference field has value {0}, target field has value {1}",
+
((CompField)reference_list[m]).GetLiteralValue(),
+
((CompField)target_list[a]).GetLiteralValue()));
+ comparison.status =
ComparisonStatus.Error;
+ }
+ }
+
+ if (reference_list[m] is
ICompAttributeContainer) {
//Console.WriteLine ("Comparing
attributes for {0}", reference_list[m].Name);
CompareAttributes (comparison,
(ICompAttributeContainer)reference_list[m],
(ICompAttributeContainer)target_list[a]);
}
- if (reference_list[m] is
ICompMemberContainer && target_list[a] is ICompMemberContainer) {
+ if (reference_list[m] is
ICompMemberContainer) {
CompareMembers (comparison,
(ICompMemberContainer)reference_list[m],
(ICompMemberContainer)target_list[a]);
Modified: trunk/mono-tools/gui-compare/InfoManager.cs
===================================================================
--- trunk/mono-tools/gui-compare/InfoManager.cs 2008-01-14 21:37:18 UTC (rev
92905)
+++ trunk/mono-tools/gui-compare/InfoManager.cs 2008-01-14 21:44:28 UTC (rev
92906)
@@ -340,7 +340,7 @@
}
}
catch (System.Net.WebException wex) {
- if (wex != null &&
((HttpWebResponse)wex.Response).StatusCode == HttpStatusCode.NotModified) {
+ if (wex != null && wex.Response != null
&& ((HttpWebResponse)wex.Response).StatusCode == HttpStatusCode.NotModified) {
Console.WriteLine ("remote file
not modified since we downloaded it");
Application.Invoke (delegate {
main.Progress = 0;
@@ -350,7 +350,6 @@
});
}
else {
- Console.WriteLine ("web status
code == {0}", ((HttpWebResponse)wex.Response).StatusCode);
Application.Invoke (delegate {
main.Progress = 0;
main.Status = "Download
failed";
Modified: trunk/mono-tools/gui-compare/MasterMetadata.cs
===================================================================
--- trunk/mono-tools/gui-compare/MasterMetadata.cs 2008-01-14 21:37:18 UTC
(rev 92905)
+++ trunk/mono-tools/gui-compare/MasterMetadata.cs 2008-01-14 21:44:28 UTC
(rev 92906)
@@ -529,6 +529,11 @@
return MasterUtils.GetAttributes (attributes);
}
+ public override string GetLiteralValue ()
+ {
+ return fieldValue;
+ }
+
string fieldType;
string fieldValue;
string fieldAccess;
Modified: trunk/mono-tools/gui-compare/Metadata.cs
===================================================================
--- trunk/mono-tools/gui-compare/Metadata.cs 2008-01-14 21:37:18 UTC (rev
92905)
+++ trunk/mono-tools/gui-compare/Metadata.cs 2008-01-14 21:44:28 UTC (rev
92906)
@@ -228,6 +228,7 @@
: base (name, CompType.Field)
{
}
+ public abstract string GetLiteralValue ();
}
public abstract class CompEvent : CompMember {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches