diff options
author | Marek Safar <marek.safar@gmail.com> | 2010-09-14 18:02:29 +0400 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2010-09-14 18:03:34 +0400 |
commit | 55e07850d58e9e073163ece68816d41eadbb1f3a (patch) | |
tree | f4363918f0334ce8e238b3bd0bcd2162b1598a9f /gui-compare | |
parent | e5ee947061c73bb42b91d7df58848741503fe75c (diff) |
[639072] Initialize evaluator before using it.
Diffstat (limited to 'gui-compare')
-rw-r--r-- | gui-compare/CompareContext.cs | 12 | ||||
-rw-r--r-- | gui-compare/Masterinfo.cs | 4 | ||||
-rw-r--r-- | gui-compare/Metadata.cs | 42 |
3 files changed, 29 insertions, 29 deletions
diff --git a/gui-compare/CompareContext.cs b/gui-compare/CompareContext.cs index d2eb4c68..a325081e 100644 --- a/gui-compare/CompareContext.cs +++ b/gui-compare/CompareContext.cs @@ -408,12 +408,12 @@ namespace GuiCompare { && !((CompMethod)reference_list[m]).ThrowsNotImplementedException ()) { comparison.ThrowsNIE = true; - }
-
- if (reference_list[m] is ICompGenericParameter && target_list[a] is ICompGenericParameter) {
- CompareTypeParameters (comparison,
- (ICompGenericParameter) reference_list[m],
- (ICompGenericParameter) target_list[a]);
+ } + + if (reference_list[m] is ICompGenericParameter && target_list[a] is ICompGenericParameter) { + CompareTypeParameters (comparison, + (ICompGenericParameter) reference_list[m], + (ICompGenericParameter) target_list[a]); } } diff --git a/gui-compare/Masterinfo.cs b/gui-compare/Masterinfo.cs index 8a168891..b91f99bf 100644 --- a/gui-compare/Masterinfo.cs +++ b/gui-compare/Masterinfo.cs @@ -1044,8 +1044,8 @@ namespace GuiCompare { } public override string GetNodeKey (string name, XmlNode node) - {
- if (genericParameters != null)
+ { + if (genericParameters != null) name = name + ":" + genericParameters.Count; // for explicit/implicit operators we need to include the return diff --git a/gui-compare/Metadata.cs b/gui-compare/Metadata.cs index 6c44b436..53e04e80 100644 --- a/gui-compare/Metadata.cs +++ b/gui-compare/Metadata.cs @@ -124,27 +124,27 @@ namespace GuiCompare { public static int Compare (CompNamed x, CompNamed y) { - int res = string.Compare (x.Name, y.Name);
- if (res != 0)
- return res;
-
- var x_g = x as CompMethod;
- var y_g = y as CompMethod;
- if (x_g == null || y_g == null)
- return res;
-
- var x_tp = x_g.GetTypeParameters ();
- var y_tp = y_g.GetTypeParameters ();
- if (x_tp == null && y_tp != null)
- return -1;
-
- if (x_tp != null && y_tp == null)
- return 1;
-
- if (x_tp == null && y_tp == null)
- return res;
-
- return x_tp.Count.CompareTo (y_tp.Count);
+ int res = string.Compare (x.Name, y.Name); + if (res != 0) + return res; + + var x_g = x as CompMethod; + var y_g = y as CompMethod; + if (x_g == null || y_g == null) + return res; + + var x_tp = x_g.GetTypeParameters (); + var y_tp = y_g.GetTypeParameters (); + if (x_tp == null && y_tp != null) + return -1; + + if (x_tp != null && y_tp == null) + return 1; + + if (x_tp == null && y_tp == null) + return res; + + return x_tp.Count.CompareTo (y_tp.Count); } string displayName; |