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 <tomi.valkeinen@iki.fi>

src/AST/Type.cs

@@ -659,8 +659,8 @@ namespace CppSharp.AST
         WideChar,
         Char,
         UChar,
-        Int16,
+        Short,
-        UInt16,
+        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:

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:
+                case PrimitiveType.Short:
-                    return AST.PrimitiveType.Int16;
+                    return AST.PrimitiveType.Short;
-                case PrimitiveType.UInt16:
+                case PrimitiveType.UShort:
-                    return AST.PrimitiveType.UInt16;
+                    return AST.PrimitiveType.UShort;
                 case PrimitiveType.Int32:
                     return AST.PrimitiveType.Int32;
                 case PrimitiveType.UInt32:

src/CppParser/AST.h

@@ -236,8 +236,8 @@ enum struct PrimitiveType
     WideChar,
     Char,
     UChar,
-    Int16,
+    Short,
-    UInt16,
+    UShort,
     Int32,
     UInt32,
     Long,

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::Short: return PrimitiveType::Short;
-    case clang::BuiltinType::UShort: return PrimitiveType::UInt16;
+    case clang::BuiltinType::UShort: return PrimitiveType::UShort;
 
     case clang::BuiltinType::Int: return PrimitiveType::Int32;
     case clang::BuiltinType::UInt: return PrimitiveType::UInt32;

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(

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.Short:
-                case PrimitiveType.UInt16:
+                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.Short:
-                case PrimitiveType.UInt16:
+                case PrimitiveType.UShort:
                 case PrimitiveType.Int32:
                 case PrimitiveType.UInt32:
                 case PrimitiveType.Long:

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.Short: return "short";
-                case PrimitiveType.UInt16: return "unsigned short";
+                case PrimitiveType.UShort: return "unsigned short";
                 case PrimitiveType.Int32: return "int";
                 case PrimitiveType.UInt32: return "unsigned int";
                 case PrimitiveType.Long: return "long";

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.Short:
-                case PrimitiveType.UInt16:
+                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.Short:
-                case PrimitiveType.UInt16:
+                case PrimitiveType.UShort:
                 case PrimitiveType.Int32:
                 case PrimitiveType.UInt32:
                 case PrimitiveType.Long:

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.Short: return "short";
-                case PrimitiveType.UInt16: return "ushort";
+                case PrimitiveType.UShort: return "ushort";
                 case PrimitiveType.Int32: return "int";
                 case PrimitiveType.UInt32: return "uint";
                 case PrimitiveType.Long: return "int";

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.Short: return "short";
-                case PrimitiveType.UInt16: return "unsigned short";
+                case PrimitiveType.UShort: return "unsigned short";
                 case PrimitiveType.Int32: return "int";
                 case PrimitiveType.UInt32: return "unsigned int";
                 case PrimitiveType.Long: return "long";

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::Short: return PrimitiveType::Short;
-    case clang::BuiltinType::UShort: return PrimitiveType::UInt16;
+    case clang::BuiltinType::UShort: return PrimitiveType::UShort;
 
     case clang::BuiltinType::Int: return PrimitiveType::Int32;
     case clang::BuiltinType::UInt: return PrimitiveType::UInt32;