Rename PrimitiveType Int64 and UInt64 to LongLong and ULongLong

As enum PrimitiveType is supposed to represent C++ types, having Int64
and UInt64 there is not correct.

This patch renames those values to LongLong and ULongLong.

This doesn't change the behavior, but makes it clearer that the types
for 'long long' and 'unsigned long long' are not necessarily 64 bits.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@iki.fi>

src/AST/Type.cs

@@ -665,8 +665,8 @@ namespace CppSharp.AST
         UInt32,
         Long,
         ULong,
-        Int64,
+        LongLong,
-        UInt64,
+        ULongLong,
         Float,
         Double,
         IntPtr,
@@ -699,7 +699,7 @@ namespace CppSharp.AST
                 case PrimitiveType.UShort:
                 case PrimitiveType.UInt32:
                 case PrimitiveType.ULong:
-                case PrimitiveType.UInt64:
+                case PrimitiveType.ULongLong:
                     return true;
                 }
 

src/Core/Parser/ASTConverter.cs

@@ -572,10 +572,10 @@ namespace CppSharp
                     return AST.PrimitiveType.Long;
                 case PrimitiveType.ULong:
                     return AST.PrimitiveType.ULong;
-                case PrimitiveType.Int64:
+                case PrimitiveType.LongLong:
-                    return AST.PrimitiveType.Int64;
+                    return AST.PrimitiveType.LongLong;
-                case PrimitiveType.UInt64:
+                case PrimitiveType.ULongLong:
-                    return AST.PrimitiveType.UInt64;
+                    return AST.PrimitiveType.ULongLong;
                 case PrimitiveType.Float:
                     return AST.PrimitiveType.Float;
                 case PrimitiveType.Double:

src/CppParser/AST.h

@@ -242,8 +242,8 @@ enum struct PrimitiveType
     UInt32,
     Long,
     ULong,
-    Int64,
+    LongLong,
-    UInt64,
+    ULongLong,
     Float,
     Double,
     IntPtr

src/CppParser/Parser.cpp

@@ -1338,8 +1338,8 @@ static PrimitiveType WalkBuiltinType(const clang::BuiltinType* Builtin)
     case clang::BuiltinType::Long: return PrimitiveType::Long;
     case clang::BuiltinType::ULong: return PrimitiveType::ULong;
     
-    case clang::BuiltinType::LongLong: return PrimitiveType::Int64;
+    case clang::BuiltinType::LongLong: return PrimitiveType::LongLong;
-    case clang::BuiltinType::ULongLong: return PrimitiveType::UInt64;
+    case clang::BuiltinType::ULongLong: return PrimitiveType::ULongLong;
 
     case clang::BuiltinType::Float: return PrimitiveType::Float;
     case clang::BuiltinType::Double: return PrimitiveType::Double;

src/Generator/Generators/CLI/CLIMarshal.cs

@@ -164,8 +164,8 @@ namespace CppSharp.Generators.CLI
                 case PrimitiveType.UInt32:
                 case PrimitiveType.Long:
                 case PrimitiveType.ULong:
-                case PrimitiveType.Int64:
+                case PrimitiveType.LongLong:
-                case PrimitiveType.UInt64:
+                case PrimitiveType.ULongLong:
                 case PrimitiveType.Float:
                 case PrimitiveType.Double:
                 case PrimitiveType.Null:
@@ -505,8 +505,8 @@ namespace CppSharp.Generators.CLI
                 case PrimitiveType.UInt32:
                 case PrimitiveType.Long:
                 case PrimitiveType.ULong:
-                case PrimitiveType.Int64:
+                case PrimitiveType.LongLong:
-                case PrimitiveType.UInt64:
+                case PrimitiveType.ULongLong:
                 case PrimitiveType.Float:
                 case PrimitiveType.Double:
                     Context.Return.Write(Context.Parameter.Name);

src/Generator/Generators/CLI/CLITypePrinter.cs

@@ -197,8 +197,8 @@ namespace CppSharp.Generators.CLI
                 case PrimitiveType.UInt32: return "unsigned int";
                 case PrimitiveType.Long: return "long";
                 case PrimitiveType.ULong: return "unsigned long";
-                case PrimitiveType.Int64: return "long long";
+                case PrimitiveType.LongLong: return "long long";
-                case PrimitiveType.UInt64: return "unsigned long long";
+                case PrimitiveType.ULongLong: return "unsigned long long";
                 case PrimitiveType.Float: return "float";
                 case PrimitiveType.Double: return "double";
                 case PrimitiveType.IntPtr: return "IntPtr";

src/Generator/Generators/CSharp/CSharpMarshal.cs

@@ -195,8 +195,8 @@ namespace CppSharp.Generators.CSharp
                 case PrimitiveType.UInt32:
                 case PrimitiveType.Long:
                 case PrimitiveType.ULong:
-                case PrimitiveType.Int64:
+                case PrimitiveType.LongLong:
-                case PrimitiveType.UInt64:
+                case PrimitiveType.ULongLong:
                 case PrimitiveType.Float:
                 case PrimitiveType.Double:
                 case PrimitiveType.WideChar:
@@ -517,8 +517,8 @@ namespace CppSharp.Generators.CSharp
                 case PrimitiveType.UInt32:
                 case PrimitiveType.Long:
                 case PrimitiveType.ULong:
-                case PrimitiveType.Int64:
+                case PrimitiveType.LongLong:
-                case PrimitiveType.UInt64:
+                case PrimitiveType.ULongLong:
                 case PrimitiveType.Float:
                 case PrimitiveType.Double:
                 case PrimitiveType.WideChar:

src/Generator/Generators/CSharp/CSharpTypePrinter.cs

@@ -394,8 +394,8 @@ namespace CppSharp.Generators.CSharp
                 case PrimitiveType.UInt32: return "uint";
                 case PrimitiveType.Long: return "int";
                 case PrimitiveType.ULong: return "uint";
-                case PrimitiveType.Int64: return "long";
+                case PrimitiveType.LongLong: return "long";
-                case PrimitiveType.UInt64: return "ulong";
+                case PrimitiveType.ULongLong: return "ulong";
                 case PrimitiveType.Float: return "float";
                 case PrimitiveType.Double: return "double";
                 case PrimitiveType.IntPtr: return "global::System.IntPtr";

src/Generator/Types/CppTypePrinter.cs

@@ -112,8 +112,8 @@ namespace CppSharp.Types
                 case PrimitiveType.UInt32: return "unsigned int";
                 case PrimitiveType.Long: return "long";
                 case PrimitiveType.ULong: return "unsigned long";
-                case PrimitiveType.Int64: return "long long";
+                case PrimitiveType.LongLong: return "long long";
-                case PrimitiveType.UInt64: return "unsigned long long";
+                case PrimitiveType.ULongLong: return "unsigned long long";
                 case PrimitiveType.Float: return "float";
                 case PrimitiveType.Double: return "double";
                 case PrimitiveType.IntPtr: return "void*";

src/Parser/Parser.cpp

@@ -1344,8 +1344,8 @@ static CppSharp::AST::PrimitiveType WalkBuiltinType(const clang::BuiltinType* Bu
     case clang::BuiltinType::Long: return PrimitiveType::Long;
     case clang::BuiltinType::ULong: return PrimitiveType::ULong;
     
-    case clang::BuiltinType::LongLong: return PrimitiveType::Int64;
+    case clang::BuiltinType::LongLong: return PrimitiveType::LongLong;
-    case clang::BuiltinType::ULongLong: return PrimitiveType::UInt64;
+    case clang::BuiltinType::ULongLong: return PrimitiveType::ULongLong;
 
     case clang::BuiltinType::Float: return PrimitiveType::Float;
     case clang::BuiltinType::Double: return PrimitiveType::Double;