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

Remove PrimitiveTypes Int8 and UInt8 

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

This patch removes those values. As Int8 and UInt8 were set to be
equivalent to Char and UChar, we can just change all references to Int8
and UInt8 to Char and UChar.

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

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@iki.fi>
pull/252/head
Tomi Valkeinen 12 years ago committed by triton
parent
f90d469f1d
commit
1cd9f0a16c
14 changed files with 29 additions and 37 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. 8
      src/AST/Type.cs
  2. 8
      src/Core/Parser/ASTConverter.cs
  3. 6
      src/CppParser/AST.h
  4. 2
      src/CppParser/Bindings/CLI/AST.h
  5. 2
      src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs
  6. 4
      src/CppParser/Parser.cpp
  7. 8
      src/Generator/Generators/CLI/CLIMarshal.cs
  8. 2
      src/Generator/Generators/CLI/CLISourcesTemplate.cs
  9. 4
      src/Generator/Generators/CLI/CLITypePrinter.cs
  10. 8
      src/Generator/Generators/CSharp/CSharpMarshal.cs
  11. 2
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  12. 4
      src/Generator/Generators/CSharp/CSharpTypePrinter.cs
  13. 4
      src/Generator/Types/CppTypePrinter.cs
  14. 4
      src/Parser/Parser.cpp

8
src/AST/Type.cs
Unescape View File

@ -657,10 +657,8 @@ namespace CppSharp.AST @@ -657,10 +657,8 @@ namespace CppSharp.AST
Void,
Bool,
WideChar,
Int8,
Char = Int8,
UInt8,
UChar = UInt8,
Char,
UChar,
Int16,
UInt16,
Int32,
@ -697,7 +695,7 @@ namespace CppSharp.AST @@ -697,7 +695,7 @@ namespace CppSharp.AST
switch (Type)
{
case PrimitiveType.Bool:
case PrimitiveType.UInt8:
case PrimitiveType.UChar:
case PrimitiveType.UInt16:
case PrimitiveType.UInt32:
case PrimitiveType.ULong:

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

@ -556,10 +556,10 @@ namespace CppSharp @@ -556,10 +556,10 @@ namespace CppSharp
return AST.PrimitiveType.Bool;
case PrimitiveType.WideChar:
return AST.PrimitiveType.WideChar;
case PrimitiveType.Int8:
return AST.PrimitiveType.Int8;
case PrimitiveType.UInt8:
return AST.PrimitiveType.UInt8;
case PrimitiveType.Char:
return AST.PrimitiveType.Char;
case PrimitiveType.UChar:
return AST.PrimitiveType.UChar;
case PrimitiveType.Int16:
return AST.PrimitiveType.Int16;
case PrimitiveType.UInt16:

6
src/CppParser/AST.h
Unescape View File

@ -234,10 +234,8 @@ enum struct PrimitiveType @@ -234,10 +234,8 @@ enum struct PrimitiveType
Void,
Bool,
WideChar,
Int8,
Char = Int8,
UInt8,
UChar = UInt8,
Char,
UChar,
Int16,
UInt16,
Int32,

2
src/CppParser/Bindings/CLI/AST.h
Unescape View File

@ -237,9 +237,7 @@ namespace CppSharp @@ -237,9 +237,7 @@ namespace CppSharp
Void = 1,
Bool = 2,
WideChar = 3,
Int8 = 4,
Char = 4,
UInt8 = 5,
UChar = 5,
Int16 = 6,
UInt16 = 7,

2
src/CppParser/Bindings/CSharp/i686-pc-win32/AST.cs
Unescape View File

@ -165,9 +165,7 @@ namespace CppSharp @@ -165,9 +165,7 @@ namespace CppSharp
Void = 1,
Bool = 2,
WideChar = 3,
Int8 = 4,
Char = 4,
UInt8 = 5,
UChar = 5,
Int16 = 6,
UInt16 = 7,

4
src/CppParser/Parser.cpp
Unescape View File

@ -1321,10 +1321,10 @@ static PrimitiveType WalkBuiltinType(const clang::BuiltinType* Builtin) @@ -1321,10 +1321,10 @@ static PrimitiveType WalkBuiltinType(const clang::BuiltinType* Builtin)
case clang::BuiltinType::Bool: return PrimitiveType::Bool;
case clang::BuiltinType::SChar:
case clang::BuiltinType::Char_S: return PrimitiveType::Int8;
case clang::BuiltinType::Char_S: return PrimitiveType::Char;
case clang::BuiltinType::UChar:
case clang::BuiltinType::Char_U: return PrimitiveType::UInt8;
case clang::BuiltinType::Char_U: return PrimitiveType::UChar;
case clang::BuiltinType::WChar_S:
case clang::BuiltinType::WChar_U: return PrimitiveType::WideChar;

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

@ -156,8 +156,8 @@ namespace CppSharp.Generators.CLI @@ -156,8 +156,8 @@ namespace CppSharp.Generators.CLI
case PrimitiveType.Void:
return true;
case PrimitiveType.Bool:
case PrimitiveType.Int8:
case PrimitiveType.UInt8:
case PrimitiveType.Char:
case PrimitiveType.UChar:
case PrimitiveType.Int16:
case PrimitiveType.UInt16:
case PrimitiveType.Int32:
@ -497,8 +497,8 @@ namespace CppSharp.Generators.CLI @@ -497,8 +497,8 @@ namespace CppSharp.Generators.CLI
case PrimitiveType.Void:
return true;
case PrimitiveType.Bool:
case PrimitiveType.Int8:
case PrimitiveType.UInt8:
case PrimitiveType.Char:
case PrimitiveType.UChar:
case PrimitiveType.Int16:
case PrimitiveType.UInt16:
case PrimitiveType.Int32:

2
src/Generator/Generators/CLI/CLISourcesTemplate.cs
Unescape View File

@ -990,7 +990,7 @@ namespace CppSharp.Generators.CLI @@ -990,7 +990,7 @@ namespace CppSharp.Generators.CLI
if (Driver.Options.MarshalCharAsManagedChar)
{
foreach (var param in method.Parameters.Where(
p => p.Type.IsPrimitiveType(PrimitiveType.Int8)))
p => p.Type.IsPrimitiveType(PrimitiveType.Char)))
{
WriteLine("if ({0} < System::Char::MinValue || {0} > System::SByte::MaxValue)", param.Name);
WriteLineIndent(

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

@ -189,8 +189,8 @@ namespace CppSharp.Generators.CLI @@ -189,8 +189,8 @@ namespace CppSharp.Generators.CLI
case PrimitiveType.Void: return "void";
case PrimitiveType.Char16:
case PrimitiveType.WideChar: return "System::Char";
case PrimitiveType.Int8: return Options.MarshalCharAsManagedChar ? "System::Char" : "char";
case PrimitiveType.UInt8: return "unsigned 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.Int32: return "int";

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

@ -187,8 +187,8 @@ namespace CppSharp.Generators.CSharp @@ -187,8 +187,8 @@ namespace CppSharp.Generators.CSharp
case PrimitiveType.Void:
return true;
case PrimitiveType.Bool:
case PrimitiveType.Int8:
case PrimitiveType.UInt8:
case PrimitiveType.Char:
case PrimitiveType.UChar:
case PrimitiveType.Int16:
case PrimitiveType.UInt16:
case PrimitiveType.Int32:
@ -509,8 +509,8 @@ namespace CppSharp.Generators.CSharp @@ -509,8 +509,8 @@ namespace CppSharp.Generators.CSharp
case PrimitiveType.Void:
return true;
case PrimitiveType.Bool:
case PrimitiveType.Int8:
case PrimitiveType.UInt8:
case PrimitiveType.Char:
case PrimitiveType.UChar:
case PrimitiveType.Int16:
case PrimitiveType.UInt16:
case PrimitiveType.Int32:

2
src/Generator/Generators/CSharp/CSharpTextTemplate.cs
Unescape View File

@ -2079,7 +2079,7 @@ namespace CppSharp.Generators.CSharp @@ -2079,7 +2079,7 @@ namespace CppSharp.Generators.CSharp
if (Driver.Options.MarshalCharAsManagedChar)
{
foreach (var param in method.Parameters.Where(
p => p.Type.IsPrimitiveType(PrimitiveType.Int8)))
p => p.Type.IsPrimitiveType(PrimitiveType.Char)))
{
WriteLine("if ({0} < char.MinValue || {0} > sbyte.MaxValue)", param.Name);
WriteLineIndent(

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

@ -386,8 +386,8 @@ namespace CppSharp.Generators.CSharp @@ -386,8 +386,8 @@ namespace CppSharp.Generators.CSharp
case PrimitiveType.Void: return "void";
case PrimitiveType.Char16:
case PrimitiveType.WideChar: return "char";
case PrimitiveType.Int8: return driverOptions.MarshalCharAsManagedChar ? "char" : "sbyte";
case PrimitiveType.UInt8: return "byte";
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.Int32: return "int";

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

@ -104,8 +104,8 @@ namespace CppSharp.Types @@ -104,8 +104,8 @@ namespace CppSharp.Types
case PrimitiveType.Void: return "void";
case PrimitiveType.Char16:
case PrimitiveType.WideChar: return "char";
case PrimitiveType.Int8: return "char";
case PrimitiveType.UInt8: return "unsigned 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.Int32: return "int";

4
src/Parser/Parser.cpp
Unescape View File

@ -1325,10 +1325,10 @@ static CppSharp::AST::PrimitiveType WalkBuiltinType(const clang::BuiltinType* Bu @@ -1325,10 +1325,10 @@ static CppSharp::AST::PrimitiveType WalkBuiltinType(const clang::BuiltinType* Bu
case clang::BuiltinType::Bool: return PrimitiveType::Bool;
case clang::BuiltinType::SChar:
case clang::BuiltinType::Char_S: return PrimitiveType::Int8;
case clang::BuiltinType::Char_S: return PrimitiveType::Char;
case clang::BuiltinType::UChar:
case clang::BuiltinType::Char_U: return PrimitiveType::UInt8;
case clang::BuiltinType::Char_U: return PrimitiveType::UChar;
case clang::BuiltinType::WChar_S:
case clang::BuiltinType::WChar_U: return PrimitiveType::WideChar;

Write Preview
Loading…
Cancel
Save