From b86bf4f7cd44b47e33c97fe4a59b71b869369b44 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Thu, 16 Feb 2017 02:27:35 +0000 Subject: [PATCH] Simplify FixDefaultParamValuesOfOverridesPass.VisitMethodDecl. --- .../FixDefaultParamValuesOfOverridesPass.cs | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/Generator/Passes/FixDefaultParamValuesOfOverridesPass.cs b/src/Generator/Passes/FixDefaultParamValuesOfOverridesPass.cs index 097df0c0..7fc15928 100644 --- a/src/Generator/Passes/FixDefaultParamValuesOfOverridesPass.cs +++ b/src/Generator/Passes/FixDefaultParamValuesOfOverridesPass.cs @@ -6,24 +6,20 @@ namespace CppSharp.Passes { public override bool VisitMethodDecl(Method method) { - if (method.IsOverride && !method.IsSynthetized) + if (!method.IsOverride || method.IsSynthetized) + return true; + + Method rootBaseMethod = ((Class)method.Namespace).GetBaseMethod(method); + for (int i = 0; i < method.Parameters.Count; i++) { - Method rootBaseMethod = ((Class) method.Namespace).GetBaseMethod(method); - for (int i = 0; i < method.Parameters.Count; i++) - { - var rootBaseParameter = rootBaseMethod.Parameters[i]; - var parameter = method.Parameters[i]; - if (rootBaseParameter.DefaultArgument == null) - { - parameter.DefaultArgument = null; - } - else - { - parameter.DefaultArgument = rootBaseParameter.DefaultArgument.Clone(); - } - } + var rootBaseParameter = rootBaseMethod.Parameters[i]; + var parameter = method.Parameters[i]; + + if (rootBaseParameter.DefaultArgument != null) + parameter.DefaultArgument = rootBaseParameter.DefaultArgument.Clone(); } - return base.VisitMethodDecl(method); + + return true; } } }