From 7289a06b9ecc698db5241e177fda946097da2636 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Sat, 17 May 2014 14:42:53 +0300 Subject: [PATCH] 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. --- src/AST/Enumeration.cs | 2 +- src/AST/Type.cs | 6 +++--- src/Core/Parser/ASTConverter.cs | 8 ++++---- src/CppParser/AST.h | 4 ++-- src/CppParser/Parser.cpp | 4 ++-- src/Generator.Tests/AST/TestAST.cs | 4 ++-- src/Generator/Generators/CLI/CLIHeadersTemplate.cs | 2 +- src/Generator/Generators/CLI/CLIMarshal.cs | 8 ++++---- src/Generator/Generators/CLI/CLITypePrinter.cs | 4 ++-- src/Generator/Generators/CLI/CLITypeReferences.cs | 2 +- src/Generator/Generators/CSharp/CSharpMarshal.cs | 8 ++++---- src/Generator/Generators/CSharp/CSharpTextTemplate.cs | 2 +- src/Generator/Generators/CSharp/CSharpTypePrinter.cs | 4 ++-- src/Generator/Passes/CheckOperatorsOverloads.cs | 2 +- src/Generator/Passes/ObjectOverridesPass.cs | 2 +- src/Generator/Types/CppTypePrinter.cs | 4 ++-- src/Parser/Parser.cpp | 4 ++-- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/AST/Enumeration.cs b/src/AST/Enumeration.cs index 60bf75ba..d5aa9df4 100644 --- a/src/AST/Enumeration.cs +++ b/src/AST/Enumeration.cs @@ -47,7 +47,7 @@ namespace CppSharp.AST { Items = new List(); ItemsByName = new Dictionary(); - BuiltinType = new BuiltinType(PrimitiveType.Int32); + BuiltinType = new BuiltinType(PrimitiveType.Int); } public Enumeration AddItem(Item item) diff --git a/src/AST/Type.cs b/src/AST/Type.cs index f196a8ba..60caf94e 100644 --- a/src/AST/Type.cs +++ b/src/AST/Type.cs @@ -661,8 +661,8 @@ namespace CppSharp.AST UChar, Short, UShort, - Int32, - UInt32, + Int, + UInt, Long, ULong, LongLong, @@ -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; diff --git a/src/Core/Parser/ASTConverter.cs b/src/Core/Parser/ASTConverter.cs index 36328af7..e1a5deab 100644 --- a/src/Core/Parser/ASTConverter.cs +++ b/src/Core/Parser/ASTConverter.cs @@ -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: diff --git a/src/CppParser/AST.h b/src/CppParser/AST.h index a4f54dc7..49fa463f 100644 --- a/src/CppParser/AST.h +++ b/src/CppParser/AST.h @@ -238,8 +238,8 @@ enum struct PrimitiveType UChar, Short, UShort, - Int32, - UInt32, + Int, + UInt, Long, ULong, LongLong, diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp index d8cfec54..b85a430c 100644 --- a/src/CppParser/Parser.cpp +++ b/src/CppParser/Parser.cpp @@ -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; diff --git a/src/Generator.Tests/AST/TestAST.cs b/src/Generator.Tests/AST/TestAST.cs index 76ce6dd9..9e2f3199 100644 --- a/src/Generator.Tests/AST/TestAST.cs +++ b/src/Generator.Tests/AST/TestAST.cs @@ -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 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); diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs index ec6395a7..8df9cbde 100644 --- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs +++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs @@ -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(); diff --git a/src/Generator/Generators/CLI/CLIMarshal.cs b/src/Generator/Generators/CLI/CLIMarshal.cs index 90d186b4..45799bac 100644 --- a/src/Generator/Generators/CLI/CLIMarshal.cs +++ b/src/Generator/Generators/CLI/CLIMarshal.cs @@ -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 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: diff --git a/src/Generator/Generators/CLI/CLITypePrinter.cs b/src/Generator/Generators/CLI/CLITypePrinter.cs index 4ff79a8f..efb7bee9 100644 --- a/src/Generator/Generators/CLI/CLITypePrinter.cs +++ b/src/Generator/Generators/CLI/CLITypePrinter.cs @@ -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"; diff --git a/src/Generator/Generators/CLI/CLITypeReferences.cs b/src/Generator/Generators/CLI/CLITypeReferences.cs index 31601e6b..7b73d51d 100644 --- a/src/Generator/Generators/CLI/CLITypeReferences.cs +++ b/src/Generator/Generators/CLI/CLITypeReferences.cs @@ -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); diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs index 35eab5d2..da536cd2 100644 --- a/src/Generator/Generators/CSharp/CSharpMarshal.cs +++ b/src/Generator/Generators/CSharp/CSharpMarshal.cs @@ -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 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: diff --git a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs index 1c47fb44..3d003ecb 100644 --- a/src/Generator/Generators/CSharp/CSharpTextTemplate.cs +++ b/src/Generator/Generators/CSharp/CSharpTextTemplate.cs @@ -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(); diff --git a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs index fb1d819c..10f4d7ad 100644 --- a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs +++ b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs @@ -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"; diff --git a/src/Generator/Passes/CheckOperatorsOverloads.cs b/src/Generator/Passes/CheckOperatorsOverloads.cs index 82f364c0..d5bfbf23 100644 --- a/src/Generator/Passes/CheckOperatorsOverloads.cs +++ b/src/Generator/Passes/CheckOperatorsOverloads.cs @@ -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: diff --git a/src/Generator/Passes/ObjectOverridesPass.cs b/src/Generator/Passes/ObjectOverridesPass.cs index c734b53b..d43ae74c 100644 --- a/src/Generator/Passes/ObjectOverridesPass.cs +++ b/src/Generator/Passes/ObjectOverridesPass.cs @@ -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 diff --git a/src/Generator/Types/CppTypePrinter.cs b/src/Generator/Types/CppTypePrinter.cs index ee04e1b3..4fd976ee 100644 --- a/src/Generator/Types/CppTypePrinter.cs +++ b/src/Generator/Types/CppTypePrinter.cs @@ -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"; diff --git a/src/Parser/Parser.cpp b/src/Parser/Parser.cpp index d4fa163a..1f795e89 100644 --- a/src/Parser/Parser.cpp +++ b/src/Parser/Parser.cpp @@ -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;