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

Rename PrimitiveType Int32 and UInt32 to Int and UInt 

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

This patch renames those values to Int and UInt.

This doesn't change the behavior, but makes it clearer that the types
for 'int' and 'unsigned int' are not necessarily 32 bits.
pull/252/head
Tomi Valkeinen 12 years ago committed by triton
parent
c702e928e8
commit
7289a06b9e
17 changed files with 35 additions and 35 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. 2
      src/AST/Enumeration.cs
  2. 6
      src/AST/Type.cs
  3. 8
      src/Core/Parser/ASTConverter.cs
  4. 4
      src/CppParser/AST.h
  5. 4
      src/CppParser/Parser.cpp
  6. 4
      src/Generator.Tests/AST/TestAST.cs
  7. 2
      src/Generator/Generators/CLI/CLIHeadersTemplate.cs
  8. 8
      src/Generator/Generators/CLI/CLIMarshal.cs
  9. 4
      src/Generator/Generators/CLI/CLITypePrinter.cs
  10. 2
      src/Generator/Generators/CLI/CLITypeReferences.cs
  11. 8
      src/Generator/Generators/CSharp/CSharpMarshal.cs
  12. 2
      src/Generator/Generators/CSharp/CSharpTextTemplate.cs
  13. 4
      src/Generator/Generators/CSharp/CSharpTypePrinter.cs
  14. 2
      src/Generator/Passes/CheckOperatorsOverloads.cs
  15. 2
      src/Generator/Passes/ObjectOverridesPass.cs
  16. 4
      src/Generator/Types/CppTypePrinter.cs
  17. 4
      src/Parser/Parser.cpp

2
src/AST/Enumeration.cs
Unescape View File

@ -47,7 +47,7 @@ namespace CppSharp.AST @@ -47,7 +47,7 @@ namespace CppSharp.AST
{
Items = new List<Item>();
ItemsByName = new Dictionary<string, Item>();
BuiltinType = new BuiltinType(PrimitiveType.Int32);
BuiltinType = new BuiltinType(PrimitiveType.Int);
}
public Enumeration AddItem(Item item)

6
src/AST/Type.cs
Unescape View File

@ -661,8 +661,8 @@ namespace CppSharp.AST @@ -661,8 +661,8 @@ namespace CppSharp.AST
UChar,
Short,
UShort,
Int32,
UInt32,
Int,
UInt,
Long,
ULong,
LongLong,
@ -697,7 +697,7 @@ namespace CppSharp.AST @@ -697,7 +697,7 @@ namespace CppSharp.AST
case PrimitiveType.Bool:
case PrimitiveType.UChar:
case PrimitiveType.UShort:
case PrimitiveType.UInt32:
case PrimitiveType.UInt:
case PrimitiveType.ULong:
case PrimitiveType.ULongLong:
return true;

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

@ -564,10 +564,10 @@ namespace CppSharp @@ -564,10 +564,10 @@ namespace CppSharp
return AST.PrimitiveType.Short;
case PrimitiveType.UShort:
return AST.PrimitiveType.UShort;
case PrimitiveType.Int32:
return AST.PrimitiveType.Int32;
case PrimitiveType.UInt32:
return AST.PrimitiveType.UInt32;
case PrimitiveType.Int:
return AST.PrimitiveType.Int;
case PrimitiveType.UInt:
return AST.PrimitiveType.UInt;
case PrimitiveType.Long:
return AST.PrimitiveType.Long;
case PrimitiveType.ULong:

4
src/CppParser/AST.h
Unescape View File

@ -238,8 +238,8 @@ enum struct PrimitiveType @@ -238,8 +238,8 @@ enum struct PrimitiveType
UChar,
Short,
UShort,
Int32,
UInt32,
Int,
UInt,
Long,
ULong,
LongLong,

4
src/CppParser/Parser.cpp
Unescape View File

@ -1332,8 +1332,8 @@ static PrimitiveType WalkBuiltinType(const clang::BuiltinType* Builtin) @@ -1332,8 +1332,8 @@ static PrimitiveType WalkBuiltinType(const clang::BuiltinType* Builtin)
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;
case clang::BuiltinType::Int: return PrimitiveType::Int;
case clang::BuiltinType::UInt: return PrimitiveType::UInt;
case clang::BuiltinType::Long: return PrimitiveType::Long;
case clang::BuiltinType::ULong: return PrimitiveType::ULong;

4
src/Generator.Tests/AST/TestAST.cs
Unescape View File

@ -45,7 +45,7 @@ namespace CppSharp.Generator.Tests.AST @@ -45,7 +45,7 @@ namespace CppSharp.Generator.Tests.AST
new PointerType()
{
Modifier = PointerType.TypeModifier.Pointer,
QualifiedPointee = new QualifiedType(new BuiltinType(PrimitiveType.Int32))
QualifiedPointee = new QualifiedType(new BuiltinType(PrimitiveType.Int))
})
};
for (int i = 0; i < func.Parameters.Count; i++)
@ -220,7 +220,7 @@ namespace CppSharp.Generator.Tests.AST @@ -220,7 +220,7 @@ namespace CppSharp.Generator.Tests.AST
var integerInst = typeDef.Type as TemplateSpecializationType;
Assert.AreEqual(1, integerInst.Arguments.Count);
var intArgument = integerInst.Arguments[0];
Assert.AreEqual(new BuiltinType(PrimitiveType.Int32), intArgument.Type.Type);
Assert.AreEqual(new BuiltinType(PrimitiveType.Int), intArgument.Type.Type);
Class classTemplate;
Assert.IsTrue(typeDef.Type.TryGetClass(out classTemplate));
Assert.AreEqual(classTemplate, template.TemplatedClass);

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

@ -785,7 +785,7 @@ namespace CppSharp.Generators.CLI @@ -785,7 +785,7 @@ namespace CppSharp.Generators.CLI
var typeName = TypePrinter.VisitPrimitiveType(@enum.BuiltinType.Type,
new TypeQualifiers());
if (@enum.BuiltinType.Type != PrimitiveType.Int32)
if (@enum.BuiltinType.Type != PrimitiveType.Int)
WriteLine(" : {0}", typeName);
else
NewLine();

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

@ -160,8 +160,8 @@ namespace CppSharp.Generators.CLI @@ -160,8 +160,8 @@ namespace CppSharp.Generators.CLI
case PrimitiveType.UChar:
case PrimitiveType.Short:
case PrimitiveType.UShort:
case PrimitiveType.Int32:
case PrimitiveType.UInt32:
case PrimitiveType.Int:
case PrimitiveType.UInt:
case PrimitiveType.Long:
case PrimitiveType.ULong:
case PrimitiveType.LongLong:
@ -501,8 +501,8 @@ namespace CppSharp.Generators.CLI @@ -501,8 +501,8 @@ namespace CppSharp.Generators.CLI
case PrimitiveType.UChar:
case PrimitiveType.Short:
case PrimitiveType.UShort:
case PrimitiveType.Int32:
case PrimitiveType.UInt32:
case PrimitiveType.Int:
case PrimitiveType.UInt:
case PrimitiveType.Long:
case PrimitiveType.ULong:
case PrimitiveType.LongLong:

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

@ -193,8 +193,8 @@ namespace CppSharp.Generators.CLI @@ -193,8 +193,8 @@ namespace CppSharp.Generators.CLI
case PrimitiveType.UChar: return "unsigned char";
case PrimitiveType.Short: return "short";
case PrimitiveType.UShort: return "unsigned short";
case PrimitiveType.Int32: return "int";
case PrimitiveType.UInt32: return "unsigned int";
case PrimitiveType.Int: return "int";
case PrimitiveType.UInt: return "unsigned int";
case PrimitiveType.Long: return "long";
case PrimitiveType.ULong: return "unsigned long";
case PrimitiveType.LongLong: return "long long";

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

@ -206,7 +206,7 @@ namespace CppSharp.Generators.CLI @@ -206,7 +206,7 @@ namespace CppSharp.Generators.CLI
return false;
var @base = "";
if(!@enum.Type.IsPrimitiveType(PrimitiveType.Int32))
if(!@enum.Type.IsPrimitiveType(PrimitiveType.Int))
@base = string.Format(" : {0}", @enum.Type);
var @ref = string.Format("enum struct {0}{1};", @enum.Name, @base);

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

@ -191,8 +191,8 @@ namespace CppSharp.Generators.CSharp @@ -191,8 +191,8 @@ namespace CppSharp.Generators.CSharp
case PrimitiveType.UChar:
case PrimitiveType.Short:
case PrimitiveType.UShort:
case PrimitiveType.Int32:
case PrimitiveType.UInt32:
case PrimitiveType.Int:
case PrimitiveType.UInt:
case PrimitiveType.Long:
case PrimitiveType.ULong:
case PrimitiveType.LongLong:
@ -513,8 +513,8 @@ namespace CppSharp.Generators.CSharp @@ -513,8 +513,8 @@ namespace CppSharp.Generators.CSharp
case PrimitiveType.UChar:
case PrimitiveType.Short:
case PrimitiveType.UShort:
case PrimitiveType.Int32:
case PrimitiveType.UInt32:
case PrimitiveType.Int:
case PrimitiveType.UInt:
case PrimitiveType.Long:
case PrimitiveType.ULong:
case PrimitiveType.LongLong:

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

@ -2579,7 +2579,7 @@ namespace CppSharp.Generators.CSharp @@ -2579,7 +2579,7 @@ namespace CppSharp.Generators.CSharp
var typeName = TypePrinter.VisitPrimitiveType(@enum.BuiltinType.Type,
new TypeQualifiers());
if (@enum.BuiltinType.Type != PrimitiveType.Int32)
if (@enum.BuiltinType.Type != PrimitiveType.Int)
Write(" : {0}", typeName);
NewLine();

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

@ -390,8 +390,8 @@ namespace CppSharp.Generators.CSharp @@ -390,8 +390,8 @@ namespace CppSharp.Generators.CSharp
case PrimitiveType.UChar: return "byte";
case PrimitiveType.Short: return "short";
case PrimitiveType.UShort: return "ushort";
case PrimitiveType.Int32: return "int";
case PrimitiveType.UInt32: return "uint";
case PrimitiveType.Int: return "int";
case PrimitiveType.UInt: return "uint";
case PrimitiveType.Long: return "int";
case PrimitiveType.ULong: return "uint";
case PrimitiveType.LongLong: return "long";

2
src/Generator/Passes/CheckOperatorsOverloads.cs
Unescape View File

@ -224,7 +224,7 @@ namespace CppSharp.Passes @@ -224,7 +224,7 @@ namespace CppSharp.Passes
case CXXOperatorKind.GreaterGreater:
PrimitiveType primitiveType;
return @operator.Parameters.Last().Type.IsPrimitiveType(out primitiveType) &&
primitiveType == PrimitiveType.Int32;
primitiveType == PrimitiveType.Int;
// No parameters means the dereference operator - cannot be overloaded
case CXXOperatorKind.Star:

2
src/Generator/Passes/ObjectOverridesPass.cs
Unescape View File

@ -154,7 +154,7 @@ namespace CppSharp @@ -154,7 +154,7 @@ namespace CppSharp
{
Name = "GetHashCode",
Namespace = @class,
ReturnType = new QualifiedType(new BuiltinType(PrimitiveType.Int32)),
ReturnType = new QualifiedType(new BuiltinType(PrimitiveType.Int)),
IsSynthetized = true,
IsOverride = true,
IsProxy = true

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

@ -108,8 +108,8 @@ namespace CppSharp.Types @@ -108,8 +108,8 @@ namespace CppSharp.Types
case PrimitiveType.UChar: return "unsigned char";
case PrimitiveType.Short: return "short";
case PrimitiveType.UShort: return "unsigned short";
case PrimitiveType.Int32: return "int";
case PrimitiveType.UInt32: return "unsigned int";
case PrimitiveType.Int: return "int";
case PrimitiveType.UInt: return "unsigned int";
case PrimitiveType.Long: return "long";
case PrimitiveType.ULong: return "unsigned long";
case PrimitiveType.LongLong: return "long long";

4
src/Parser/Parser.cpp
Unescape View File

@ -1338,8 +1338,8 @@ static CppSharp::AST::PrimitiveType WalkBuiltinType(const clang::BuiltinType* Bu @@ -1338,8 +1338,8 @@ static CppSharp::AST::PrimitiveType WalkBuiltinType(const clang::BuiltinType* Bu
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;
case clang::BuiltinType::Int: return PrimitiveType::Int;
case clang::BuiltinType::UInt: return PrimitiveType::UInt;
case clang::BuiltinType::Long: return PrimitiveType::Long;
case clang::BuiltinType::ULong: return PrimitiveType::ULong;

Write Preview
Loading…
Cancel
Save