Changed CSharpTypePrinter.IntPtrType to be a getter property.

Author: tritao

src/Generator/Generators/CSharp/CSharpMarshal.cs

@@ -98,7 +98,7 @@ public override bool VisitArrayType(ArrayType array, TypeQualifiers quals)
                             else
                                 supportBefore.WriteLineIndent(
                                     $@"{value}[i] = {finalArrayType}.{Helpers.CreateInstanceIdentifier}(({
-                                        CSharpTypePrinter.IntPtrType}) {Context.ReturnVarName}[i]);");
+                                        typePrinter.IntPtrType}) {Context.ReturnVarName}[i]);");
                         }
                         else
                         {
@@ -313,7 +313,7 @@ public override bool VisitTemplateParameterSubstitutionType(TemplateParameterSub
             if (finalType.IsDependent)
                 Context.Return.Write($"({param.ReplacedParameter.Parameter.Name}) (object) ");
             if (param.Replacement.Type.Desugar().IsPointerToPrimitiveType())
-                Context.Return.Write($"({CSharpTypePrinter.IntPtrType}) ");
+                Context.Return.Write($"({typePrinter.IntPtrType}) ");
             return base.VisitTemplateParameterSubstitutionType(param, quals);
         }
 
@@ -385,7 +385,7 @@ private void MarshalArray(ArrayType array)
                 Context.Before.WriteOpenBraceAndIndent();
                 string element = Generator.GeneratedIdentifier("element");
                 Context.Before.WriteLine($"var {element} = {Context.ReturnVarName}[i];");
-                var intPtrZero = $"{CSharpTypePrinter.IntPtrType}.Zero";
+                var intPtrZero = $"{typePrinter.IntPtrType}.Zero";
                 Context.Before.WriteLine($@"{intermediateArray}[i] = {element} == {
                     intPtrZero} ? null : {intermediateArrayType}.{
                     Helpers.CreateInstanceIdentifier}({element});");
@@ -626,7 +626,7 @@ public override bool VisitTemplateParameterSubstitutionType(TemplateParameterSub
             {
                 Context.Return.Write($"({replacement}) ");
                 if (replacement.IsPointerToPrimitiveType())
-                    Context.Return.Write($"({CSharpTypePrinter.IntPtrType}) ");
+                    Context.Return.Write($"({typePrinter.IntPtrType}) ");
                 Context.Return.Write("(object) ");
             }
             return base.VisitTemplateParameterSubstitutionType(param, quals);
@@ -822,7 +822,7 @@ private void MarshalArray(ArrayType arrayType)
             Context.Before.WriteLine($"var {element} = {Context.Parameter.Name}[i];");
             if (elementType.IsAddress())
             {
-                var intPtrZero = $"{CSharpTypePrinter.IntPtrType}.Zero";
+                var intPtrZero = $"{typePrinter.IntPtrType}.Zero";
                 Context.Before.WriteLine($@"{intermediateArray}[i] = ReferenceEquals({
                     element}, null) ? {intPtrZero} : {element}.{Helpers.InstanceIdentifier};");
             }

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -420,7 +420,7 @@ public override bool VisitClassDecl(Class @class)
                 else
                 {
                     WriteLine("public {0} {1} {{ get; protected set; }}",
-                        CSharpTypePrinter.IntPtrType, Helpers.InstanceIdentifier);
+                        TypePrinter.IntPtrType, Helpers.InstanceIdentifier);
 
                     PopBlock(NewLineKind.BeforeNextBlock);
 
@@ -942,7 +942,7 @@ private void GenerateFieldSetter(Field field, Class @class, QualifiedType fieldT
                     Type pointee = type.GetFinalPointee();
                     if (pointee.IsPrimitiveType())
                     {
-                        Write($"({CSharpTypePrinter.IntPtrType}) ");
+                        Write($"({TypePrinter.IntPtrType}) ");
                         var templateSubstitution = pointee.Desugar(false) as TemplateParameterSubstitutionType;
                         if (templateSubstitution != null)
                             Write("(object) ");
@@ -1137,7 +1137,7 @@ private void GenerateVariableGetter(Variable var)
             else
                 ctx.ReturnVarName = $@"{elementType}.{
                     Helpers.CreateInstanceIdentifier}(new {
-                        CSharpTypePrinter.IntPtrType}({ptr}))";
+                        TypePrinter.IntPtrType}({ptr}))";
 
             var marshal = new CSharpMarshalNativeToManagedPrinter(ctx);
             var.QualifiedType.Visit(marshal);
@@ -1202,7 +1202,7 @@ private void GenerateFieldGetter(Field field, Class @class, QualifiedType return
                 Class typeClass;
                 if (field.Type.TryGetClass(out typeClass) && !typeClass.IsValueType &&
                     !ASTUtils.IsMappedToPrimitive(Context.TypeMaps, field.Type))
-                    returnVar = $"new {CSharpTypePrinter.IntPtrType}(&{returnVar})";
+                    returnVar = $"new {TypePrinter.IntPtrType}(&{returnVar})";
             }
 
             var ctx = new CSharpMarshalContext(Context, CurrentIndentation)

src/Generator/Generators/CSharp/CSharpTypePrinter.cs

@@ -13,7 +13,7 @@ namespace CppSharp.Generators.CSharp
 {
     public class CSharpTypePrinter : TypePrinter
     {
-        public const string IntPtrType = "global::System.IntPtr";
+        public string IntPtrType => "global::System.IntPtr";
 
         public BindingContext Context { get; set; }
 

src/Generator/Types/Std/Stdlib.cs

@@ -149,12 +149,18 @@ public override Type CSharpSignatureType(TypePrinterContext ctx)
                 return new CILType(typeof(string));
 
             if (ctx.Parameter == null || ctx.Parameter.Name == Helpers.ReturnIdentifier)
-                return new CustomType(CSharpTypePrinter.IntPtrType);
+            {
+                var typePrinter = new CSharpTypePrinter(Context);
+                return new CustomType(typePrinter.IntPtrType);
+            }
+
             if (Context.Options.Encoding == Encoding.ASCII)
                 return new CustomType("[MarshalAs(UnmanagedType.LPStr)] string");
+
             if (Context.Options.Encoding == Encoding.Unicode ||
                 Context.Options.Encoding == Encoding.BigEndianUnicode)
                 return new CustomType("[MarshalAs(UnmanagedType.LPWStr)] string");
+
             throw new System.NotSupportedException(
                 $"{Context.Options.Encoding.EncodingName} is not supported yet.");
         }
@@ -287,7 +293,7 @@ public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
             {
                 ctx.Return.Write($@"{qualifiedBasicString}Extensions.{
                     Helpers.InternalStruct}.{assign.Name}(new {
-                    CSharpTypePrinter.IntPtrType}(&{
+                    typePrinter.IntPtrType}(&{
                     ctx.ReturnVarName}), {ctx.Parameter.Name})");
                 ctx.ReturnVarName = string.Empty;
             }