pimhwang
/
CppSharp
mirror of https://github.com/mono/CppSharp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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>
pull/252/head
Tomi Valkeinen 12 years ago committed by triton
parent
065570de74
commit
c702e928e8
10 changed files with 27 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/AST/Type.cs
  2. 8
      src/Core/Parser/ASTConverter.cs
  3. 4
      src/CppParser/AST.h
  4. 4
      src/CppParser/Parser.cpp
  5. 8
      src/Generator/Generators/CLI/CLIMarshal.cs
  6. 4
      src/Generator/Generators/CLI/CLITypePrinter.cs
  7. 8
      src/Generator/Generators/CSharp/CSharpMarshal.cs
  8. 4
      src/Generator/Generators/CSharp/CSharpTypePrinter.cs
  9. 4
      src/Generator/Types/CppTypePrinter.cs
  10. 4
      src/Parser/Parser.cpp

6
src/AST/Type.cs
Unescape View File

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

8
src/Core/Parser/ASTConverter.cs
Unescape View File

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

4
src/CppParser/AST.h
Unescape View File

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

4
src/CppParser/Parser.cpp
Unescape View File

@ -1338,8 +1338,8 @@ static PrimitiveType WalkBuiltinType(const clang::BuiltinType* Builtin) @@ -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::ULongLong: return PrimitiveType::UInt64;
case clang::BuiltinType::LongLong: return PrimitiveType::LongLong;
case clang::BuiltinType::ULongLong: return PrimitiveType::ULongLong;
case clang::BuiltinType::Float: return PrimitiveType::Float;
case clang::BuiltinType::Double: return PrimitiveType::Double;

8
src/Generator/Generators/CLI/CLIMarshal.cs
Unescape View File

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

4
src/Generator/Generators/CLI/CLITypePrinter.cs
Unescape View File

@ -197,8 +197,8 @@ namespace CppSharp.Generators.CLI @@ -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.UInt64: return "unsigned long long";
case PrimitiveType.LongLong: return "long long";
case PrimitiveType.ULongLong: return "unsigned long long";
case PrimitiveType.Float: return "float";
case PrimitiveType.Double: return "double";
case PrimitiveType.IntPtr: return "IntPtr";

8
src/Generator/Generators/CSharp/CSharpMarshal.cs
Unescape View File

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

4
src/Generator/Generators/CSharp/CSharpTypePrinter.cs
Unescape View File

@ -394,8 +394,8 @@ namespace CppSharp.Generators.CSharp @@ -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.UInt64: return "ulong";
case PrimitiveType.LongLong: return "long";
case PrimitiveType.ULongLong: return "ulong";
case PrimitiveType.Float: return "float";
case PrimitiveType.Double: return "double";
case PrimitiveType.IntPtr: return "global::System.IntPtr";

4
src/Generator/Types/CppTypePrinter.cs
Unescape View File

@ -112,8 +112,8 @@ namespace CppSharp.Types @@ -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.UInt64: return "unsigned long long";
case PrimitiveType.LongLong: return "long long";
case PrimitiveType.ULongLong: return "unsigned long long";
case PrimitiveType.Float: return "float";
case PrimitiveType.Double: return "double";
case PrimitiveType.IntPtr: return "void*";

4
src/Parser/Parser.cpp
Unescape View File

@ -1344,8 +1344,8 @@ static CppSharp::AST::PrimitiveType WalkBuiltinType(const clang::BuiltinType* Bu @@ -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::ULongLong: return PrimitiveType::UInt64;
case clang::BuiltinType::LongLong: return PrimitiveType::LongLong;
case clang::BuiltinType::ULongLong: return PrimitiveType::ULongLong;
case clang::BuiltinType::Float: return PrimitiveType::Float;
case clang::BuiltinType::Double: return PrimitiveType::Double;

Write Preview
Loading…
Cancel
Save