From 9826097b5360e61e747e291f976e81a39fe7b28c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Matos?= Date: Tue, 31 Mar 2020 22:46:03 +0100 Subject: [PATCH] Guard MoveFunctionToClassPass pass registration against CLI and C# generators. --- src/Generator/Driver.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Generator/Driver.cs b/src/Generator/Driver.cs index 57350271..a7191662 100644 --- a/src/Generator/Driver.cs +++ b/src/Generator/Driver.cs @@ -222,8 +222,10 @@ namespace CppSharp TranslationUnitPasses.AddPass(new ResolveIncompleteDeclsPass()); TranslationUnitPasses.AddPass(new IgnoreSystemDeclarationsPass()); + if (Options.IsCSharpGenerator) TranslationUnitPasses.AddPass(new EqualiseAccessOfOverrideAndBasePass()); + TranslationUnitPasses.AddPass(new CheckIgnoredDeclsPass()); if (Options.IsCSharpGenerator) @@ -239,7 +241,12 @@ namespace CppSharp TranslationUnitPasses.AddPass(new FindSymbolsPass()); TranslationUnitPasses.AddPass(new CheckMacroPass()); TranslationUnitPasses.AddPass(new CheckStaticClass()); - TranslationUnitPasses.AddPass(new MoveFunctionToClassPass()); + + if (Options.IsCLIGenerator || Options.IsCSharpGenerator) + { + TranslationUnitPasses.AddPass(new MoveFunctionToClassPass()); + } + TranslationUnitPasses.AddPass(new CheckAmbiguousFunctions()); TranslationUnitPasses.AddPass(new ConstructorToConversionOperatorPass()); TranslationUnitPasses.AddPass(new MarshalPrimitivePointersAsRefTypePass()); @@ -280,6 +287,7 @@ namespace CppSharp TranslationUnitPasses.AddPass(new SpecializationMethodsWithDependentPointersPass()); TranslationUnitPasses.AddPass(new ParamTypeToInterfacePass()); } + TranslationUnitPasses.AddPass(new CheckDuplicatedNamesPass()); TranslationUnitPasses.AddPass(new MarkUsedClassInternalsPass());