Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update latest-codegen to be net8.0 #496

Merged
merged 3 commits into from
Nov 19, 2023
Merged

Update latest-codegen to be net8.0 #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03da09d
Ensure new config options are in the readme
tannergooding Nov 19, 2023
b427ef7
Update latest-codegen to be net8.0
tannergooding Nov 19, 2023
933c644
Fix WideStringLiteralStaticConstTest on LatestUnix
tannergooding Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 66 additions & 37 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions sources/ClangSharp.PInvokeGenerator/CSharp/CSharpOutputBuilder.Visit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void WriteIid(string name, Guid value)

WriteIndented("ReadOnlySpan<byte> data = ");

if (_config.GeneratePreviewCode)
if (_config.GenerateLatestCode)
{
WriteLine('[');
}
Expand Down Expand Up @@ -124,7 +124,7 @@ public void WriteIid(string name, Guid value)
WriteNewline();
DecreaseIndentation();

if (_config.GeneratePreviewCode)
if (_config.GenerateLatestCode)
{
WriteIndented(']');
}
Expand Down
2 changes: 1 addition & 1 deletion sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2903,7 +2903,7 @@ void VisitConstantOrIncompleteArrayFieldDecl(RecordDecl recordDecl, FieldDecl co
AddDiagnostic(DiagnosticLevel.Info, $"{escapedName} (constant array field) has a size of 0", constantOrIncompleteArray);
}

if (!_config.GeneratePreviewCode || (totalSize <= 1) || isUnsafeElementType)
if (!_config.GenerateLatestCode || (totalSize <= 1) || isUnsafeElementType)
{
totalSizeString = null;
}
Expand Down
8 changes: 4 additions & 4 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitStmt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,7 +1503,7 @@ void HandleUnmanagedConstant(CSharpOutputBuilder outputBuilder, InitListExpr ini

outputBuilder.WriteIndented("ReadOnlySpan<byte> data = ");

if (_config.GeneratePreviewCode)
if (_config.GenerateLatestCode)
{
outputBuilder.WriteLine("[");
}
Expand All @@ -1519,7 +1519,7 @@ void HandleUnmanagedConstant(CSharpOutputBuilder outputBuilder, InitListExpr ini
outputBuilder.WriteNewline();
outputBuilder.DecreaseIndentation();

if (_config.GeneratePreviewCode)
if (_config.GenerateLatestCode)
{
outputBuilder.WriteIndented(']');
}
Expand Down Expand Up @@ -2553,7 +2553,7 @@ private void VisitStringLiteral(StringLiteral stringLiteral)

case CX_CLK_UTF32:
{
if (_config.GeneratePreviewCode)
if (_config.GenerateLatestCode)
{
outputBuilder.Write('[');
}
Expand All @@ -2574,7 +2574,7 @@ private void VisitStringLiteral(StringLiteral stringLiteral)

outputBuilder.Write("0x00000000");

if (_config.GeneratePreviewCode)
if (_config.GenerateLatestCode)
{
outputBuilder.Write(']');
}
Expand Down
42 changes: 29 additions & 13 deletions sources/ClangSharpPInvokeGenerator/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public static class Program
private static readonly string[] s_remapOptionAliases = ["--remap", "-r"];
private static readonly string[] s_stdOptionAliases = ["--std", "-std"];
private static readonly string[] s_testOutputOptionAliases = ["--test-output", "-to"];
private static readonly string[] s_versionOptionAliases = ["--version", "-v"];
private static readonly string[] s_traverseOptionAliases = ["--traverse", "-t"];
private static readonly string[] s_versionOptionAliases = ["--version", "-v"];
private static readonly string[] s_withAccessSpecifierOptionAliases = ["--with-access-specifier", "-was"];
private static readonly string[] s_withAttributeOptionAliases = ["--with-attribute", "-wa"];
private static readonly string[] s_withCallConvOptionAliases = ["--with-callconv", "-wcc"];
Expand All @@ -52,12 +52,12 @@ public static class Program
private static readonly string[] s_withLibraryPathOptionAliases = ["--with-librarypath", "-wlb"];
private static readonly string[] s_withManualImportOptionAliases = ["--with-manual-import", "-wmi"];
private static readonly string[] s_withNamespaceOptionAliases = ["--with-namespace", "-wn"];
private static readonly string[] s_withPackingOptionAliases = ["--with-packing", "-wp"];
private static readonly string[] s_withSetLastErrorOptionAliases = ["--with-setlasterror", "-wsle"];
private static readonly string[] s_withSuppressGCTransitionOptionAliases = ["--with-suppressgctransition", "-wsgct"];
private static readonly string[] s_withTransparentStructOptionAliases = ["--with-transparent-struct", "-wts"];
private static readonly string[] s_withTypeOptionAliases = ["--with-type", "-wt"];
private static readonly string[] s_withUsingOptionAliases = ["--with-using", "-wu"];
private static readonly string[] s_withPackingOptionAliases = ["--with-packing", "-wp"];

private static readonly Option<string[]> s_additionalOption = GetAdditionalOption();
private static readonly Option<string[]> s_configOption = GetConfigOption();
Expand Down Expand Up @@ -89,37 +89,45 @@ public static class Program
private static readonly Option<string[]> s_withLibraryPathNameValuePairs = GetWithLibraryPathOption();
private static readonly Option<string[]> s_withManualImports = GetWithManualImportOption();
private static readonly Option<string[]> s_withNamespaceNameValuePairs = GetWithNamespaceOption();
private static readonly Option<string[]> s_withPackingNameValuePairs = GetWithPackingOption();
private static readonly Option<string[]> s_withSetLastErrors = GetWithSetLastErrorOption();
private static readonly Option<string[]> s_withSuppressGCTransitions = GetWithSuppressGCTransitionOption();
private static readonly Option<string[]> s_withTransparentStructNameValuePairs = GetWithTransparentStructOption();
private static readonly Option<string[]> s_withTypeNameValuePairs = GetWithTypeOption();
private static readonly Option<string[]> s_withUsingNameValuePairs = GetWithUsingOption();
private static readonly Option<string[]> s_withPackingNameValuePairs = GetWithPackingOption();

private static readonly RootCommand s_rootCommand = GetRootCommand();

private static readonly TwoColumnHelpRow[] s_configOptions =
[
new TwoColumnHelpRow("?, h, help", "Show help and usage information for -c, --config"),

// Codegen Options
new TwoColumnHelpRow("", ""),
new TwoColumnHelpRow("# Codegen Options", ""),
new TwoColumnHelpRow("", ""),

new TwoColumnHelpRow("compatible-codegen", "Bindings should be generated with .NET Standard 2.0 compatibility. Setting this disables preview code generation."),
new TwoColumnHelpRow("default-codegen", "Bindings should be generated for the current LTS version of .NET/C#. This is currently .NET 6/C# 10."),
new TwoColumnHelpRow("latest-codegen", "Bindings should be generated for the current STS version of .NET/C#. This is currently .NET 7/C# 11."),
new TwoColumnHelpRow("preview-codegen", "Bindings should be generated for the preview version of .NET/C#. This is currently .NET 8/C# 12."),

// File Options
new TwoColumnHelpRow("", ""),
new TwoColumnHelpRow("# File Options", ""),
new TwoColumnHelpRow("", ""),

new TwoColumnHelpRow("single-file", "Bindings should be generated to a single output file. This is the default."),
new TwoColumnHelpRow("multi-file", "Bindings should be generated so there is approximately one type per file."),

// Type Options
new TwoColumnHelpRow("", ""),
new TwoColumnHelpRow("# Type Options", ""),
new TwoColumnHelpRow("", ""),

new TwoColumnHelpRow("unix-types", "Bindings should be generated assuming Unix defaults. This is the default on Unix platforms."),
new TwoColumnHelpRow("windows-types", "Bindings should be generated assuming Windows defaults. This is the default on Windows platforms."),

// Exclusion Options
new TwoColumnHelpRow("", ""),
new TwoColumnHelpRow("# Exclusion Options", ""),
new TwoColumnHelpRow("", ""),

new TwoColumnHelpRow("exclude-anonymous-field-helpers", "The helper ref properties generated for fields in nested anonymous structs and unions should not be generated."),
new TwoColumnHelpRow("exclude-com-proxies", "Types recognized as COM proxies should not have bindings generated. These are currently function declarations ending with _UserFree, _UserMarshal, _UserSize, _UserUnmarshal, _Proxy, or _Stub."),
Expand All @@ -130,18 +138,24 @@ public static class Program
new TwoColumnHelpRow("exclude-funcs-with-body", "Bindings for functions with bodies should not be generated."),
new TwoColumnHelpRow("exclude-using-statics-for-enums", "Enum usages should be fully qualified and should not include a corresponding 'using static EnumName;'"),

// VTBL Options
new TwoColumnHelpRow("", ""),
new TwoColumnHelpRow("# Vtbl Options", ""),
new TwoColumnHelpRow("", ""),

new TwoColumnHelpRow("explicit-vtbls", "VTBLs should have an explicit type generated with named fields per entry."),
new TwoColumnHelpRow("implicit-vtbls", "VTBLs should be implicit to reduce metadata bloat. This is the current default"),
new TwoColumnHelpRow("trimmable-vtbls", "VTBLs should be defined but not used in helper methods to reduce metadata bloat when trimming."),

// Test Options
new TwoColumnHelpRow("", ""),
new TwoColumnHelpRow("# Test Options", ""),
new TwoColumnHelpRow("", ""),

new TwoColumnHelpRow("generate-tests-nunit", "Basic tests validating size, blittability, and associated metadata should be generated for NUnit."),
new TwoColumnHelpRow("generate-tests-xunit", "Basic tests validating size, blittability, and associated metadata should be generated for XUnit."),

// Generation Options
new TwoColumnHelpRow("", ""),
new TwoColumnHelpRow("# Generation Options", ""),
new TwoColumnHelpRow("", ""),

new TwoColumnHelpRow("generate-aggressive-inlining", "[MethodImpl(MethodImplOptions.AggressiveInlining)] should be added to generated helper functions."),
new TwoColumnHelpRow("generate-callconv-member-function", "Instance function pointers should use [CallConvMemberFunction] where applicable."),
Expand All @@ -160,7 +174,9 @@ public static class Program
new TwoColumnHelpRow("generate-unmanaged-constants", "Unmanaged constants should be generated using static ref readonly properties. This is currently experimental."),
new TwoColumnHelpRow("generate-vtbl-index-attribute", "[VtblIndex(#)] attribute should be generated to document the underlying VTBL index for a helper method."),

// Logging Options
new TwoColumnHelpRow("", ""),
new TwoColumnHelpRow("# Logging Options", ""),
new TwoColumnHelpRow("", ""),

new TwoColumnHelpRow("log-exclusions", "A list of excluded declaration types should be generated. This will also log if the exclusion was due to an exact or partial match."),
new TwoColumnHelpRow("log-potential-typedef-remappings", "A list of potential typedef remappings should be generated. This can help identify missing remappings."),
Expand Down Expand Up @@ -1151,12 +1167,12 @@ private static RootCommand GetRootCommand()
s_withLibraryPathNameValuePairs,
s_withManualImports,
s_withNamespaceNameValuePairs,
s_withPackingNameValuePairs,
s_withSetLastErrors,
s_withSuppressGCTransitions,
s_withTransparentStructNameValuePairs,
s_withTypeNameValuePairs,
s_withUsingNameValuePairs,
s_withPackingNameValuePairs
s_withUsingNameValuePairs
};
Handler.SetHandler(rootCommand, (Action<InvocationContext>)Run);
return rootCommand;
Expand Down
Loading