Browse Source

Renamed ASTContext parameter from "lib" to "ctx".

pull/144/merge
triton 12 years ago
parent
commit
4d70b60700
  1. 40
      examples/SDL/SDL.cs
  2. 10
      src/CppParser/Bindings/ParserGen.cs
  3. 2
      src/Generator/Library.cs
  4. 2
      src/Generator/Utils/TestsUtils.cs
  5. 12
      tests/Basic/Basic.cs
  6. 2
      tests/CLITemp/CLITemp.cs
  7. 2
      tests/STL/STL.cs
  8. 2
      tests/UTF16/UTF16.cs
  9. 2
      tests/VTables/VTables.cs

40
examples/SDL/SDL.cs

@ -23,31 +23,31 @@ namespace CppSharp
driver.TranslationUnitPasses.RemovePrefix("LOG_CATEGORY_"); driver.TranslationUnitPasses.RemovePrefix("LOG_CATEGORY_");
} }
public void Preprocess(Driver driver, ASTContext lib) public void Preprocess(Driver driver, ASTContext ctx)
{ {
lib.IgnoreEnumWithMatchingItem("SDL_FALSE"); ctx.IgnoreEnumWithMatchingItem("SDL_FALSE");
lib.IgnoreEnumWithMatchingItem("DUMMY_ENUM_VALUE"); ctx.IgnoreEnumWithMatchingItem("DUMMY_ENUM_VALUE");
lib.SetNameOfEnumWithMatchingItem("SDL_SCANCODE_UNKNOWN", "ScanCode"); ctx.SetNameOfEnumWithMatchingItem("SDL_SCANCODE_UNKNOWN", "ScanCode");
lib.SetNameOfEnumWithMatchingItem("SDLK_UNKNOWN", "Key"); ctx.SetNameOfEnumWithMatchingItem("SDLK_UNKNOWN", "Key");
lib.SetNameOfEnumWithMatchingItem("KMOD_NONE", "KeyModifier"); ctx.SetNameOfEnumWithMatchingItem("KMOD_NONE", "KeyModifier");
lib.SetNameOfEnumWithMatchingItem("SDL_LOG_CATEGORY_CUSTOM", "LogCategory"); ctx.SetNameOfEnumWithMatchingItem("SDL_LOG_CATEGORY_CUSTOM", "LogCategory");
lib.GenerateEnumFromMacros("InitFlags", "SDL_INIT_(.*)").SetFlags(); ctx.GenerateEnumFromMacros("InitFlags", "SDL_INIT_(.*)").SetFlags();
lib.GenerateEnumFromMacros("Endianness", "SDL_(.*)_ENDIAN"); ctx.GenerateEnumFromMacros("Endianness", "SDL_(.*)_ENDIAN");
lib.GenerateEnumFromMacros("InputState", "SDL_RELEASED", "SDL_PRESSED"); ctx.GenerateEnumFromMacros("InputState", "SDL_RELEASED", "SDL_PRESSED");
lib.GenerateEnumFromMacros("AlphaState", "SDL_ALPHA_(.*)"); ctx.GenerateEnumFromMacros("AlphaState", "SDL_ALPHA_(.*)");
lib.GenerateEnumFromMacros("HatState", "SDL_HAT_(.*)"); ctx.GenerateEnumFromMacros("HatState", "SDL_HAT_(.*)");
lib.IgnoreHeadersWithName("SDL_atomic*"); ctx.IgnoreHeadersWithName("SDL_atomic*");
lib.IgnoreHeadersWithName("SDL_endian*"); ctx.IgnoreHeadersWithName("SDL_endian*");
lib.IgnoreHeadersWithName("SDL_main*"); ctx.IgnoreHeadersWithName("SDL_main*");
lib.IgnoreHeadersWithName("SDL_mutex*"); ctx.IgnoreHeadersWithName("SDL_mutex*");
lib.IgnoreHeadersWithName("SDL_stdinc*"); ctx.IgnoreHeadersWithName("SDL_stdinc*");
lib.IgnoreHeadersWithName("SDL_error"); ctx.IgnoreHeadersWithName("SDL_error");
lib.IgnoreEnumWithMatchingItem("SDL_ENOMEM"); ctx.IgnoreEnumWithMatchingItem("SDL_ENOMEM");
lib.IgnoreFunctionWithName("SDL_Error"); ctx.IgnoreFunctionWithName("SDL_Error");
} }
public void Postprocess(Driver driver, ASTContext lib) public void Postprocess(Driver driver, ASTContext lib)

10
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"); ctx.SetClassAsValueType("CppSharp::ParserOptions");
lib.SetClassAsValueType("CppSharp::ParserDiagnostic"); ctx.SetClassAsValueType("CppSharp::ParserDiagnostic");
lib.SetClassAsValueType("CppSharp::ParserResult"); ctx.SetClassAsValueType("CppSharp::ParserResult");
lib.RenameNamespace("CppSharp::CppParser", "Parser"); ctx.RenameNamespace("CppSharp::CppParser", "Parser");
} }
public void Postprocess(Driver driver, ASTContext lib) public void Postprocess(Driver driver, ASTContext lib)

2
src/Generator/Library.cs

@ -15,7 +15,7 @@ namespace CppSharp
/// <summary> /// <summary>
/// Do transformations that should happen before passes are processed. /// Do transformations that should happen before passes are processed.
/// </summary> /// </summary>
void Preprocess(Driver driver, ASTContext lib); void Preprocess(Driver driver, ASTContext ctx);
/// <summary> /// <summary>
/// Do transformations that should happen after passes are processed. /// Do transformations that should happen after passes are processed.

2
src/Generator/Utils/TestsUtils.cs

@ -81,7 +81,7 @@ namespace CppSharp.Utils
options.Headers.Add(Path.GetFileName(file)); options.Headers.Add(Path.GetFileName(file));
} }
public virtual void Preprocess(Driver driver, ASTContext lib) public virtual void Preprocess(Driver driver, ASTContext ctx)
{ {
} }

12
tests/Basic/Basic.cs

@ -15,17 +15,15 @@ namespace CppSharp.Tests
public override void SetupPasses(Driver driver) public override void SetupPasses(Driver driver)
{ {
if (driver.Options.IsCSharpGenerator) 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"); ctx.SetClassAsValueType("Bar");
lib.SetClassAsValueType("Bar2"); ctx.SetClassAsValueType("Bar2");
lib.SetMethodParameterUsage("Hello", "TestPrimitiveOut", 1, ParameterUsage.Out); ctx.SetMethodParameterUsage("Hello", "TestPrimitiveOut", 1, ParameterUsage.Out);
lib.SetMethodParameterUsage("Hello", "TestPrimitiveOutRef", 1, ParameterUsage.Out); ctx.SetMethodParameterUsage("Hello", "TestPrimitiveOutRef", 1, ParameterUsage.Out);
} }
public static void Main(string[] args) public static void Main(string[] args)

2
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)
{ {
} }

2
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)
{ {
} }

2
tests/UTF16/UTF16.cs

@ -17,7 +17,7 @@ namespace CppSharp.Tests
driver.Options.Encoding = Encoding.Unicode; driver.Options.Encoding = Encoding.Unicode;
} }
public override void Preprocess(Driver driver, ASTContext lib) public override void Preprocess(Driver driver, ASTContext ctx)
{ {
} }

2
tests/VTables/VTables.cs

@ -19,7 +19,7 @@ namespace CppSharp.Tests
driver.TranslationUnitPasses.AddPass(new FunctionToInstanceMethodPass()); driver.TranslationUnitPasses.AddPass(new FunctionToInstanceMethodPass());
} }
public override void Preprocess(Driver driver, ASTContext lib) public override void Preprocess(Driver driver, ASTContext ctx)
{ {
} }

Loading…
Cancel
Save