Browse Source

Renamed LanguageGeneratorKind to GeneratorKind.

pull/86/head
triton 12 years ago
parent
commit
d114ac0f0e
  1. 2
      src/Generator/Passes/FunctionToInstanceMethodPass.cs
  2. 4
      src/Generator/Utils/TestsUtils.cs
  3. 6
      tests/Basic/Basic.cs
  4. 4
      tests/CSharpTemp/CSharpTemp.cs
  5. 4
      tests/UTF16/UTF16.cs
  6. 6
      tests/VTables/VTables.cs

2
src/Generator/Passes/FunctionToInstanceMethodPass.cs

@ -59,7 +59,7 @@ namespace CppSharp.Passes @@ -59,7 +59,7 @@ namespace CppSharp.Passes
Conversion = MethodConversionKind.FunctionToInstanceMethod
};
if (Driver.Options.GeneratorKind == LanguageGeneratorKind.CSharp)
if (Driver.Options.GeneratorKind == GeneratorKind.CSharp)
method.Parameters = method.Parameters.Skip(1).ToList();
@class.Methods.Add(method);

4
src/Generator/Utils/TestsUtils.cs

@ -8,9 +8,9 @@ namespace CppSharp.Utils @@ -8,9 +8,9 @@ namespace CppSharp.Utils
public abstract class LibraryTest : ILibrary
{
readonly string name;
readonly LanguageGeneratorKind kind;
readonly GeneratorKind kind;
protected LibraryTest(string name, LanguageGeneratorKind kind)
protected LibraryTest(string name, GeneratorKind kind)
{
this.name = name;
this.kind = kind;

6
tests/Basic/Basic.cs

@ -6,7 +6,7 @@ namespace CppSharp.Tests @@ -6,7 +6,7 @@ namespace CppSharp.Tests
{
public class Basic : LibraryTest
{
public Basic(LanguageGeneratorKind kind)
public Basic(GeneratorKind kind)
: base("Basic", kind)
{
}
@ -23,8 +23,8 @@ namespace CppSharp.Tests @@ -23,8 +23,8 @@ namespace CppSharp.Tests
{
public static void Main(string[] args)
{
ConsoleDriver.Run(new Basic(LanguageGeneratorKind.CLI));
ConsoleDriver.Run(new Basic(LanguageGeneratorKind.CSharp));
ConsoleDriver.Run(new Basic(GeneratorKind.CLI));
ConsoleDriver.Run(new Basic(GeneratorKind.CSharp));
}
}
}

4
tests/CSharpTemp/CSharpTemp.cs

@ -5,7 +5,7 @@ namespace CppSharp.Tests @@ -5,7 +5,7 @@ namespace CppSharp.Tests
{
public class CSharpTempTests : LibraryTest
{
public CSharpTempTests(LanguageGeneratorKind kind)
public CSharpTempTests(GeneratorKind kind)
: base("CSharpTemp", kind)
{
}
@ -20,7 +20,7 @@ namespace CppSharp.Tests @@ -20,7 +20,7 @@ namespace CppSharp.Tests
{
public static void Main(string[] args)
{
ConsoleDriver.Run(new CSharpTempTests(LanguageGeneratorKind.CSharp));
ConsoleDriver.Run(new CSharpTempTests(GeneratorKind.CSharp));
}
}
}

4
tests/UTF16/UTF16.cs

@ -7,7 +7,7 @@ namespace CppSharp.Tests @@ -7,7 +7,7 @@ namespace CppSharp.Tests
{
public class UTF16Tests : LibraryTest
{
public UTF16Tests(LanguageGeneratorKind kind)
public UTF16Tests(GeneratorKind kind)
: base("UTF16", kind)
{
}
@ -26,7 +26,7 @@ namespace CppSharp.Tests @@ -26,7 +26,7 @@ namespace CppSharp.Tests
{
public static void Main(string[] args)
{
ConsoleDriver.Run(new UTF16Tests(LanguageGeneratorKind.CSharp));
ConsoleDriver.Run(new UTF16Tests(GeneratorKind.CSharp));
}
}
}

6
tests/VTables/VTables.cs

@ -7,7 +7,7 @@ namespace CppSharp.Tests @@ -7,7 +7,7 @@ namespace CppSharp.Tests
{
public class VTableTests : LibraryTest
{
public VTableTests(LanguageGeneratorKind kind)
public VTableTests(GeneratorKind kind)
: base("VTables", kind)
{
}
@ -28,8 +28,8 @@ namespace CppSharp.Tests @@ -28,8 +28,8 @@ namespace CppSharp.Tests
{
public static void Main(string[] args)
{
ConsoleDriver.Run(new VTableTests(LanguageGeneratorKind.CLI));
ConsoleDriver.Run(new VTableTests(LanguageGeneratorKind.CSharp));
ConsoleDriver.Run(new VTableTests(GeneratorKind.CLI));
ConsoleDriver.Run(new VTableTests(GeneratorKind.CSharp));
}
}
}

Loading…
Cancel
Save