From 00e29e25b28d8d07359ab8a6d94addd297a944a0 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Mon, 6 Feb 2017 12:43:14 +0000 Subject: [PATCH] Reduce nesting in CheckIgnoredDecls.CheckIgnoredBaseOverridenMethod. --- src/Generator/Passes/CheckIgnoredDecls.cs | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/Generator/Passes/CheckIgnoredDecls.cs b/src/Generator/Passes/CheckIgnoredDecls.cs index 48761e80..7ef0de96 100644 --- a/src/Generator/Passes/CheckIgnoredDecls.cs +++ b/src/Generator/Passes/CheckIgnoredDecls.cs @@ -174,21 +174,19 @@ namespace CppSharp.Passes { var @class = method.Namespace as Class; - if (method.IsVirtual) - { - Class ignoredBase; - if (HasIgnoredBaseClass(method, @class, out ignoredBase)) - { - Diagnostics.Debug( - "Virtual method '{0}' was ignored due to ignored base '{1}'", - method.QualifiedOriginalName, ignoredBase.Name); + if (!method.IsVirtual) + return true; - method.ExplicitlyIgnore(); - return false; - } - } + Class ignoredBase; + if (!HasIgnoredBaseClass(method, @class, out ignoredBase)) + return true; - return true; + Diagnostics.Debug( + "Virtual method '{0}' was ignored due to ignored base '{1}'", + method.QualifiedOriginalName, ignoredBase.Name); + + method.ExplicitlyIgnore(); + return false; } static bool HasIgnoredBaseClass(INamedDecl @override, Class @class,