From 6d7c1de491f1001d2319b44aa8406b0b995cde60 Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Sun, 14 Dec 2014 17:22:47 +0200 Subject: [PATCH] Fixed a bug in the Equals generation for CLI and regenerated the bindings. Signed-off-by: Dimitar Dobrev --- src/CppParser/Bindings/CLI/AST.cpp | 5 + src/CppParser/Bindings/CLI/AST.h | 2 + .../CSharp/i686-apple-darwin12.4.0/AST.cs | 121 ++++++++++-------- .../i686-apple-darwin12.4.0/CppParser.cs | 14 +- .../Bindings/CSharp/i686-pc-win32-msvc/AST.cs | 121 ++++++++++-------- .../CSharp/i686-pc-win32-msvc/CppParser.cs | 14 +- .../Bindings/CSharp/x86_64-linux-gnu/AST.cs | 121 ++++++++++-------- .../CSharp/x86_64-linux-gnu/CppParser.cs | 14 +- .../Generators/CLI/CLISourcesTemplate.cs | 5 +- tests/Basic/Basic.Tests.cs | 3 + 10 files changed, 228 insertions(+), 192 deletions(-) diff --git a/src/CppParser/Bindings/CLI/AST.cpp b/src/CppParser/Bindings/CLI/AST.cpp index 3f863fc2..353a0af3 100644 --- a/src/CppParser/Bindings/CLI/AST.cpp +++ b/src/CppParser/Bindings/CLI/AST.cpp @@ -599,6 +599,11 @@ bool CppSharp::Parser::AST::TemplateParameter::operator==(CppSharp::Parser::AST: return __ret; } +bool CppSharp::Parser::AST::TemplateParameter::Equals(::System::Object^ obj) +{ + return this == safe_cast(obj); +} + System::IntPtr CppSharp::Parser::AST::TemplateParameter::__Instance::get() { return System::IntPtr(NativePtr); diff --git a/src/CppParser/Bindings/CLI/AST.h b/src/CppParser/Bindings/CLI/AST.h index b6e2b0be..befbe892 100644 --- a/src/CppParser/Bindings/CLI/AST.h +++ b/src/CppParser/Bindings/CLI/AST.h @@ -695,6 +695,8 @@ namespace CppSharp } static bool operator==(CppSharp::Parser::AST::TemplateParameter^ __op, CppSharp::Parser::AST::TemplateParameter^ param); + + virtual bool Equals(::System::Object^ obj) override; }; public ref class TemplateParameterType : CppSharp::Parser::AST::Type diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs index b4250459..89ae84c0 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/AST.cs @@ -538,7 +538,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -641,7 +641,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -887,7 +887,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.Parameter s) { - var arg0 = s == (CppSharp.Parser.AST.Parameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -1221,7 +1221,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.TypedefDecl) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1590,7 +1590,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -1719,7 +1719,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -1748,7 +1748,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Template = value == (CppSharp.Parser.AST.Template) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Template = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -1763,7 +1763,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Desugared = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Desugared = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1869,12 +1869,21 @@ namespace CppSharp public static bool operator ==(CppSharp.Parser.AST.TemplateParameter __op, CppSharp.Parser.AST.TemplateParameter param) { - var arg0 = __op == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : __op.__Instance; - var arg1 = param == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : param.__Instance; - var __ret = Internal.OperatorEqualEqual_0(__op.__Instance, arg1); + bool __opNull = ReferenceEquals(__op, null); + bool paramNull = ReferenceEquals(param, null); + if (__opNull || paramNull) + return __opNull && paramNull; + var arg0 = __op.__Instance; + var arg1 = param.__Instance; + var __ret = Internal.OperatorEqualEqual_0(arg0, arg1); return __ret; } + public override bool Equals(object obj) + { + return this == obj as TemplateParameter; + } + public string Name { get @@ -2229,7 +2238,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplateSpecialization = value == (CppSharp.Parser.AST.TemplateSpecializationType) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplateSpecialization = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -2244,7 +2253,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Class = value == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Class = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -2596,7 +2605,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -2705,7 +2714,7 @@ namespace CppSharp public void addComponents(CppSharp.Parser.AST.VTableComponent s) { - var arg0 = s == (CppSharp.Parser.AST.VTableComponent) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addComponents_0(__Instance, arg0); } @@ -2997,7 +3006,7 @@ namespace CppSharp public void addVFTables(CppSharp.Parser.AST.VFTableInfo s) { - var arg0 = s == (CppSharp.Parser.AST.VFTableInfo) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addVFTables_0(__Instance, arg0); } @@ -3276,7 +3285,7 @@ namespace CppSharp public void addPreprocessedEntities(CppSharp.Parser.AST.PreprocessedEntity s) { - var arg0 = s == (CppSharp.Parser.AST.PreprocessedEntity) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addPreprocessedEntities_0(__Instance, arg0); } @@ -3369,7 +3378,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->_Namespace = value == (CppSharp.Parser.AST.DeclarationContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->_Namespace = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3399,7 +3408,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Comment = value == (CppSharp.Parser.AST.RawComment) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3444,7 +3453,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->CompleteDeclaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->CompleteDeclaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3730,7 +3739,7 @@ namespace CppSharp public void addNamespaces(CppSharp.Parser.AST.Namespace s) { - var arg0 = s == (CppSharp.Parser.AST.Namespace) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addNamespaces_0(__Instance, arg0); } @@ -3748,7 +3757,7 @@ namespace CppSharp public void addEnums(CppSharp.Parser.AST.Enumeration s) { - var arg0 = s == (CppSharp.Parser.AST.Enumeration) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addEnums_0(__Instance, arg0); } @@ -3766,7 +3775,7 @@ namespace CppSharp public void addFunctions(CppSharp.Parser.AST.Function s) { - var arg0 = s == (CppSharp.Parser.AST.Function) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addFunctions_0(__Instance, arg0); } @@ -3784,7 +3793,7 @@ namespace CppSharp public void addClasses(CppSharp.Parser.AST.Class s) { - var arg0 = s == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addClasses_0(__Instance, arg0); } @@ -3802,7 +3811,7 @@ namespace CppSharp public void addTemplates(CppSharp.Parser.AST.Template s) { - var arg0 = s == (CppSharp.Parser.AST.Template) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTemplates_0(__Instance, arg0); } @@ -3820,7 +3829,7 @@ namespace CppSharp public void addTypedefs(CppSharp.Parser.AST.TypedefDecl s) { - var arg0 = s == (CppSharp.Parser.AST.TypedefDecl) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTypedefs_0(__Instance, arg0); } @@ -3838,7 +3847,7 @@ namespace CppSharp public void addVariables(CppSharp.Parser.AST.Variable s) { - var arg0 = s == (CppSharp.Parser.AST.Variable) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addVariables_0(__Instance, arg0); } @@ -4165,7 +4174,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Decl = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Decl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4245,7 +4254,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Subexpression = value == (CppSharp.Parser.AST.Expression) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Subexpression = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4434,7 +4443,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->DefaultArgument = value == (CppSharp.Parser.AST.Expression) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->DefaultArgument = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4616,7 +4625,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.Parameter s) { - var arg0 = s == (CppSharp.Parser.AST.Parameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -4814,7 +4823,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->SpecializationInfo = value == (CppSharp.Parser.AST.FunctionTemplateSpecialization) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->SpecializationInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4994,7 +5003,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->AccessDecl = value == (CppSharp.Parser.AST.AccessSpecifierDecl) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->AccessDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -5455,7 +5464,7 @@ namespace CppSharp public void addItems(CppSharp.Parser.AST.Enumeration.Item s) { - var arg0 = s == (CppSharp.Parser.AST.Enumeration.Item) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addItems_0(__Instance, arg0); } @@ -5499,7 +5508,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -5514,7 +5523,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->BuiltinType = value == (CppSharp.Parser.AST.BuiltinType) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->BuiltinType = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -5782,7 +5791,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -5935,7 +5944,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Class = value == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Class = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6259,7 +6268,7 @@ namespace CppSharp public void addBases(CppSharp.Parser.AST.BaseClassSpecifier s) { - var arg0 = s == (CppSharp.Parser.AST.BaseClassSpecifier) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addBases_0(__Instance, arg0); } @@ -6277,7 +6286,7 @@ namespace CppSharp public void addFields(CppSharp.Parser.AST.Field s) { - var arg0 = s == (CppSharp.Parser.AST.Field) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addFields_0(__Instance, arg0); } @@ -6295,7 +6304,7 @@ namespace CppSharp public void addMethods(CppSharp.Parser.AST.Method s) { - var arg0 = s == (CppSharp.Parser.AST.Method) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addMethods_0(__Instance, arg0); } @@ -6313,7 +6322,7 @@ namespace CppSharp public void addSpecifiers(CppSharp.Parser.AST.AccessSpecifierDecl s) { - var arg0 = s == (CppSharp.Parser.AST.AccessSpecifierDecl) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecifiers_0(__Instance, arg0); } @@ -6504,7 +6513,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Layout = value == (CppSharp.Parser.AST.ClassLayout) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Layout = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6653,7 +6662,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.TemplateParameter s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -6682,7 +6691,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplatedDecl = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplatedDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6817,7 +6826,7 @@ namespace CppSharp public void addSpecializations(CppSharp.Parser.AST.ClassTemplateSpecialization s) { - var arg0 = s == (CppSharp.Parser.AST.ClassTemplateSpecialization) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecializations_0(__Instance, arg0); } @@ -7002,7 +7011,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -7031,7 +7040,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplatedDecl = value == (CppSharp.Parser.AST.ClassTemplate) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplatedDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -7319,7 +7328,7 @@ namespace CppSharp public void addSpecializations(CppSharp.Parser.AST.FunctionTemplateSpecialization s) { - var arg0 = s == (CppSharp.Parser.AST.FunctionTemplateSpecialization) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecializations_0(__Instance, arg0); } @@ -7451,7 +7460,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -7480,7 +7489,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Template = value == (CppSharp.Parser.AST.FunctionTemplate) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Template = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -7495,7 +7504,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->SpecializedFunction = value == (CppSharp.Parser.AST.Function) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->SpecializedFunction = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -8023,7 +8032,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Definition = value == (CppSharp.Parser.AST.MacroDefinition) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Definition = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -8174,7 +8183,7 @@ namespace CppSharp public void addMacros(CppSharp.Parser.AST.MacroDefinition s) { - var arg0 = s == (CppSharp.Parser.AST.MacroDefinition) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addMacros_0(__Instance, arg0); } @@ -8546,7 +8555,7 @@ namespace CppSharp public void addTranslationUnits(CppSharp.Parser.AST.TranslationUnit s) { - var arg0 = s == (CppSharp.Parser.AST.TranslationUnit) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTranslationUnits_0(__Instance, arg0); } @@ -8882,7 +8891,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->FullCommentBlock = value == (CppSharp.Parser.AST.FullComment) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->FullCommentBlock = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs index 8aeea5e1..ff44501d 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppParser.cs @@ -497,7 +497,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->ASTContext = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -907,7 +907,7 @@ namespace CppSharp public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s) { - var arg0 = s == (CppSharp.Parser.ParserDiagnostic) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addDiagnostics_0(__Instance, arg0); } @@ -951,7 +951,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->ASTContext = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -966,7 +966,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Library = value == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Library = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1051,7 +1051,7 @@ namespace CppSharp public static CppSharp.Parser.ParserResult ParseHeader(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.ParseHeader_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserResult.__CreateInstance(__ret); @@ -1059,7 +1059,7 @@ namespace CppSharp public static CppSharp.Parser.ParserResult ParseLibrary(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.ParseLibrary_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserResult.__CreateInstance(__ret); @@ -1067,7 +1067,7 @@ namespace CppSharp public static CppSharp.Parser.ParserTargetInfo GetTargetInfo(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.GetTargetInfo_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserTargetInfo.__CreateInstance(__ret); diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs index 4e29cbaa..7f01d50a 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/AST.cs @@ -538,7 +538,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -641,7 +641,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -887,7 +887,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.Parameter s) { - var arg0 = s == (CppSharp.Parser.AST.Parameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -1221,7 +1221,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.TypedefDecl) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1590,7 +1590,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -1719,7 +1719,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -1748,7 +1748,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Template = value == (CppSharp.Parser.AST.Template) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Template = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -1763,7 +1763,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Desugared = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Desugared = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1869,12 +1869,21 @@ namespace CppSharp public static bool operator ==(CppSharp.Parser.AST.TemplateParameter __op, CppSharp.Parser.AST.TemplateParameter param) { - var arg0 = __op == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : __op.__Instance; - var arg1 = param == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : param.__Instance; - var __ret = Internal.OperatorEqualEqual_0(__op.__Instance, arg1); + bool __opNull = ReferenceEquals(__op, null); + bool paramNull = ReferenceEquals(param, null); + if (__opNull || paramNull) + return __opNull && paramNull; + var arg0 = __op.__Instance; + var arg1 = param.__Instance; + var __ret = Internal.OperatorEqualEqual_0(arg0, arg1); return __ret; } + public override bool Equals(object obj) + { + return this == obj as TemplateParameter; + } + public string Name { get @@ -2229,7 +2238,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplateSpecialization = value == (CppSharp.Parser.AST.TemplateSpecializationType) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplateSpecialization = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -2244,7 +2253,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Class = value == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Class = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -2596,7 +2605,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -2705,7 +2714,7 @@ namespace CppSharp public void addComponents(CppSharp.Parser.AST.VTableComponent s) { - var arg0 = s == (CppSharp.Parser.AST.VTableComponent) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addComponents_0(__Instance, arg0); } @@ -2997,7 +3006,7 @@ namespace CppSharp public void addVFTables(CppSharp.Parser.AST.VFTableInfo s) { - var arg0 = s == (CppSharp.Parser.AST.VFTableInfo) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addVFTables_0(__Instance, arg0); } @@ -3276,7 +3285,7 @@ namespace CppSharp public void addPreprocessedEntities(CppSharp.Parser.AST.PreprocessedEntity s) { - var arg0 = s == (CppSharp.Parser.AST.PreprocessedEntity) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addPreprocessedEntities_0(__Instance, arg0); } @@ -3369,7 +3378,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->_Namespace = value == (CppSharp.Parser.AST.DeclarationContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->_Namespace = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3399,7 +3408,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Comment = value == (CppSharp.Parser.AST.RawComment) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3444,7 +3453,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->CompleteDeclaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->CompleteDeclaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3730,7 +3739,7 @@ namespace CppSharp public void addNamespaces(CppSharp.Parser.AST.Namespace s) { - var arg0 = s == (CppSharp.Parser.AST.Namespace) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addNamespaces_0(__Instance, arg0); } @@ -3748,7 +3757,7 @@ namespace CppSharp public void addEnums(CppSharp.Parser.AST.Enumeration s) { - var arg0 = s == (CppSharp.Parser.AST.Enumeration) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addEnums_0(__Instance, arg0); } @@ -3766,7 +3775,7 @@ namespace CppSharp public void addFunctions(CppSharp.Parser.AST.Function s) { - var arg0 = s == (CppSharp.Parser.AST.Function) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addFunctions_0(__Instance, arg0); } @@ -3784,7 +3793,7 @@ namespace CppSharp public void addClasses(CppSharp.Parser.AST.Class s) { - var arg0 = s == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addClasses_0(__Instance, arg0); } @@ -3802,7 +3811,7 @@ namespace CppSharp public void addTemplates(CppSharp.Parser.AST.Template s) { - var arg0 = s == (CppSharp.Parser.AST.Template) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTemplates_0(__Instance, arg0); } @@ -3820,7 +3829,7 @@ namespace CppSharp public void addTypedefs(CppSharp.Parser.AST.TypedefDecl s) { - var arg0 = s == (CppSharp.Parser.AST.TypedefDecl) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTypedefs_0(__Instance, arg0); } @@ -3838,7 +3847,7 @@ namespace CppSharp public void addVariables(CppSharp.Parser.AST.Variable s) { - var arg0 = s == (CppSharp.Parser.AST.Variable) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addVariables_0(__Instance, arg0); } @@ -4165,7 +4174,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Decl = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Decl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4245,7 +4254,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Subexpression = value == (CppSharp.Parser.AST.Expression) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Subexpression = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4434,7 +4443,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->DefaultArgument = value == (CppSharp.Parser.AST.Expression) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->DefaultArgument = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4616,7 +4625,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.Parameter s) { - var arg0 = s == (CppSharp.Parser.AST.Parameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -4814,7 +4823,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->SpecializationInfo = value == (CppSharp.Parser.AST.FunctionTemplateSpecialization) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->SpecializationInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4994,7 +5003,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->AccessDecl = value == (CppSharp.Parser.AST.AccessSpecifierDecl) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->AccessDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -5455,7 +5464,7 @@ namespace CppSharp public void addItems(CppSharp.Parser.AST.Enumeration.Item s) { - var arg0 = s == (CppSharp.Parser.AST.Enumeration.Item) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addItems_0(__Instance, arg0); } @@ -5499,7 +5508,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -5514,7 +5523,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->BuiltinType = value == (CppSharp.Parser.AST.BuiltinType) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->BuiltinType = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -5782,7 +5791,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -5935,7 +5944,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Class = value == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Class = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6259,7 +6268,7 @@ namespace CppSharp public void addBases(CppSharp.Parser.AST.BaseClassSpecifier s) { - var arg0 = s == (CppSharp.Parser.AST.BaseClassSpecifier) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addBases_0(__Instance, arg0); } @@ -6277,7 +6286,7 @@ namespace CppSharp public void addFields(CppSharp.Parser.AST.Field s) { - var arg0 = s == (CppSharp.Parser.AST.Field) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addFields_0(__Instance, arg0); } @@ -6295,7 +6304,7 @@ namespace CppSharp public void addMethods(CppSharp.Parser.AST.Method s) { - var arg0 = s == (CppSharp.Parser.AST.Method) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addMethods_0(__Instance, arg0); } @@ -6313,7 +6322,7 @@ namespace CppSharp public void addSpecifiers(CppSharp.Parser.AST.AccessSpecifierDecl s) { - var arg0 = s == (CppSharp.Parser.AST.AccessSpecifierDecl) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecifiers_0(__Instance, arg0); } @@ -6504,7 +6513,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Layout = value == (CppSharp.Parser.AST.ClassLayout) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Layout = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6653,7 +6662,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.TemplateParameter s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -6682,7 +6691,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplatedDecl = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplatedDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6817,7 +6826,7 @@ namespace CppSharp public void addSpecializations(CppSharp.Parser.AST.ClassTemplateSpecialization s) { - var arg0 = s == (CppSharp.Parser.AST.ClassTemplateSpecialization) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecializations_0(__Instance, arg0); } @@ -7002,7 +7011,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -7031,7 +7040,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplatedDecl = value == (CppSharp.Parser.AST.ClassTemplate) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplatedDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -7319,7 +7328,7 @@ namespace CppSharp public void addSpecializations(CppSharp.Parser.AST.FunctionTemplateSpecialization s) { - var arg0 = s == (CppSharp.Parser.AST.FunctionTemplateSpecialization) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecializations_0(__Instance, arg0); } @@ -7451,7 +7460,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -7480,7 +7489,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Template = value == (CppSharp.Parser.AST.FunctionTemplate) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Template = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -7495,7 +7504,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->SpecializedFunction = value == (CppSharp.Parser.AST.Function) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->SpecializedFunction = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -8023,7 +8032,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Definition = value == (CppSharp.Parser.AST.MacroDefinition) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Definition = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -8174,7 +8183,7 @@ namespace CppSharp public void addMacros(CppSharp.Parser.AST.MacroDefinition s) { - var arg0 = s == (CppSharp.Parser.AST.MacroDefinition) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addMacros_0(__Instance, arg0); } @@ -8546,7 +8555,7 @@ namespace CppSharp public void addTranslationUnits(CppSharp.Parser.AST.TranslationUnit s) { - var arg0 = s == (CppSharp.Parser.AST.TranslationUnit) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTranslationUnits_0(__Instance, arg0); } @@ -8882,7 +8891,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->FullCommentBlock = value == (CppSharp.Parser.AST.FullComment) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->FullCommentBlock = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs index a1e5fb8a..eb1814ff 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppParser.cs @@ -497,7 +497,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->ASTContext = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -907,7 +907,7 @@ namespace CppSharp public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s) { - var arg0 = s == (CppSharp.Parser.ParserDiagnostic) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addDiagnostics_0(__Instance, arg0); } @@ -951,7 +951,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->ASTContext = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -966,7 +966,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Library = value == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Library = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1051,7 +1051,7 @@ namespace CppSharp public static CppSharp.Parser.ParserResult ParseHeader(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.ParseHeader_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserResult.__CreateInstance(__ret); @@ -1059,7 +1059,7 @@ namespace CppSharp public static CppSharp.Parser.ParserResult ParseLibrary(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.ParseLibrary_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserResult.__CreateInstance(__ret); @@ -1067,7 +1067,7 @@ namespace CppSharp public static CppSharp.Parser.ParserTargetInfo GetTargetInfo(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.GetTargetInfo_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserTargetInfo.__CreateInstance(__ret); diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs index e6cb7e3d..957a63fa 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/AST.cs @@ -538,7 +538,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -641,7 +641,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -887,7 +887,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.Parameter s) { - var arg0 = s == (CppSharp.Parser.AST.Parameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -1221,7 +1221,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.TypedefDecl) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1590,7 +1590,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -1719,7 +1719,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -1748,7 +1748,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Template = value == (CppSharp.Parser.AST.Template) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Template = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -1763,7 +1763,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Desugared = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Desugared = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1869,12 +1869,21 @@ namespace CppSharp public static bool operator ==(CppSharp.Parser.AST.TemplateParameter __op, CppSharp.Parser.AST.TemplateParameter param) { - var arg0 = __op == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : __op.__Instance; - var arg1 = param == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : param.__Instance; - var __ret = Internal.OperatorEqualEqual_0(__op.__Instance, arg1); + bool __opNull = ReferenceEquals(__op, null); + bool paramNull = ReferenceEquals(param, null); + if (__opNull || paramNull) + return __opNull && paramNull; + var arg0 = __op.__Instance; + var arg1 = param.__Instance; + var __ret = Internal.OperatorEqualEqual_0(arg0, arg1); return __ret; } + public override bool Equals(object obj) + { + return this == obj as TemplateParameter; + } + public string Name { get @@ -2229,7 +2238,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplateSpecialization = value == (CppSharp.Parser.AST.TemplateSpecializationType) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplateSpecialization = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -2244,7 +2253,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Class = value == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Class = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -2596,7 +2605,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Declaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Declaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -2704,7 +2713,7 @@ namespace CppSharp public void addComponents(CppSharp.Parser.AST.VTableComponent s) { - var arg0 = s == (CppSharp.Parser.AST.VTableComponent) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addComponents_0(__Instance, arg0); } @@ -2996,7 +3005,7 @@ namespace CppSharp public void addVFTables(CppSharp.Parser.AST.VFTableInfo s) { - var arg0 = s == (CppSharp.Parser.AST.VFTableInfo) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addVFTables_0(__Instance, arg0); } @@ -3275,7 +3284,7 @@ namespace CppSharp public void addPreprocessedEntities(CppSharp.Parser.AST.PreprocessedEntity s) { - var arg0 = s == (CppSharp.Parser.AST.PreprocessedEntity) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addPreprocessedEntities_0(__Instance, arg0); } @@ -3368,7 +3377,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->_Namespace = value == (CppSharp.Parser.AST.DeclarationContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->_Namespace = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3398,7 +3407,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Comment = value == (CppSharp.Parser.AST.RawComment) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Comment = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3443,7 +3452,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->CompleteDeclaration = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->CompleteDeclaration = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -3729,7 +3738,7 @@ namespace CppSharp public void addNamespaces(CppSharp.Parser.AST.Namespace s) { - var arg0 = s == (CppSharp.Parser.AST.Namespace) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addNamespaces_0(__Instance, arg0); } @@ -3747,7 +3756,7 @@ namespace CppSharp public void addEnums(CppSharp.Parser.AST.Enumeration s) { - var arg0 = s == (CppSharp.Parser.AST.Enumeration) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addEnums_0(__Instance, arg0); } @@ -3765,7 +3774,7 @@ namespace CppSharp public void addFunctions(CppSharp.Parser.AST.Function s) { - var arg0 = s == (CppSharp.Parser.AST.Function) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addFunctions_0(__Instance, arg0); } @@ -3783,7 +3792,7 @@ namespace CppSharp public void addClasses(CppSharp.Parser.AST.Class s) { - var arg0 = s == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addClasses_0(__Instance, arg0); } @@ -3801,7 +3810,7 @@ namespace CppSharp public void addTemplates(CppSharp.Parser.AST.Template s) { - var arg0 = s == (CppSharp.Parser.AST.Template) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTemplates_0(__Instance, arg0); } @@ -3819,7 +3828,7 @@ namespace CppSharp public void addTypedefs(CppSharp.Parser.AST.TypedefDecl s) { - var arg0 = s == (CppSharp.Parser.AST.TypedefDecl) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTypedefs_0(__Instance, arg0); } @@ -3837,7 +3846,7 @@ namespace CppSharp public void addVariables(CppSharp.Parser.AST.Variable s) { - var arg0 = s == (CppSharp.Parser.AST.Variable) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addVariables_0(__Instance, arg0); } @@ -4164,7 +4173,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Decl = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Decl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4244,7 +4253,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Subexpression = value == (CppSharp.Parser.AST.Expression) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Subexpression = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4433,7 +4442,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->DefaultArgument = value == (CppSharp.Parser.AST.Expression) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->DefaultArgument = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4615,7 +4624,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.Parameter s) { - var arg0 = s == (CppSharp.Parser.AST.Parameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -4813,7 +4822,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->SpecializationInfo = value == (CppSharp.Parser.AST.FunctionTemplateSpecialization) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->SpecializationInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -4993,7 +5002,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->AccessDecl = value == (CppSharp.Parser.AST.AccessSpecifierDecl) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->AccessDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -5454,7 +5463,7 @@ namespace CppSharp public void addItems(CppSharp.Parser.AST.Enumeration.Item s) { - var arg0 = s == (CppSharp.Parser.AST.Enumeration.Item) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addItems_0(__Instance, arg0); } @@ -5498,7 +5507,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -5513,7 +5522,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->BuiltinType = value == (CppSharp.Parser.AST.BuiltinType) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->BuiltinType = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -5781,7 +5790,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Type = value == (CppSharp.Parser.AST.Type) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Type = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -5934,7 +5943,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Class = value == (CppSharp.Parser.AST.Class) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Class = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6258,7 +6267,7 @@ namespace CppSharp public void addBases(CppSharp.Parser.AST.BaseClassSpecifier s) { - var arg0 = s == (CppSharp.Parser.AST.BaseClassSpecifier) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addBases_0(__Instance, arg0); } @@ -6276,7 +6285,7 @@ namespace CppSharp public void addFields(CppSharp.Parser.AST.Field s) { - var arg0 = s == (CppSharp.Parser.AST.Field) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addFields_0(__Instance, arg0); } @@ -6294,7 +6303,7 @@ namespace CppSharp public void addMethods(CppSharp.Parser.AST.Method s) { - var arg0 = s == (CppSharp.Parser.AST.Method) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addMethods_0(__Instance, arg0); } @@ -6312,7 +6321,7 @@ namespace CppSharp public void addSpecifiers(CppSharp.Parser.AST.AccessSpecifierDecl s) { - var arg0 = s == (CppSharp.Parser.AST.AccessSpecifierDecl) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecifiers_0(__Instance, arg0); } @@ -6503,7 +6512,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Layout = value == (CppSharp.Parser.AST.ClassLayout) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Layout = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6652,7 +6661,7 @@ namespace CppSharp public void addParameters(CppSharp.Parser.AST.TemplateParameter s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateParameter) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addParameters_0(__Instance, arg0); } @@ -6681,7 +6690,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplatedDecl = value == (CppSharp.Parser.AST.Declaration) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplatedDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -6816,7 +6825,7 @@ namespace CppSharp public void addSpecializations(CppSharp.Parser.AST.ClassTemplateSpecialization s) { - var arg0 = s == (CppSharp.Parser.AST.ClassTemplateSpecialization) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecializations_0(__Instance, arg0); } @@ -7001,7 +7010,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -7030,7 +7039,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->TemplatedDecl = value == (CppSharp.Parser.AST.ClassTemplate) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->TemplatedDecl = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -7318,7 +7327,7 @@ namespace CppSharp public void addSpecializations(CppSharp.Parser.AST.FunctionTemplateSpecialization s) { - var arg0 = s == (CppSharp.Parser.AST.FunctionTemplateSpecialization) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addSpecializations_0(__Instance, arg0); } @@ -7450,7 +7459,7 @@ namespace CppSharp public void addArguments(CppSharp.Parser.AST.TemplateArgument s) { - var arg0 = s == (CppSharp.Parser.AST.TemplateArgument) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addArguments_0(__Instance, arg0); } @@ -7479,7 +7488,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Template = value == (CppSharp.Parser.AST.FunctionTemplate) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Template = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -7494,7 +7503,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->SpecializedFunction = value == (CppSharp.Parser.AST.Function) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->SpecializedFunction = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -8022,7 +8031,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Definition = value == (CppSharp.Parser.AST.MacroDefinition) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Definition = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -8173,7 +8182,7 @@ namespace CppSharp public void addMacros(CppSharp.Parser.AST.MacroDefinition s) { - var arg0 = s == (CppSharp.Parser.AST.MacroDefinition) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addMacros_0(__Instance, arg0); } @@ -8545,7 +8554,7 @@ namespace CppSharp public void addTranslationUnits(CppSharp.Parser.AST.TranslationUnit s) { - var arg0 = s == (CppSharp.Parser.AST.TranslationUnit) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addTranslationUnits_0(__Instance, arg0); } @@ -8881,7 +8890,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->FullCommentBlock = value == (CppSharp.Parser.AST.FullComment) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->FullCommentBlock = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs index 7b3b0047..bb9801da 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppParser.cs @@ -497,7 +497,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->ASTContext = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -907,7 +907,7 @@ namespace CppSharp public void addDiagnostics(CppSharp.Parser.ParserDiagnostic s) { - var arg0 = s == (CppSharp.Parser.ParserDiagnostic) null ? global::System.IntPtr.Zero : s.__Instance; + var arg0 = ReferenceEquals(s, null) ? global::System.IntPtr.Zero : s.__Instance; Internal.addDiagnostics_0(__Instance, arg0); } @@ -951,7 +951,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->ASTContext = value == (CppSharp.Parser.AST.ASTContext) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->ASTContext = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } @@ -966,7 +966,7 @@ namespace CppSharp set { var __ptr = (Internal*)__Instance.ToPointer(); - __ptr->Library = value == (CppSharp.Parser.AST.NativeLibrary) null ? global::System.IntPtr.Zero : value.__Instance; + __ptr->Library = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance; } } } @@ -1051,7 +1051,7 @@ namespace CppSharp public static CppSharp.Parser.ParserResult ParseHeader(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.ParseHeader_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserResult.__CreateInstance(__ret); @@ -1059,7 +1059,7 @@ namespace CppSharp public static CppSharp.Parser.ParserResult ParseLibrary(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.ParseLibrary_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserResult.__CreateInstance(__ret); @@ -1067,7 +1067,7 @@ namespace CppSharp public static CppSharp.Parser.ParserTargetInfo GetTargetInfo(CppSharp.Parser.ParserOptions Opts) { - var arg0 = Opts == (CppSharp.Parser.ParserOptions) null ? global::System.IntPtr.Zero : Opts.__Instance; + var arg0 = ReferenceEquals(Opts, null) ? global::System.IntPtr.Zero : Opts.__Instance; var __ret = Internal.GetTargetInfo_0(arg0); if (__ret == global::System.IntPtr.Zero) return null; return (__ret == IntPtr.Zero) ? null : CppSharp.Parser.ParserTargetInfo.__CreateInstance(__ret); diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs index 211e88e0..d4b00869 100644 --- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs +++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs @@ -799,12 +799,11 @@ namespace CppSharp.Generators.CLI WriteStartBraceIndent(); if (@class.IsRefType) { - WriteLine("return this == dynamic_cast<{0}^>(obj);", qualifiedIdentifier); + WriteLine("return this == safe_cast<{0}^>(obj);", qualifiedIdentifier); } else { - WriteLine("if (!(obj is {0})) return false;", @class.Name); - WriteLine("return this == ({0}) obj;", @class.Name); + WriteLine("return *this == safe_cast<{0}>(obj);", qualifiedIdentifier); } WriteCloseBraceIndent(); } diff --git a/tests/Basic/Basic.Tests.cs b/tests/Basic/Basic.Tests.cs index a54904a2..9ee4cbd2 100644 --- a/tests/Basic/Basic.Tests.cs +++ b/tests/Basic/Basic.Tests.cs @@ -463,6 +463,9 @@ public class BasicTests : GeneratorTestFixture public void TestEqualityOperator() { Assert.AreEqual(new Foo { A = 5, B = 5.5f }, new Foo { A = 5, B = 5.5f }); + Assert.AreNotEqual(new Foo { A = 5, B = 5.6f }, new Foo { A = 5, B = 5.5f }); + Assert.AreEqual(new Bar { A = 5, B = 5.5f }, new Bar { A = 5, B = 5.5f }); + Assert.AreNotEqual(new Bar { A = 5, B = 5.6f }, new Bar { A = 5, B = 5.5f }); } } \ No newline at end of file