From c66c34d4a967e619682b289d4be599b4ca768293 Mon Sep 17 00:00:00 2001 From: triton Date: Mon, 9 Sep 2013 23:00:43 +0100 Subject: [PATCH] Renamed the CLI language generator kind to be more uniform. --- src/Generator/Driver.cs | 4 ++-- src/Generator/Generators/Generator.cs | 2 +- tests/Basic/Basic.cs | 2 +- tests/VTables/VTables.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Generator/Driver.cs b/src/Generator/Driver.cs index d7ae356c..5566a67a 100644 --- a/src/Generator/Driver.cs +++ b/src/Generator/Driver.cs @@ -22,7 +22,7 @@ namespace CppSharp CreateGeneratorDelegate>(); Generators[LanguageGeneratorKind.CSharp] = driver => new CSharpGenerator(driver); - Generators[LanguageGeneratorKind.CPlusPlusCLI] = driver => + Generators[LanguageGeneratorKind.CLI] = driver => new CLIGenerator(driver); } @@ -275,7 +275,7 @@ namespace CppSharp public bool IsCLIGenerator { - get { return GeneratorKind == LanguageGeneratorKind.CPlusPlusCLI; } + get { return GeneratorKind == LanguageGeneratorKind.CLI; } } } diff --git a/src/Generator/Generators/Generator.cs b/src/Generator/Generators/Generator.cs index 9f078639..cc75e0e3 100644 --- a/src/Generator/Generators/Generator.cs +++ b/src/Generator/Generators/Generator.cs @@ -9,7 +9,7 @@ namespace CppSharp.Generators /// public enum LanguageGeneratorKind { - CPlusPlusCLI, + CLI, CSharp, } diff --git a/tests/Basic/Basic.cs b/tests/Basic/Basic.cs index 7cbe0d64..543bacff 100644 --- a/tests/Basic/Basic.cs +++ b/tests/Basic/Basic.cs @@ -21,7 +21,7 @@ namespace CppSharp.Tests { public static void Main(string[] args) { - ConsoleDriver.Run(new Basic(LanguageGeneratorKind.CPlusPlusCLI)); + ConsoleDriver.Run(new Basic(LanguageGeneratorKind.CLI)); ConsoleDriver.Run(new Basic(LanguageGeneratorKind.CSharp)); } } diff --git a/tests/VTables/VTables.cs b/tests/VTables/VTables.cs index 7360a9fc..ed16ef88 100644 --- a/tests/VTables/VTables.cs +++ b/tests/VTables/VTables.cs @@ -28,7 +28,7 @@ namespace CppSharp.Tests { public static void Main(string[] args) { - ConsoleDriver.Run(new VTableTests(LanguageGeneratorKind.CPlusPlusCLI)); + ConsoleDriver.Run(new VTableTests(LanguageGeneratorKind.CLI)); ConsoleDriver.Run(new VTableTests(LanguageGeneratorKind.CSharp)); } }