Browse Source

Fixed Windows build.

pull/696/head
Joao Matos 9 years ago
parent
commit
f8f4c2ecc5
  1. 6
      src/Generator.Tests/AST/TestAST.cs
  2. 4
      src/Generator/BindingContext.cs
  3. 3
      src/Generator/Driver.cs

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

@ -6,6 +6,7 @@ using NUnit.Framework;
using CppSharp.Generators.CSharp; using CppSharp.Generators.CSharp;
using System; using System;
using CppSharp.Generators; using CppSharp.Generators;
using CppSharp.Parser;
namespace CppSharp.Generator.Tests.AST namespace CppSharp.Generator.Tests.AST
{ {
@ -314,10 +315,11 @@ namespace CppSharp.Generator.Tests.AST
[Test] [Test]
public void TestAmbiguity() public void TestAmbiguity()
{ {
var bindingContext = new BindingContext(new TextDiagnosticPrinter(), new DriverOptions()); var bindingContext = new BindingContext(new TextDiagnosticPrinter(), new DriverOptions(),
new ParserOptions2())
new CleanUnitPass { Context = bindingContext }.VisitLibrary(AstContext); new CleanUnitPass { Context = bindingContext }.VisitLibrary(AstContext);
new CheckAmbiguousFunctions { Context = bindingContext }.VisitLibrary(AstContext); new CheckAmbiguousFunctions { Context = bindingContext }.VisitLibrary(AstContext);
Assert.IsTrue(AstContext.FindClass("HasAmbiguousFunctions").Single().FindMethod("ambiguous").IsAmbiguous); Assert.IsTrue(AstContext.FindClass("HasAmbiguousFunctions").Single().FindMethod("ambiguous").IsAmbiguous);
} }
[Test] [Test]

4
src/Generator/BindingContext.cs

@ -26,10 +26,12 @@ namespace CppSharp.Generators
private static readonly Dictionary<string, string> libraryMappings = new Dictionary<string, string>(); private static readonly Dictionary<string, string> libraryMappings = new Dictionary<string, string>();
public BindingContext(IDiagnostics diagnostics, DriverOptions options) public BindingContext(IDiagnostics diagnostics, DriverOptions options,
ParserOptions2 parserOptions = null)
{ {
Options = options; Options = options;
Diagnostics = diagnostics; Diagnostics = diagnostics;
ParserOptions = parserOptions;
Symbols = new SymbolContext(); Symbols = new SymbolContext();
Delegates = new Dictionary<Function, DelegatesPass.DelegateDefinition>(); Delegates = new Dictionary<Function, DelegatesPass.DelegateDefinition>();

3
src/Generator/Driver.cs

@ -78,8 +78,7 @@ namespace CppSharp
{ {
ValidateOptions(); ValidateOptions();
SetupIncludes(); SetupIncludes();
Context = new BindingContext(Diagnostics, Options); Context = new BindingContext(Diagnostics, Options, ParserOptions);
Context.ParserOptions = ParserOptions;
Generator = CreateGeneratorFromKind(Options.GeneratorKind); Generator = CreateGeneratorFromKind(Options.GeneratorKind);
} }

Loading…
Cancel
Save