From 5484758507748075bc959d845a74c9949a5bf12b Mon Sep 17 00:00:00 2001 From: marcos henrich Date: Sun, 6 Apr 2014 16:18:17 +0100 Subject: [PATCH] Added DriverOptions to CLITypeReferenceCollector. --- src/Generator/Generators/CLI/CLIHeadersTemplate.cs | 4 ++-- src/Generator/Generators/CLI/CLISourcesTemplate.cs | 2 +- src/Generator/Generators/CLI/CLITypeReferences.cs | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs index 5197c7f9..8d5354fe 100644 --- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs +++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs @@ -52,7 +52,7 @@ namespace CppSharp.Generators.CLI public void GenerateIncludeForwardRefs() { - var typeReferenceCollector = new CLITypeReferenceCollector(Driver.TypeDatabase); + var typeReferenceCollector = new CLITypeReferenceCollector(Driver.TypeDatabase, Driver.Options); typeReferenceCollector.Process(TranslationUnit, filterNamespaces: false); var includes = new SortedSet(StringComparer.InvariantCulture); @@ -129,7 +129,7 @@ namespace CppSharp.Generators.CLI public void GenerateForwardRefs() { - var typeReferenceCollector = new CLITypeReferenceCollector(Driver.TypeDatabase); + var typeReferenceCollector = new CLITypeReferenceCollector(Driver.TypeDatabase, Driver.Options); typeReferenceCollector.Process(TranslationUnit); var typeReferences = typeReferenceCollector.TypeReferences; diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs index 56dbe99c..71d00569 100644 --- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs +++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs @@ -60,7 +60,7 @@ namespace CppSharp.Generators.CLI { PushBlock(CLIBlockKind.IncludesForwardReferences); - var typeReferenceCollector = new CLITypeReferenceCollector(Driver.TypeDatabase); + var typeReferenceCollector = new CLITypeReferenceCollector(Driver.TypeDatabase, Driver.Options); typeReferenceCollector.Process(TranslationUnit, filterNamespaces: false); var includes = new SortedSet(StringComparer.InvariantCulture); diff --git a/src/Generator/Generators/CLI/CLITypeReferences.cs b/src/Generator/Generators/CLI/CLITypeReferences.cs index 059792df..b1fd3667 100644 --- a/src/Generator/Generators/CLI/CLITypeReferences.cs +++ b/src/Generator/Generators/CLI/CLITypeReferences.cs @@ -26,6 +26,7 @@ namespace CppSharp.Generators.CLI public class CLITypeReferenceCollector : AstVisitor { private readonly ITypeMapDatabase TypeMapDatabase; + private readonly DriverOptions DriverOptions; private TranslationUnit TranslationUnit; private Dictionary typeReferences; @@ -34,9 +35,10 @@ namespace CppSharp.Generators.CLI get { return typeReferences.Values; } } - public CLITypeReferenceCollector(ITypeMapDatabase typeMapDatabase) + public CLITypeReferenceCollector(ITypeMapDatabase typeMapDatabase, DriverOptions driverOptions) { TypeMapDatabase = typeMapDatabase; + DriverOptions = driverOptions; typeReferences = new Dictionary(); }