Browse Source

Rename VisitLibrary method to VisitASTContext.

pull/719/head
Joao Matos 9 years ago
parent
commit
7a26c11382
  1. 4
      src/Generator.Tests/AST/TestAST.cs
  2. 24
      src/Generator.Tests/Passes/TestPasses.cs
  3. 2
      src/Generator/BindingContext.cs
  4. 2
      src/Generator/Driver.cs
  5. 4
      src/Generator/Passes/DelegatesPass.cs
  6. 4
      src/Generator/Passes/GenerateAnonymousDelegatesPass.cs
  7. 2
      src/Generator/Passes/GenerateInlinesCodePass.cs
  8. 4
      src/Generator/Passes/GenerateTemplatesCodePass.cs
  9. 2
      src/Generator/Passes/Pass.cs
  10. 2
      tests/CSharp/CSharp.cs
  11. 2
      tests/NamespacesDerived/NamespacesDerived.cs

4
src/Generator.Tests/AST/TestAST.cs

@ -317,8 +317,8 @@ namespace CppSharp.Generator.Tests.AST @@ -317,8 +317,8 @@ namespace CppSharp.Generator.Tests.AST
{
var bindingContext = new BindingContext(new TextDiagnosticPrinter(), new DriverOptions(),
new ParserOptions());
new CleanUnitPass { Context = bindingContext }.VisitLibrary(AstContext);
new CheckAmbiguousFunctions { Context = bindingContext }.VisitLibrary(AstContext);
new CleanUnitPass { Context = bindingContext }.VisitASTContext(AstContext);
new CheckAmbiguousFunctions { Context = bindingContext }.VisitASTContext(AstContext);
Assert.IsTrue(AstContext.FindClass("HasAmbiguousFunctions").Single().FindMethod("ambiguous").IsAmbiguous);
}

24
src/Generator.Tests/Passes/TestPasses.cs

@ -33,7 +33,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -33,7 +33,7 @@ namespace CppSharp.Generator.Tests.Passes
Assert.IsFalse(@enum2.IsFlags);
passBuilder.AddPass(new CheckFlagEnumsPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
Assert.IsTrue(@enum.IsFlags);
Assert.IsFalse(@enum2.IsFlags);
@ -47,7 +47,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -47,7 +47,7 @@ namespace CppSharp.Generator.Tests.Passes
Assert.IsNull(c.Method("Start"));
passBuilder.AddPass(new FunctionToInstanceMethodPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
Assert.IsNotNull(c.Method("Start"));
}
@ -61,7 +61,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -61,7 +61,7 @@ namespace CppSharp.Generator.Tests.Passes
Assert.IsNull(c.Method("Start"));
passBuilder.AddPass(new FunctionToStaticMethodPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
Assert.IsFalse(AstContext.Function("FooStart").IsGenerated);
Assert.IsNotNull(c.Method("Start"));
@ -75,13 +75,13 @@ namespace CppSharp.Generator.Tests.Passes @@ -75,13 +75,13 @@ namespace CppSharp.Generator.Tests.Passes
var c = AstContext.Class("TestRename");
passBuilder.AddPass(new FieldToPropertyPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
var method = c.Method("lowerCaseMethod");
var property = c.Properties.Find(p => p.Name == "lowerCaseField");
passBuilder.RenameDeclsUpperCase(RenameTargets.Any);
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
Assert.That(method.Name, Is.EqualTo("LowerCaseMethod"));
Assert.That(property.Name, Is.EqualTo("LowerCaseField"));
@ -99,7 +99,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -99,7 +99,7 @@ namespace CppSharp.Generator.Tests.Passes
passBuilder.RemovePrefix("TEST_ENUM_ITEM_NAME_", RenameTargets.EnumItem);
passBuilder.AddPass(new CleanInvalidDeclNamesPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
Assert.That(@enum.Items[0].Name, Is.EqualTo("_0"));
}
@ -108,7 +108,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -108,7 +108,7 @@ namespace CppSharp.Generator.Tests.Passes
public void TestUnnamedEnumSupport()
{
passBuilder.AddPass(new CleanInvalidDeclNamesPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
var unnamedEnum1 = AstContext.FindEnum("Unnamed_Enum_1").Single();
var unnamedEnum2 = AstContext.FindEnum("Unnamed_Enum_2").Single();
@ -128,7 +128,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -128,7 +128,7 @@ namespace CppSharp.Generator.Tests.Passes
public void TestUniqueNamesAcrossTranslationUnits()
{
passBuilder.AddPass(new CleanInvalidDeclNamesPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
var unnamedEnum1 = AstContext.GetEnumWithMatchingItem("UnnamedEnumA1");
var unnamedEnum2 = AstContext.GetEnumWithMatchingItem("UnnamedEnumB1");
@ -158,7 +158,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -158,7 +158,7 @@ namespace CppSharp.Generator.Tests.Passes
const string className = "TestReadOnlyProperties";
passBuilder.AddPass(new FieldToPropertyPass());
passBuilder.AddPass(new GetterSetterToPropertyPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
AstContext.SetPropertyAsReadOnly(className, "readOnlyProperty");
Assert.IsFalse(AstContext.FindClass(className).First().Properties.Find(
m => m.Name == "readOnlyProperty").HasSetter);
@ -171,7 +171,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -171,7 +171,7 @@ namespace CppSharp.Generator.Tests.Passes
public void TestCheckAmbiguousFunctionsPass()
{
passBuilder.AddPass(new CheckAmbiguousFunctions());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
var @class = AstContext.FindClass("TestCheckAmbiguousFunctionsPass").FirstOrDefault();
Assert.IsNotNull(@class);
var overloads = @class.Methods.Where(m => m.Name == "Method");
@ -204,7 +204,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -204,7 +204,7 @@ namespace CppSharp.Generator.Tests.Passes
var method = c.Method("beInternal");
Assert.AreEqual(method.Access, AccessSpecifier.Public);
passBuilder.AddPass(new CheckMacroPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
Assert.AreEqual(method.Access, AccessSpecifier.Internal);
}
@ -217,7 +217,7 @@ namespace CppSharp.Generator.Tests.Passes @@ -217,7 +217,7 @@ namespace CppSharp.Generator.Tests.Passes
public void TestAbstractOperator()
{
passBuilder.AddPass(new CheckOperatorsOverloadsPass());
passBuilder.RunPasses(pass => pass.VisitLibrary(AstContext));
passBuilder.RunPasses(pass => pass.VisitASTContext(AstContext));
var @class = AstContext.FindDecl<Class>("ClassWithAbstractOperator").First();
Assert.AreEqual(@class.Operators.First().GenerationKind, GenerationKind.None);

2
src/Generator/BindingContext.cs

@ -50,7 +50,7 @@ namespace CppSharp.Generators @@ -50,7 +50,7 @@ namespace CppSharp.Generators
Diagnostics.Debug("Pass '{0}'", pass);
Diagnostics.PushIndent();
pass.VisitLibrary(ASTContext);
pass.VisitASTContext(ASTContext);
Diagnostics.PopIndent();
});
}

2
src/Generator/Driver.cs

@ -497,7 +497,7 @@ namespace CppSharp @@ -497,7 +497,7 @@ namespace CppSharp
return;
}
new CleanUnitPass { Context = driver.Context }.VisitLibrary(driver.Context.ASTContext);
new CleanUnitPass { Context = driver.Context }.VisitASTContext(driver.Context.ASTContext);
options.Modules.RemoveAll(m => m != options.SystemModule && !m.Units.GetGenerated().Any());
if (!options.Quiet)

4
src/Generator/Passes/DelegatesPass.cs

@ -35,7 +35,7 @@ namespace CppSharp.Passes @@ -35,7 +35,7 @@ namespace CppSharp.Passes
VisitOptions.VisitTemplateArguments = false;
}
public override bool VisitLibrary(ASTContext context)
public override bool VisitASTContext(ASTContext context)
{
foreach (var library in Options.Modules.SelectMany(m => m.Libraries))
libsDelegates[library] = new Dictionary<string, DelegateDefinition>();
@ -45,7 +45,7 @@ namespace CppSharp.Passes @@ -45,7 +45,7 @@ namespace CppSharp.Passes
if (unit == null)
return false;
var result = base.VisitLibrary(context);
var result = base.VisitASTContext(context);
foreach (var module in Options.Modules.Where(m => namespacesDelegates.ContainsKey(m)))
module.Units.Last(u => u.HasDeclarations).Declarations.Add(namespacesDelegates[module]);

4
src/Generator/Passes/GenerateAnonymousDelegatesPass.cs

@ -26,9 +26,9 @@ namespace CppSharp.Passes @@ -26,9 +26,9 @@ namespace CppSharp.Passes
/// </summary>
private readonly Dictionary<string, List<Typedef>> allTypedefs = new Dictionary<string, List<Typedef>>();
public override bool VisitLibrary(ASTContext context)
public override bool VisitASTContext(ASTContext context)
{
bool result = base.VisitLibrary(context);
bool result = base.VisitASTContext(context);
foreach (var typedef in allTypedefs)
{

2
src/Generator/Passes/GenerateInlinesCodePass.cs

@ -6,7 +6,7 @@ namespace CppSharp.Passes @@ -6,7 +6,7 @@ namespace CppSharp.Passes
{
public class GenerateInlinesCodePass : TranslationUnitPass
{
public override bool VisitLibrary(ASTContext context)
public override bool VisitASTContext(ASTContext context)
{
WriteInlinesIncludes();
return true;

4
src/Generator/Passes/GenerateTemplatesCodePass.cs

@ -8,9 +8,9 @@ namespace CppSharp.Passes @@ -8,9 +8,9 @@ namespace CppSharp.Passes
{
public class GenerateTemplatesCodePass : TranslationUnitPass
{
public override bool VisitLibrary(ASTContext context)
public override bool VisitASTContext(ASTContext context)
{
base.VisitLibrary(context);
base.VisitASTContext(context);
WriteTemplateInstantiations();
return true;
}

2
src/Generator/Passes/Pass.cs

@ -19,7 +19,7 @@ namespace CppSharp.Passes @@ -19,7 +19,7 @@ namespace CppSharp.Passes
public bool ClearVisitedDeclarations = false;
public virtual bool VisitLibrary(ASTContext context)
public virtual bool VisitASTContext(ASTContext context)
{
foreach (var unit in context.TranslationUnits)
VisitTranslationUnit(unit);

2
tests/CSharp/CSharp.cs

@ -177,7 +177,7 @@ namespace CppSharp.Tests @@ -177,7 +177,7 @@ namespace CppSharp.Tests
{
new CaseRenamePass(
RenameTargets.Function | RenameTargets.Method | RenameTargets.Property | RenameTargets.Delegate | RenameTargets.Variable,
RenameCasePattern.UpperCamelCase).VisitLibrary(driver.Context.ASTContext);
RenameCasePattern.UpperCamelCase).VisitASTContext(driver.Context.ASTContext);
}
public static void Main(string[] args)

2
tests/NamespacesDerived/NamespacesDerived.cs

@ -37,7 +37,7 @@ namespace CppSharp.Tests @@ -37,7 +37,7 @@ namespace CppSharp.Tests
{
new CaseRenamePass(
RenameTargets.Function | RenameTargets.Method | RenameTargets.Property | RenameTargets.Delegate | RenameTargets.Variable,
RenameCasePattern.UpperCamelCase).VisitLibrary(driver.Context.ASTContext);
RenameCasePattern.UpperCamelCase).VisitASTContext(driver.Context.ASTContext);
}
}

Loading…
Cancel
Save