Browse Source

Remove duplicate tests.

Makes code structure and intent clearer.
pull/306/merge
Ed Harvey 14 years ago
parent
commit
1ccb34f2d6
  1. 15
      ICSharpCode.Decompiler/Ast/AstBuilder.cs

15
ICSharpCode.Decompiler/Ast/AstBuilder.cs

@ -73,28 +73,35 @@ namespace ICSharpCode.Decompiler.Ast
if (settings.AnonymousMethods && method.Name.StartsWith("<", StringComparison.Ordinal) && method.IsCompilerGenerated()) if (settings.AnonymousMethods && method.Name.StartsWith("<", StringComparison.Ordinal) && method.IsCompilerGenerated())
return true; return true;
} }
TypeDefinition type = member as TypeDefinition; TypeDefinition type = member as TypeDefinition;
if (type != null && type.DeclaringType != null) { if (type != null) {
if (type.DeclaringType != null) {
if (settings.AnonymousMethods && type.Name.StartsWith("<>c__DisplayClass", StringComparison.Ordinal) && type.IsCompilerGenerated()) if (settings.AnonymousMethods && type.Name.StartsWith("<>c__DisplayClass", StringComparison.Ordinal) && type.IsCompilerGenerated())
return true; return true;
if (settings.YieldReturn && YieldReturnDecompiler.IsCompilerGeneratorEnumerator(type)) if (settings.YieldReturn && YieldReturnDecompiler.IsCompilerGeneratorEnumerator(type))
return true; return true;
} else if (type != null && type.IsCompilerGenerated()) { } else if (type.IsCompilerGenerated()) {
if (type.Name.StartsWith("<PrivateImplementationDetails>", StringComparison.Ordinal)) if (type.Name.StartsWith("<PrivateImplementationDetails>", StringComparison.Ordinal))
return true; return true;
if (type.IsAnonymousType()) if (type.IsAnonymousType())
return true; return true;
} }
}
FieldDefinition field = member as FieldDefinition; FieldDefinition field = member as FieldDefinition;
if (field != null && field.IsCompilerGenerated()) { if (field != null) {
if (field.IsCompilerGenerated()) {
if (settings.AnonymousMethods && field.Name.StartsWith("CS$<>", StringComparison.Ordinal)) if (settings.AnonymousMethods && field.Name.StartsWith("CS$<>", StringComparison.Ordinal))
return true; return true;
if (settings.AutomaticProperties && field.Name.StartsWith("<", StringComparison.Ordinal) && field.Name.EndsWith("BackingField", StringComparison.Ordinal)) if (settings.AutomaticProperties && field.Name.StartsWith("<", StringComparison.Ordinal) && field.Name.EndsWith("BackingField", StringComparison.Ordinal))
return true; return true;
} }
// event-fields are not [CompilerGenerated] // event-fields are not [CompilerGenerated]
if (field != null && settings.AutomaticEvents && field.DeclaringType.Events.Any(ev => ev.Name == field.Name)) if (settings.AutomaticEvents && field.DeclaringType.Events.Any(ev => ev.Name == field.Name))
return true; return true;
}
return false; return false;
} }

Loading…
Cancel
Save