Generating compiling code for .NET Framework 4.x

src/cs/examples/helloworld/helloworld-app/Generated/AssemblyAttributes.gen.cs → src/cs/examples/helloworld/helloworld-app/Generated/AssemblyAttributes.g.cs

@@ -1,6 +1,6 @@
 
 // <auto-generated>
-//  This code was generated by the following tool on 2024-05-07 16:36:40 GMT-04:00:
+//  This code was generated by the following tool on 2024-05-07 22:28:44 GMT-04:00:
 //      https://github.com/bottlenoselabs/c2cs (v0.0.0.0)
 //
 //  Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.

src/cs/examples/helloworld/helloworld-app/Generated/Bindgen.Runtime.gen.cs → src/cs/examples/helloworld/helloworld-app/Generated/Bindgen.Runtime.g.cs

@@ -2,15 +2,14 @@
 // To disable generating this file set `isEnabledGeneratingRuntimeCode` to `false` in the config file for generating C# code.
 
 // <auto-generated>
-//  This code was generated by the following tool on 2024-05-07 16:36:40 GMT-04:00:
+//  This code was generated by the following tool on 2024-05-07 22:28:44 GMT-04:00:
 //      https://github.com/bottlenoselabs/c2cs (v0.0.0.0)
 //
 //  Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
 // </auto-generated>
 // ReSharper disable All
 
 #region Template
-#nullable enable
 #pragma warning disable CS1591
 #pragma warning disable CS8981
 using Bindgen.Runtime;
@@ -85,7 +84,7 @@ public override string ToString()
     }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj)
+    public override bool Equals(object obj)
     {
         return obj is CBool b && Equals(b);
     }
@@ -197,7 +196,7 @@ public override string ToString()
     }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj)
+    public override bool Equals(object obj)
     {
         return obj is CChar value && Equals(value);
     }
@@ -260,27 +259,27 @@ public static bool Equals(CChar left, CChar right)
 [StructLayout(LayoutKind.Sequential)]
 public readonly unsafe struct CString : IEquatable<CString>, IDisposable
 {
-    public readonly nint Pointer;
+    public readonly IntPtr Pointer;
 
     /// <summary>
     ///     Gets a value indicating whether this <see cref="CString" /> is a null pointer.
     /// </summary>
-    public bool IsNull => Pointer == 0;
+    public bool IsNull => Pointer == IntPtr.Zero;
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="CString" /> struct.
     /// </summary>
     /// <param name="value">The pointer value.</param>
     public CString(byte* value)
     {
-        Pointer = (nint)value;
+        Pointer = (IntPtr)value;
     }
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="CString" /> struct.
     /// </summary>
     /// <param name="value">The pointer value.</param>
-    public CString(nint value)
+    public CString(IntPtr value)
     {
         Pointer = value;
     }
@@ -309,7 +308,7 @@ public void Dispose()
     /// <returns>
     ///     The resulting <see cref="CString" />.
     /// </returns>
-    public static explicit operator CString(nint value)
+    public static explicit operator CString(IntPtr value)
     {
         return FromIntPtr(value);
     }
@@ -321,7 +320,7 @@ public static explicit operator CString(nint value)
     /// <returns>
     ///     The resulting <see cref="CString" />.
     /// </returns>
-    public static CString FromIntPtr(nint value)
+    public static CString FromIntPtr(IntPtr value)
     {
         return new CString(value);
     }
@@ -347,7 +346,7 @@ public static implicit operator CString(byte* value)
     /// </returns>
     public static CString From(byte* value)
     {
-        return new CString((nint)value);
+        return new CString((IntPtr)value);
     }
 
     /// <summary>
@@ -357,7 +356,7 @@ public static CString From(byte* value)
     /// <returns>
     ///     The resulting <see cref="IntPtr" />.
     /// </returns>
-    public static implicit operator nint(CString value)
+    public static implicit operator IntPtr(CString value)
     {
         return value.Pointer;
     }
@@ -369,7 +368,7 @@ public static implicit operator nint(CString value)
     /// <returns>
     ///     The resulting <see cref="IntPtr" />.
     /// </returns>
-    public static nint ToIntPtr(CString value)
+    public static IntPtr ToIntPtr(CString value)
     {
         return value.Pointer;
     }
@@ -442,7 +441,7 @@ public override string ToString()
     }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj)
+    public override bool Equals(object obj)
     {
         return obj is CString value && Equals(value);
     }
@@ -496,7 +495,7 @@ public static unsafe class CStrings
     /// </remarks>
     /// <param name="values">The strings.</param>
     /// <returns>An array pointer of C string pointers. You are responsible for freeing the returned pointer.</returns>
-    public static CString* CStringArray(ReadOnlySpan<string> values)
+    public static CString* CStringArray(string[] values)
     {
         var pointerSize = IntPtr.Size;
         var result = (CString*)Marshal.AllocHGlobal(pointerSize * values.Length);
@@ -519,7 +518,7 @@ public static unsafe class CStrings
     /// </remarks>
     /// <param name="values">The strings.</param>
     /// <returns>An array pointer of C string pointers. You are responsible for freeing the returned pointer.</returns>
-    public static CStringWide* CStringWideArray(ReadOnlySpan<string> values)
+    public static CStringWide* CStringWideArray(string[] values)
     {
         var pointerSize = IntPtr.Size;
         var result = (CStringWide*)Marshal.AllocHGlobal(pointerSize * values.Length);
@@ -540,27 +539,27 @@ public static unsafe class CStrings
 [StructLayout(LayoutKind.Sequential)]
 public readonly unsafe struct CStringWide : IEquatable<CStringWide>
 {
-    public readonly nint Pointer;
+    public readonly IntPtr Pointer;
 
     /// <summary>
     ///     Gets a value indicating whether this <see cref="CStringWide" /> is a null pointer.
     /// </summary>
-    public bool IsNull => Pointer == 0;
+    public bool IsNull => Pointer == IntPtr.Zero;
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="CStringWide" /> struct.
     /// </summary>
     /// <param name="value">The pointer value.</param>
     public CStringWide(byte* value)
     {
-        Pointer = (nint)value;
+        Pointer = (IntPtr)value;
     }
 
     /// <summary>
     ///     Initializes a new instance of the <see cref="CStringWide" /> struct.
     /// </summary>
     /// <param name="value">The pointer value.</param>
-    public CStringWide(nint value)
+    public CStringWide(IntPtr value)
     {
         Pointer = value;
     }
@@ -581,7 +580,7 @@ public CStringWide(string s)
     /// <returns>
     ///     The resulting <see cref="CStringWide" />.
     /// </returns>
-    public static explicit operator CStringWide(nint value)
+    public static explicit operator CStringWide(IntPtr value)
     {
         return FromIntPtr(value);
     }
@@ -593,7 +592,7 @@ public static explicit operator CStringWide(nint value)
     /// <returns>
     ///     The resulting <see cref="CStringWide" />.
     /// </returns>
-    public static CStringWide FromIntPtr(nint value)
+    public static CStringWide FromIntPtr(IntPtr value)
     {
         return new CStringWide(value);
     }
@@ -619,7 +618,7 @@ public static implicit operator CStringWide(byte* value)
     /// </returns>
     public static CStringWide From(byte* value)
     {
-        return new CStringWide((nint)value);
+        return new CStringWide((IntPtr)value);
     }
 
     /// <summary>
@@ -629,7 +628,7 @@ public static CStringWide From(byte* value)
     /// <returns>
     ///     The resulting <see cref="IntPtr" />.
     /// </returns>
-    public static implicit operator nint(CStringWide value)
+    public static implicit operator IntPtr(CStringWide value)
     {
         return value.Pointer;
     }
@@ -641,7 +640,7 @@ public static implicit operator nint(CStringWide value)
     /// <returns>
     ///     The resulting <see cref="IntPtr" />.
     /// </returns>
-    public static nint ToIntPtr(CStringWide value)
+    public static IntPtr ToIntPtr(CStringWide value)
     {
         return value.Pointer;
     }
@@ -714,7 +713,7 @@ public override string ToString()
     }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj)
+    public override bool Equals(object obj)
     {
         return obj is CStringWide value && Equals(value);
     }

src/cs/examples/helloworld/helloworld-app/Generated/my_c_library.gen.cs → src/cs/examples/helloworld/helloworld-app/Generated/my_c_library.g.cs

@@ -1,6 +1,6 @@
 
 // <auto-generated>
-//  This code was generated by the following tool on 2024-05-07 16:36:40 GMT-04:00:
+//  This code was generated by the following tool on 2024-05-07 22:28:44 GMT-04:00:
 //      https://github.com/bottlenoselabs/c2cs (v0.0.0.0)
 //
 //  Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.

src/cs/production/Bindgen.Runtime/Bindgen.Runtime.csproj

@@ -4,7 +4,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.1</TargetFramework>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<Nullable>enable</Nullable>
+		<Nullable>disable</Nullable>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<RootNamespace>Bindgen.Runtime</RootNamespace>
 		<AssemblyName>Bindgen.Runtime</AssemblyName>

src/cs/production/Bindgen.Runtime/CBool.cs

@@ -68,7 +68,7 @@ public override string ToString()
     }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj)
+    public override bool Equals(object obj)
     {
         return obj is CBool b && Equals(b);
     }

src/cs/production/Bindgen.Runtime/CChar.cs

@@ -68,7 +68,7 @@ public override string ToString()
     }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj)
+    public override bool Equals(object obj)
     {
         return obj is CChar value && Equals(value);
     }

src/cs/production/Bindgen.Runtime/CString.cs

@@ -194,7 +194,7 @@ public override string ToString()
     }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj)
+    public override bool Equals(object obj)
     {
         return obj is CString value && Equals(value);
     }

src/cs/production/Bindgen.Runtime/CStringWide.cs

@@ -186,7 +186,7 @@ public override string ToString()
     }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj)
+    public override bool Equals(object obj)
     {
         return obj is CStringWide value && Equals(value);
     }

src/cs/production/Bindgen.Runtime/CStrings.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the Git repository root directory for full license information.
 
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
 namespace Bindgen.Runtime;
@@ -20,7 +21,7 @@ public static unsafe class CStrings
     /// </remarks>
     /// <param name="values">The strings.</param>
     /// <returns>An array pointer of C string pointers. You are responsible for freeing the returned pointer.</returns>
-    public static CString* CStringArray(ReadOnlySpan<string> values)
+    public static CString* CStringArray(string[] values)
     {
         var pointerSize = IntPtr.Size;
         var result = (CString*)Marshal.AllocHGlobal(pointerSize * values.Length);
@@ -43,7 +44,7 @@ public static unsafe class CStrings
     /// </remarks>
     /// <param name="values">The strings.</param>
     /// <returns>An array pointer of C string pointers. You are responsible for freeing the returned pointer.</returns>
-    public static CStringWide* CStringWideArray(ReadOnlySpan<string> values)
+    public static CStringWide* CStringWideArray(string[] values)
     {
         var pointerSize = IntPtr.Size;
         var result = (CStringWide*)Marshal.AllocHGlobal(pointerSize * values.Length);

src/cs/production/C2CS.Tool/Commands/WriteCodeCSharp/Data/CSharpStructField.cs

@@ -9,7 +9,6 @@ namespace C2CS.Commands.WriteCodeCSharp.Data;
 public sealed class CSharpStructField : CSharpNode
 {
     public readonly string BackingFieldName;
-    public readonly bool IsWrapped;
     public readonly int OffsetOf;
     public readonly CSharpType Type;
 
@@ -19,13 +18,11 @@ public CSharpStructField(
         string cName,
         int? sizeOf,
         CSharpType type,
-        int offsetOf,
-        bool isWrapped)
+        int offsetOf)
         : base(name, className, cName, sizeOf)
     {
         Type = type;
         OffsetOf = offsetOf;
-        IsWrapped = isWrapped;
         BackingFieldName = name.StartsWith('@') ? $"_{name[1..]}" : $"_{name}";
     }
 
@@ -37,15 +34,14 @@ public override bool Equals(CSharpNode? other)
         }
 
         return BackingFieldName == other2.BackingFieldName &&
-               IsWrapped == other2.IsWrapped &&
                OffsetOf == other2.OffsetOf &&
                Type == other2.Type;
     }
 
     public override int GetHashCode()
     {
         var baseHashCOde = base.GetHashCode();
-        var hashCode = HashCode.Combine(baseHashCOde, BackingFieldName, IsWrapped, OffsetOf, Type);
+        var hashCode = HashCode.Combine(baseHashCOde, BackingFieldName, OffsetOf, Type);
         return hashCode;
     }
 }

src/cs/production/C2CS.Tool/Commands/WriteCodeCSharp/Data/CSharpType.cs

@@ -2,11 +2,14 @@
 // Licensed under the MIT license. See LICENSE file in the Git repository root directory for full license information.
 
 using System;
+using c2ffi.Data;
 
 namespace C2CS.Commands.WriteCodeCSharp.Data;
 
 public sealed class CSharpType : IEquatable<CSharpType>
 {
+    public CNodeKind OriginalNodeKind { get; init; }
+
     public string Name { get; init; } = string.Empty;
 
     public string ClassName { get; init; } = string.Empty;
@@ -23,6 +26,8 @@ public sealed class CSharpType : IEquatable<CSharpType>
 
     public bool IsArray => ArraySizeOf > 0;
 
+    public CSharpType? InnerType { get; init; }
+
     public bool Equals(CSharpType? other)
     {
         if (ReferenceEquals(null, other))