diff --git a/examples/SDL/SDL.cs b/examples/SDL/SDL.cs index 941293e4..2a265a5d 100644 --- a/examples/SDL/SDL.cs +++ b/examples/SDL/SDL.cs @@ -23,31 +23,31 @@ namespace CppSharp driver.TranslationUnitPasses.RemovePrefix("LOG_CATEGORY_"); } - public void Preprocess(Driver driver, ASTContext lib) + public void Preprocess(Driver driver, ASTContext ctx) { - lib.IgnoreEnumWithMatchingItem("SDL_FALSE"); - lib.IgnoreEnumWithMatchingItem("DUMMY_ENUM_VALUE"); + ctx.IgnoreEnumWithMatchingItem("SDL_FALSE"); + ctx.IgnoreEnumWithMatchingItem("DUMMY_ENUM_VALUE"); - lib.SetNameOfEnumWithMatchingItem("SDL_SCANCODE_UNKNOWN", "ScanCode"); - lib.SetNameOfEnumWithMatchingItem("SDLK_UNKNOWN", "Key"); - lib.SetNameOfEnumWithMatchingItem("KMOD_NONE", "KeyModifier"); - lib.SetNameOfEnumWithMatchingItem("SDL_LOG_CATEGORY_CUSTOM", "LogCategory"); + ctx.SetNameOfEnumWithMatchingItem("SDL_SCANCODE_UNKNOWN", "ScanCode"); + ctx.SetNameOfEnumWithMatchingItem("SDLK_UNKNOWN", "Key"); + ctx.SetNameOfEnumWithMatchingItem("KMOD_NONE", "KeyModifier"); + ctx.SetNameOfEnumWithMatchingItem("SDL_LOG_CATEGORY_CUSTOM", "LogCategory"); - lib.GenerateEnumFromMacros("InitFlags", "SDL_INIT_(.*)").SetFlags(); - lib.GenerateEnumFromMacros("Endianness", "SDL_(.*)_ENDIAN"); - lib.GenerateEnumFromMacros("InputState", "SDL_RELEASED", "SDL_PRESSED"); - lib.GenerateEnumFromMacros("AlphaState", "SDL_ALPHA_(.*)"); - lib.GenerateEnumFromMacros("HatState", "SDL_HAT_(.*)"); + ctx.GenerateEnumFromMacros("InitFlags", "SDL_INIT_(.*)").SetFlags(); + ctx.GenerateEnumFromMacros("Endianness", "SDL_(.*)_ENDIAN"); + ctx.GenerateEnumFromMacros("InputState", "SDL_RELEASED", "SDL_PRESSED"); + ctx.GenerateEnumFromMacros("AlphaState", "SDL_ALPHA_(.*)"); + ctx.GenerateEnumFromMacros("HatState", "SDL_HAT_(.*)"); - lib.IgnoreHeadersWithName("SDL_atomic*"); - lib.IgnoreHeadersWithName("SDL_endian*"); - lib.IgnoreHeadersWithName("SDL_main*"); - lib.IgnoreHeadersWithName("SDL_mutex*"); - lib.IgnoreHeadersWithName("SDL_stdinc*"); - lib.IgnoreHeadersWithName("SDL_error"); + ctx.IgnoreHeadersWithName("SDL_atomic*"); + ctx.IgnoreHeadersWithName("SDL_endian*"); + ctx.IgnoreHeadersWithName("SDL_main*"); + ctx.IgnoreHeadersWithName("SDL_mutex*"); + ctx.IgnoreHeadersWithName("SDL_stdinc*"); + ctx.IgnoreHeadersWithName("SDL_error"); - lib.IgnoreEnumWithMatchingItem("SDL_ENOMEM"); - lib.IgnoreFunctionWithName("SDL_Error"); + ctx.IgnoreEnumWithMatchingItem("SDL_ENOMEM"); + ctx.IgnoreFunctionWithName("SDL_Error"); } public void Postprocess(Driver driver, ASTContext lib) diff --git a/src/CppParser/Bindings/ParserGen.cs b/src/CppParser/Bindings/ParserGen.cs index de9d84e4..039446b2 100644 --- a/src/CppParser/Bindings/ParserGen.cs +++ b/src/CppParser/Bindings/ParserGen.cs @@ -56,13 +56,13 @@ namespace CppSharp } - public void Preprocess(Driver driver, ASTContext lib) + public void Preprocess(Driver driver, ASTContext ctx) { - lib.SetClassAsValueType("CppSharp::ParserOptions"); - lib.SetClassAsValueType("CppSharp::ParserDiagnostic"); - lib.SetClassAsValueType("CppSharp::ParserResult"); + ctx.SetClassAsValueType("CppSharp::ParserOptions"); + ctx.SetClassAsValueType("CppSharp::ParserDiagnostic"); + ctx.SetClassAsValueType("CppSharp::ParserResult"); - lib.RenameNamespace("CppSharp::CppParser", "Parser"); + ctx.RenameNamespace("CppSharp::CppParser", "Parser"); } public void Postprocess(Driver driver, ASTContext lib) diff --git a/src/Generator/Library.cs b/src/Generator/Library.cs index 8888d9f3..3b87755d 100644 --- a/src/Generator/Library.cs +++ b/src/Generator/Library.cs @@ -15,7 +15,7 @@ namespace CppSharp /// /// Do transformations that should happen before passes are processed. /// - void Preprocess(Driver driver, ASTContext lib); + void Preprocess(Driver driver, ASTContext ctx); /// /// Do transformations that should happen after passes are processed. diff --git a/src/Generator/Utils/TestsUtils.cs b/src/Generator/Utils/TestsUtils.cs index 9cd76512..5d2e01ba 100644 --- a/src/Generator/Utils/TestsUtils.cs +++ b/src/Generator/Utils/TestsUtils.cs @@ -81,7 +81,7 @@ namespace CppSharp.Utils options.Headers.Add(Path.GetFileName(file)); } - public virtual void Preprocess(Driver driver, ASTContext lib) + public virtual void Preprocess(Driver driver, ASTContext ctx) { } diff --git a/tests/Basic/Basic.cs b/tests/Basic/Basic.cs index a9176006..876c14d3 100644 --- a/tests/Basic/Basic.cs +++ b/tests/Basic/Basic.cs @@ -15,17 +15,15 @@ namespace CppSharp.Tests public override void SetupPasses(Driver driver) { if (driver.Options.IsCSharpGenerator) - { - driver.Options.GenerateAbstractImpls = true; - } + driver.Options.GenerateAbstractImpls = true; } - public override void Preprocess(Driver driver, ASTContext lib) + public override void Preprocess(Driver driver, ASTContext ctx) { - lib.SetClassAsValueType("Bar"); - lib.SetClassAsValueType("Bar2"); - lib.SetMethodParameterUsage("Hello", "TestPrimitiveOut", 1, ParameterUsage.Out); - lib.SetMethodParameterUsage("Hello", "TestPrimitiveOutRef", 1, ParameterUsage.Out); + ctx.SetClassAsValueType("Bar"); + ctx.SetClassAsValueType("Bar2"); + ctx.SetMethodParameterUsage("Hello", "TestPrimitiveOut", 1, ParameterUsage.Out); + ctx.SetMethodParameterUsage("Hello", "TestPrimitiveOutRef", 1, ParameterUsage.Out); } public static void Main(string[] args) diff --git a/tests/CLITemp/CLITemp.cs b/tests/CLITemp/CLITemp.cs index 191624c4..bbac2855 100644 --- a/tests/CLITemp/CLITemp.cs +++ b/tests/CLITemp/CLITemp.cs @@ -11,7 +11,7 @@ namespace CppSharp.Tests { } - public override void Preprocess(Driver driver, ASTContext lib) + public override void Preprocess(Driver driver, ASTContext ctx) { } diff --git a/tests/STL/STL.cs b/tests/STL/STL.cs index 56c4e222..5799f5db 100644 --- a/tests/STL/STL.cs +++ b/tests/STL/STL.cs @@ -11,7 +11,7 @@ namespace CppSharp.Tests { } - public override void Preprocess(Driver driver, ASTContext lib) + public override void Preprocess(Driver driver, ASTContext ctx) { } diff --git a/tests/UTF16/UTF16.cs b/tests/UTF16/UTF16.cs index 33e155a9..6c6c7e55 100644 --- a/tests/UTF16/UTF16.cs +++ b/tests/UTF16/UTF16.cs @@ -17,7 +17,7 @@ namespace CppSharp.Tests driver.Options.Encoding = Encoding.Unicode; } - public override void Preprocess(Driver driver, ASTContext lib) + public override void Preprocess(Driver driver, ASTContext ctx) { } diff --git a/tests/VTables/VTables.cs b/tests/VTables/VTables.cs index 2d3b6eef..13735ca6 100644 --- a/tests/VTables/VTables.cs +++ b/tests/VTables/VTables.cs @@ -19,7 +19,7 @@ namespace CppSharp.Tests driver.TranslationUnitPasses.AddPass(new FunctionToInstanceMethodPass()); } - public override void Preprocess(Driver driver, ASTContext lib) + public override void Preprocess(Driver driver, ASTContext ctx) { }