From 065570de748d860c781f98ee5d11cb31e82215b6 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Sat, 10 May 2014 23:01:41 +0300 Subject: [PATCH] Rename PrimitiveType Int16 and UInt16 to Short and UShort As enum PrimitiveType is supposed to represent C++ types, having Int16 and UInt16 there is not correct. This patch renames those values to Short and UShort. This doesn't change the behavior, but makes it clearer that the types for 'short' and 'unsigned short' are not necessarily 16 bits. Signed-off-by: Tomi Valkeinen --- src/AST/Type.cs | 6 +++--- src/Core/Parser/ASTConverter.cs | 8 ++++---- src/CppParser/AST.h | 4 ++-- src/CppParser/Parser.cpp | 4 ++-- src/Generator.Tests/AST/TestAST.cs | 2 +- src/Generator/Generators/CLI/CLIMarshal.cs | 8 ++++---- src/Generator/Generators/CLI/CLITypePrinter.cs | 4 ++-- src/Generator/Generators/CSharp/CSharpMarshal.cs | 8 ++++---- src/Generator/Generators/CSharp/CSharpTypePrinter.cs | 6 +++--- src/Generator/Types/CppTypePrinter.cs | 4 ++-- src/Parser/Parser.cpp | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/AST/Type.cs b/src/AST/Type.cs index f5af7722..ac9870bf 100644 --- a/src/AST/Type.cs +++ b/src/AST/Type.cs @@ -659,8 +659,8 @@ namespace CppSharp.AST WideChar, Char, UChar, - Int16, - UInt16, + Short, + UShort, Int32, UInt32, Long, @@ -696,7 +696,7 @@ namespace CppSharp.AST { case PrimitiveType.Bool: case PrimitiveType.UChar: - case PrimitiveType.UInt16: + case PrimitiveType.UShort: case PrimitiveType.UInt32: case PrimitiveType.ULong: case PrimitiveType.UInt64: diff --git a/src/Core/Parser/ASTConverter.cs b/src/Core/Parser/ASTConverter.cs index 71571a5e..839769e7 100644 --- a/src/Core/Parser/ASTConverter.cs +++ b/src/Core/Parser/ASTConverter.cs @@ -560,10 +560,10 @@ namespace CppSharp return AST.PrimitiveType.Char; case PrimitiveType.UChar: return AST.PrimitiveType.UChar; - case PrimitiveType.Int16: - return AST.PrimitiveType.Int16; - case PrimitiveType.UInt16: - return AST.PrimitiveType.UInt16; + case PrimitiveType.Short: + return AST.PrimitiveType.Short; + case PrimitiveType.UShort: + return AST.PrimitiveType.UShort; case PrimitiveType.Int32: return AST.PrimitiveType.Int32; case PrimitiveType.UInt32: diff --git a/src/CppParser/AST.h b/src/CppParser/AST.h index bc136726..5874cf74 100644 --- a/src/CppParser/AST.h +++ b/src/CppParser/AST.h @@ -236,8 +236,8 @@ enum struct PrimitiveType WideChar, Char, UChar, - Int16, - UInt16, + Short, + UShort, Int32, UInt32, Long, diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp index c7852508..cea7a057 100644 --- a/src/CppParser/Parser.cpp +++ b/src/CppParser/Parser.cpp @@ -1329,8 +1329,8 @@ static PrimitiveType WalkBuiltinType(const clang::BuiltinType* Builtin) case clang::BuiltinType::WChar_S: case clang::BuiltinType::WChar_U: return PrimitiveType::WideChar; - case clang::BuiltinType::Short: return PrimitiveType::Int16; - case clang::BuiltinType::UShort: return PrimitiveType::UInt16; + case clang::BuiltinType::Short: return PrimitiveType::Short; + case clang::BuiltinType::UShort: return PrimitiveType::UShort; case clang::BuiltinType::Int: return PrimitiveType::Int32; case clang::BuiltinType::UInt: return PrimitiveType::UInt32; diff --git a/src/Generator.Tests/AST/TestAST.cs b/src/Generator.Tests/AST/TestAST.cs index b037befc..76ce6dd9 100644 --- a/src/Generator.Tests/AST/TestAST.cs +++ b/src/Generator.Tests/AST/TestAST.cs @@ -38,7 +38,7 @@ namespace CppSharp.Generator.Tests.AST { Modifier = PointerType.TypeModifier.LVReference, QualifiedPointee = new QualifiedType( - new BuiltinType(PrimitiveType.Int16), + new BuiltinType(PrimitiveType.Short), new TypeQualifiers() { IsConst = true }) }), new QualifiedType( diff --git a/src/Generator/Generators/CLI/CLIMarshal.cs b/src/Generator/Generators/CLI/CLIMarshal.cs index 08bc3a91..344075d2 100644 --- a/src/Generator/Generators/CLI/CLIMarshal.cs +++ b/src/Generator/Generators/CLI/CLIMarshal.cs @@ -158,8 +158,8 @@ namespace CppSharp.Generators.CLI case PrimitiveType.Bool: case PrimitiveType.Char: case PrimitiveType.UChar: - case PrimitiveType.Int16: - case PrimitiveType.UInt16: + case PrimitiveType.Short: + case PrimitiveType.UShort: case PrimitiveType.Int32: case PrimitiveType.UInt32: case PrimitiveType.Long: @@ -499,8 +499,8 @@ namespace CppSharp.Generators.CLI case PrimitiveType.Bool: case PrimitiveType.Char: case PrimitiveType.UChar: - case PrimitiveType.Int16: - case PrimitiveType.UInt16: + case PrimitiveType.Short: + case PrimitiveType.UShort: case PrimitiveType.Int32: case PrimitiveType.UInt32: case PrimitiveType.Long: diff --git a/src/Generator/Generators/CLI/CLITypePrinter.cs b/src/Generator/Generators/CLI/CLITypePrinter.cs index c9540168..41b0c6f4 100644 --- a/src/Generator/Generators/CLI/CLITypePrinter.cs +++ b/src/Generator/Generators/CLI/CLITypePrinter.cs @@ -191,8 +191,8 @@ namespace CppSharp.Generators.CLI case PrimitiveType.WideChar: return "System::Char"; case PrimitiveType.Char: return Options.MarshalCharAsManagedChar ? "System::Char" : "char"; case PrimitiveType.UChar: return "unsigned char"; - case PrimitiveType.Int16: return "short"; - case PrimitiveType.UInt16: return "unsigned short"; + case PrimitiveType.Short: return "short"; + case PrimitiveType.UShort: return "unsigned short"; case PrimitiveType.Int32: return "int"; case PrimitiveType.UInt32: return "unsigned int"; case PrimitiveType.Long: return "long"; diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs index 3bff415f..b4dabd19 100644 --- a/src/Generator/Generators/CSharp/CSharpMarshal.cs +++ b/src/Generator/Generators/CSharp/CSharpMarshal.cs @@ -189,8 +189,8 @@ namespace CppSharp.Generators.CSharp case PrimitiveType.Bool: case PrimitiveType.Char: case PrimitiveType.UChar: - case PrimitiveType.Int16: - case PrimitiveType.UInt16: + case PrimitiveType.Short: + case PrimitiveType.UShort: case PrimitiveType.Int32: case PrimitiveType.UInt32: case PrimitiveType.Long: @@ -511,8 +511,8 @@ namespace CppSharp.Generators.CSharp case PrimitiveType.Bool: case PrimitiveType.Char: case PrimitiveType.UChar: - case PrimitiveType.Int16: - case PrimitiveType.UInt16: + case PrimitiveType.Short: + case PrimitiveType.UShort: case PrimitiveType.Int32: case PrimitiveType.UInt32: case PrimitiveType.Long: diff --git a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs index 5bd43a9d..dd37cbda 100644 --- a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs +++ b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs @@ -388,8 +388,8 @@ namespace CppSharp.Generators.CSharp case PrimitiveType.WideChar: return "char"; case PrimitiveType.Char: return driverOptions.MarshalCharAsManagedChar ? "char" : "sbyte"; case PrimitiveType.UChar: return "byte"; - case PrimitiveType.Int16: return "short"; - case PrimitiveType.UInt16: return "ushort"; + case PrimitiveType.Short: return "short"; + case PrimitiveType.UShort: return "ushort"; case PrimitiveType.Int32: return "int"; case PrimitiveType.UInt32: return "uint"; case PrimitiveType.Long: return "int"; @@ -586,4 +586,4 @@ namespace CppSharp.Generators.CSharp return decl.Visit(printer); } } -} \ No newline at end of file +} diff --git a/src/Generator/Types/CppTypePrinter.cs b/src/Generator/Types/CppTypePrinter.cs index 39a73d87..2ea130aa 100644 --- a/src/Generator/Types/CppTypePrinter.cs +++ b/src/Generator/Types/CppTypePrinter.cs @@ -106,8 +106,8 @@ namespace CppSharp.Types case PrimitiveType.WideChar: return "char"; case PrimitiveType.Char: return "char"; case PrimitiveType.UChar: return "unsigned char"; - case PrimitiveType.Int16: return "short"; - case PrimitiveType.UInt16: return "unsigned short"; + case PrimitiveType.Short: return "short"; + case PrimitiveType.UShort: return "unsigned short"; case PrimitiveType.Int32: return "int"; case PrimitiveType.UInt32: return "unsigned int"; case PrimitiveType.Long: return "long"; diff --git a/src/Parser/Parser.cpp b/src/Parser/Parser.cpp index 6d1f8a3d..90abe880 100644 --- a/src/Parser/Parser.cpp +++ b/src/Parser/Parser.cpp @@ -1335,8 +1335,8 @@ static CppSharp::AST::PrimitiveType WalkBuiltinType(const clang::BuiltinType* Bu case clang::BuiltinType::Char16: return PrimitiveType::Char16; - case clang::BuiltinType::Short: return PrimitiveType::Int16; - case clang::BuiltinType::UShort: return PrimitiveType::UInt16; + case clang::BuiltinType::Short: return PrimitiveType::Short; + case clang::BuiltinType::UShort: return PrimitiveType::UShort; case clang::BuiltinType::Int: return PrimitiveType::Int32; case clang::BuiltinType::UInt: return PrimitiveType::UInt32;