Squashed commit of the following:

commit b5ab95e Author: Joao Matos <[email protected]> Date: Thu Feb 1 11:39:24 2024 +0000 Update iOS64 ABI name to the more accurate AppleARM64. commit d1307a5 Author: Joao Matos <[email protected]> Date: Thu Feb 1 11:21:52 2024 +0000 Add support for AArch64 C++ ABI. commit 9071cd2 Author: deadlocklogic <[email protected]> Date: Sun Dec 17 17:03:24 2023 +0200 Implement ClassTemplatePartialSpecialization::Parameters (mono#1809) * Implement ClassTemplatePartialSpecialization::Parameters * Template.cs: Implement ClassTemplatePartialSpecialization.Parameters * GeneratorKind: fix bug introduced while migrating from enum to class * Implement native ClassTemplatePartialSpecialization.Parameters + ASTConverter * regenerated bindings (mono#1813) * regenerated bindings * regenerated bindings after rebase * Directory.Build.props: support C# 10.0 * Implement native ClassTemplatePartialSpecialization.Parameters + ASTConverter * Regenerated bindings * TestAST.cs: add TestASTClassTemplatePartialSpecialization commit 2ecd952 Author: deadlocklogic <[email protected]> Date: Sun Dec 17 13:08:34 2023 +0200 regenerated bindings (mono#1813) * regenerated bindings * regenerated bindings after rebase * Directory.Build.props: support C# 10.0 commit 24d1a84 Author: deadlocklogic <[email protected]> Date: Sun Dec 17 11:44:00 2023 +0200 Stdlib.CSharp.cs: remove buggy typemap (mono#1812) commit 1327971 Author: deadlocklogic <[email protected]> Date: Sat Dec 16 21:36:04 2023 +0200 GeneratorKind: patch bug caused by missing ToString (mono#1811) commit 519e97f Author: Joao Matos <[email protected]> Date: Tue Dec 12 15:30:14 2023 +0000 Remove 32-bit builds and non-debug symbols release builds from LLVM Windows CI. commit 1211272 Author: deadlocklogic <[email protected]> Date: Tue Dec 12 17:25:12 2023 +0200 Build llvm `Debug`/`Release` for `Windows`. (mono#1800) * Update llvm-win.yml * Update llvm-win.yml * Update llvm-win.yml commit 12c267d Author: zylalx1 <[email protected]> Date: Fri Dec 8 03:58:10 2023 +0800 Fixed a bug causing the header file to be included twice when Options.GenerateName is not null (mono#1803) commit e068f2a Author: deadlocklogic <[email protected]> Date: Thu Dec 7 16:35:02 2023 +0200 Typemap cleanup (mono#1802) * TypeMap: prepare refactoring into a modular design * TypeMap: refactor C++ backend into common methods * TypeMap: refactor CLI backend into common methods * CLI.Gen.cs: fix omitted typemap from previous commit * Common.Gen.cs: fixed silly modification while testing * GeneratorKind: add FindGeneratorKindByID method * TypeMapDatabase: heavy refactor: group typemaps by GeneratorKind * TypeMap: refactor CSharp backend into common methods + migration * TypeMap: cleanup patches from previous commits * TypeMapDatabase: fix passing GeneratorKind to FindTypeMap calls * Stdlib.CSharp.cs: move std::map typemap from Stdlib.CLI.cs * TypeMapDatabase: improve parameter name commit 8c2da6d Author: deadlocklogic <[email protected]> Date: Mon Nov 13 22:00:41 2023 +0200 Major refactor: TypePrinter: improve modular design + cleanup (mono#1796) commit 0edd48c Author: deadlocklogic <[email protected]> Date: Mon Nov 13 20:15:24 2023 +0200 Major refactoring: refactor GeneratorKind enum into a class (mono#1794) * Major refactoring: refactor GeneratorKind enum into a class * Minor fix: add readonly * Add Type property for GenerationKind + cleanup * GeneratorKind: add Name property + refactor hardcoded names * GeneratorKind: add CLIOptions property + refactor hardcoded options * CppSharp.CLI: minor fix: use generator.ToLower() * GeneratorKind: fix warning commit 40f3a09 Author: deadlocklogic <[email protected]> Date: Sat Nov 11 16:51:18 2023 +0200 Minor improvements (mono#1793) * CppSharp.Generators.Options: added pre/post TranslationUnitPass callback * CppSharp.Generators.Passes.Pass: added TranslationUnitPassGeneratorDependent commit b14038a Author: Stefan <[email protected]> Date: Mon Oct 23 14:23:51 2023 +0200 Value types may generate `Dispose` (mono#1787) commit 3b2a15d Author: João Matos <[email protected]> Date: Sat Oct 21 19:33:13 2023 +0100 Update README.md commit a5afda8 Author: Stefan <[email protected]> Date: Fri Oct 20 21:00:04 2023 +0200 Fix parameterless constructors not being generated for structs (mono#1783) * Fix parameterless constructors not being generated for structs * Fix implicit non-trivial default ctor * Adjust `Ignore` linked issue commit b16e809 Author: Stefan <[email protected]> Date: Fri Oct 20 18:54:58 2023 +0200 Introduce `GenerateFreeStandingFunctionsClassName` option (mono#1782) * Introduce `GenerateFreeStandingFunctionsClassName` option * Support CLI and fixes commit 03874e7 Author: Stefan <[email protected]> Date: Thu Oct 19 17:24:55 2023 +0200 Fix Value Type String Member Invalid Codegen (mono#1778) * Fix code generation * Generate exception on broken struct set op * Remove redundant usings commit adffc99 Author: Salvage <[email protected]> Date: Thu Oct 19 14:51:06 2023 +0200 Fix erroneous newline commit b4f261e Author: Salvage <[email protected]> Date: Thu Oct 19 14:26:00 2023 +0200 Simplify `IsTemplateParameterType` commit 28000a1 Author: Salvage <[email protected]> Date: Thu Oct 19 01:19:07 2023 +0200 Fix mono#1251 three parameter equality operator - Operators in generic classes do not attempt to generate as extension methods anymore - Empty `...Extensions` classes are no longer generated - `string` as a template argument is correctly cast - `MarshalCharAsManagedChar` option also generates correct casts - Suppress warning regarding returning struct field by ref - Eliminate some tabs that snuck into the test C++ header commit d7faf5f Author: Joao Matos <[email protected]> Date: Wed Oct 18 17:39:49 2023 +0100 Fix SDL_PollEvent generation in the SDL example. Fixes mono#978. Thanks to @Saalvage. commit 7f567b6 Author: Salvage <[email protected]> Date: Wed Oct 18 18:26:03 2023 +0200 Fix non-void returning functions with value-type out parameters Also fixes indentation commit 0c60384 Author: Salvage <[email protected]> Date: Wed Oct 18 16:49:41 2023 +0200 Additional bump commit 0534e33 Author: Salvage <[email protected]> Date: Wed Oct 18 16:35:10 2023 +0200 Bump GH actions versions to solve warnings commit a6ef9d9 Author: Salvage <[email protected]> Date: Wed Oct 18 16:19:42 2023 +0200 Fix source dir commit 7e6c492 Author: Salvage <[email protected]> Date: Wed Oct 18 16:08:51 2023 +0200 Test fix broken packages commit 2a351b7 Author: Joao Matos <[email protected]> Date: Wed Oct 18 16:03:36 2023 +0100 Update our version to 1.1. commit 20950c5 Author: Salvage <[email protected]> Date: Wed Oct 18 04:58:38 2023 +0200 More stringent test; Fix indentation (of the code itself, not in the generator) commit ebe6b8a Author: Salvage <[email protected]> Date: Wed Oct 18 04:47:13 2023 +0200 Fix value type out parameters
MoonCollider · Feb 1, 2024 · b8e0fcc · b8e0fcc
1 parent b54eaba
commit b8e0fcc
Show file tree

Hide file tree

Showing 84 changed files with 2,446 additions and 1,771 deletions.
diff --git a/.github/workflows/llvm-win.yml b/.github/workflows/llvm-win.yml
@@ -9,8 +9,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: windows-2022, platform: x86, vs: "Program Files/Microsoft Visual Studio/2022" }
-          - { os: windows-2022, platform: x64, vs: "Program Files/Microsoft Visual Studio/2022" }
+          - { os: windows-2022, platform: x64, configuration : Debug, vs: "Program Files/Microsoft Visual Studio/2022" }
+          - { os: windows-2022, platform: x64, configuration : RelWithDebInfo, vs: "Program Files/Microsoft Visual Studio/2022" }
 
     runs-on: ${{ matrix.config.os }}
 
@@ -19,6 +19,7 @@ jobs:
       CXX: ${{ matrix.config.cxx }}
       VS_VERSION: ${{ matrix.config.vs }}
       PLATFORM: ${{ matrix.config.platform }}
+      CONFIGURATION: ${{ matrix.config.configuration }}
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
     steps:
@@ -51,16 +52,16 @@ jobs:
 
       - name: Build LLVM
         shell: bash
-        run: build/build.sh build_llvm -platform $PLATFORM
+        run: build/build.sh build_llvm -platform $PLATFORM -configuration $CONFIGURATION
         working-directory: C:\CppSharp
 
       - name: Package LLVM
         shell: bash
-        run: build/build.sh package_llvm -platform $PLATFORM
+        run: build/build.sh package_llvm -platform $PLATFORM -configuration $CONFIGURATION
         working-directory: C:\CppSharp
 
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3
         with:
           name: llvm
-          path: C:\CppSharp\build\llvm\llvm-*-*.*
+          path: C:\CppSharp\build\llvm\llvm-*-*.*
diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
@@ -22,7 +22,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: lukka/get-cmake@latest
 
       - name: Clone LLVM

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
 
@@ -63,7 +63,7 @@ jobs:
         shell: bash
         run: build/build.sh prepack -platform $PLATFORM
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: intermediate
           path: |
@@ -82,14 +82,14 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
 
       - name: Set version
         run: nbgv cloud --all-vars
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: intermediate
 
@@ -102,7 +102,7 @@ jobs:
         run: build/build.sh pack
 
       - name: Upload package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CppSharp.nupkg
           path: |

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,57 +1,58 @@
-<Project>
-  <Import Project="build/config.props" />
-
-  <PropertyGroup>
-    <RootDir>$(MSBuildThisFileDirectory)</RootDir>
-    <Platforms>x86;x64</Platforms>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>    
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/mono/CppSharp</RepositoryUrl>
-    <RepositoryCommit>$(GITHUB_SHA)</RepositoryCommit>
-    <Authors>João Matos, Dimitar Dobrev, Jose Torres</Authors>
-    <Copyright>João Matos, Dimitar Dobrev</Copyright>
-    <Version>$(NBGV_Version)</Version>
-    <AssemblyVersion>$(NBGV_AssemblyVersion)</AssemblyVersion>
-    <AssemblyFileVersion>$(NBGV_AssemblyFileVersion)</AssemblyFileVersion>
-    <AssemblyInformationalVersion>$(NBGV_AssemblyInformationalVersion)</AssemblyInformationalVersion>
-    <IsPackable>false</IsPackable>
-    <BuildDir>$(RootDir)build\</BuildDir>
-    <ObjDir>$(BuildDir)obj\</ObjDir>
-    <GenDir>$(BuildDir)gen\</GenDir>
-    <SrcDir>$(RootDir)src\</SrcDir>
-    <GlobalTargetFramework>$(TargetFramework)</GlobalTargetFramework>
-    <BaseIntermediateOutputPath>$(ObjDir)$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <BaseOutputPath>$(RootDir)bin\</BaseOutputPath>
-    <OutputPath>$(BaseOutputPath)$(Configuration)_$(PlatformTarget)\</OutputPath>
-    <ActionDir>$(BuildDir)$(PremakeAction)\</ActionDir>
-    <NativeProjectsDir>$(ActionDir)projects\</NativeProjectsDir>
-    <PackageDir>$(RootDir)artifacts\package\</PackageDir>
-    <TargetDir>$(OutputPath)</TargetDir>
-    <LangVersion>9.0</LangVersion>
-    <WarningLevel>4</WarningLevel>
-    <DotNetCmd>dotnet</DotNetCmd>
-    <GeneratorFileExtension>dll</GeneratorFileExtension>
-    <DotNetCmd Condition="'$(PlatformTarget)' == 'x86' AND Exists('$(MSBuildProgramFiles32)\dotnet\dotnet.exe')">"$(MSBuildProgramFiles32)\dotnet\dotnet.exe"</DotNetCmd>
-    <DotNetCmd Condition="'$(PlatformTarget)' == 'x64' AND Exists('$(ProgramW6432)\dotnet\dotnet.exe')">"$(ProgramW6432)\dotnet\dotnet.exe"</DotNetCmd>
-    <RID Condition="$(IsWindows)">win</RID>
-    <RID Condition="$(IsLinux)">linux</RID>
-    <RID Condition="$(IsMacOSX)">osx</RID>
-    <RID>$(RID)-$(PlatformTarget)</RID>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(CPPSHARP_RELEASE)' != 'true'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(DotNetCmd)' == 'dotnet' AND $(IsWindows)">
-    <GeneratorFileExtension>exe</GeneratorFileExtension>
-    <DotNetCmd></DotNetCmd>
-  </PropertyGroup>
-
-  <Target Name="prepack" DependsOnTargets="Build" Condition="'$(IsPackable)' == 'true' AND '$(Platform)' == 'x64'">
-    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(PackageDir)runtimes\$(RID)\lib\$(GlobalTargetFramework)" />
-  </Target>
+<Project>
+  <Import Project="build/config.props" />
+
+  <PropertyGroup>
+    <RootDir>$(MSBuildThisFileDirectory)</RootDir>
+    <Platforms>x86;x64</Platforms>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>    
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/mono/CppSharp</RepositoryUrl>
+    <RepositoryCommit>$(GITHUB_SHA)</RepositoryCommit>
+    <Authors>João Matos, Dimitar Dobrev, Jose Torres</Authors>
+    <Copyright>João Matos, Dimitar Dobrev</Copyright>
+    <Version>$(NBGV_Version)</Version>
+    <AssemblyVersion>$(NBGV_AssemblyVersion)</AssemblyVersion>
+    <AssemblyFileVersion>$(NBGV_AssemblyFileVersion)</AssemblyFileVersion>
+    <AssemblyInformationalVersion>$(NBGV_AssemblyInformationalVersion)</AssemblyInformationalVersion>
+    <IsPackable>false</IsPackable>
+    <BuildDir>$(RootDir)build\</BuildDir>
+    <ObjDir>$(BuildDir)obj\</ObjDir>
+    <GenDir>$(BuildDir)gen\</GenDir>
+    <SrcDir>$(RootDir)src\</SrcDir>
+    <GlobalTargetFramework>$(TargetFramework)</GlobalTargetFramework>
+    <BaseIntermediateOutputPath>$(ObjDir)$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <BaseOutputPath>$(RootDir)bin\</BaseOutputPath>
+    <OutputPath>$(BaseOutputPath)$(Configuration)_$(PlatformTarget)\</OutputPath>
+    <ActionDir>$(BuildDir)$(PremakeAction)\</ActionDir>
+    <NativeProjectsDir>$(ActionDir)projects\</NativeProjectsDir>
+    <PackageDir>$(RootDir)artifacts\package\</PackageDir>
+    <TargetDir>$(OutputPath)</TargetDir>
+    <LangVersion>10.0</LangVersion>
+    <WarningLevel>4</WarningLevel>
+    <DotNetCmd>dotnet</DotNetCmd>
+    <GeneratorFileExtension>dll</GeneratorFileExtension>
+    <DotNetCmd Condition="'$(PlatformTarget)' == 'x86' AND Exists('$(MSBuildProgramFiles32)\dotnet\dotnet.exe')">"$(MSBuildProgramFiles32)\dotnet\dotnet.exe"</DotNetCmd>
+    <DotNetCmd Condition="'$(PlatformTarget)' == 'x64' AND Exists('$(ProgramW6432)\dotnet\dotnet.exe')">"$(ProgramW6432)\dotnet\dotnet.exe"</DotNetCmd>
+    <RID Condition="$(IsWindows)">win</RID>
+    <RID Condition="$(IsLinux)">linux</RID>
+    <RID Condition="$(IsMacOSX)">osx</RID>
+    <RID>$(RID)-$(PlatformTarget)</RID>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(CPPSHARP_RELEASE)' != 'true'">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(DotNetCmd)' == 'dotnet' AND $(IsWindows)">
+    <GeneratorFileExtension>exe</GeneratorFileExtension>
+    <DotNetCmd></DotNetCmd>
+  </PropertyGroup>
+
+  <Target Name="prepack" DependsOnTargets="Build" Condition="'$(IsPackable)' == 'true' AND '$(Platform)' == 'x64'">
+    <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(PackageDir)ref\$(GlobalTargetFramework)" Condition="'$(ProduceReferenceAssembly)' == 'true' AND '$(RID)' == 'win-x64'" />
+    <Copy SourceFiles="$(TargetPath)" DestinationFolder="$(PackageDir)runtimes\$(RID)\lib\$(GlobalTargetFramework)" />
+  </Target>
 </Project>
diff --git a/README.md b/README.md
@@ -74,12 +74,11 @@ Please see the following resources for more information:
 
 ## Community
 
-Feel free to open up issues on Github for any problems you find.
+Feel free to open up issues on GitHub for any problems you find.
 
 ## Support
 
-For building wrappers and priority support please write to &#99;&#112;&#112;&#115;&#104;&#97;&#114;&#112;&#64;&#112;&#114;&#111;&#116;&#111;&#110;&#109;&#97;&#105;&#108;&#46;&#99;&#111;&#109;.
-Alternatively, you may post bounties at https://www.bountysource.com/.
+If you need commercial support feel free to open a discussion or issue for discussion.
 
 ## Users
 
@@ -109,4 +108,6 @@ CppSharp is used by the following projects:
 
 [GLFW3.NET](https://github.com/realvictorprm/GLFW3.NET)
 
+[DearImguiSharp](https://github.com/Sewer56/DearImguiSharp)
+
 Please feel free to send us a pull request adding your own projects to the list above.
diff --git a/examples/SDL/SDL.cs b/examples/SDL/SDL.cs
@@ -53,6 +53,8 @@ public void Preprocess(Driver driver, ASTContext ctx)
 
             ctx.IgnoreEnumWithMatchingItem("SDL_ENOMEM");
             ctx.IgnoreFunctionWithName("SDL_Error");
+
+            ctx.SetFunctionParameterUsage("SDL_PollEvent", 1, ParameterUsage.Out);
         }
 
         public void Postprocess(Driver driver, ASTContext ctx)

diff --git a/src/AST/ASTContext.cs b/src/AST/ASTContext.cs
@@ -10,8 +10,9 @@ public enum CppAbi
         Itanium,
         Microsoft,
         ARM,
+        AArch64,
         iOS,
-        iOS64,
+        AppleARM64,
         WebAssembly
     }
 

diff --git a/src/AST/Template.cs b/src/AST/Template.cs
@@ -304,6 +304,12 @@ public override string ToString()
     /// </summary>
     public class ClassTemplatePartialSpecialization : ClassTemplateSpecialization
     {
+        public readonly List<Declaration> Parameters;
+
+        public ClassTemplatePartialSpecialization()
+        {
+            Parameters = new List<Declaration>();
+        }
     }
 
     /// <summary>

diff --git a/src/AST/TypeExtensions.cs b/src/AST/TypeExtensions.cs
@@ -439,6 +439,17 @@ public static bool IsDependentPointer(this Type type)
             return false;
         }
 
+        public static bool IsTemplateParameterType(this Type type)
+        {
+            if (type is TemplateParameterType or TemplateParameterSubstitutionType)
+                return true;
+
+            if (type is PointerType pt)
+                return pt.GetFinalPointee() is TemplateParameterType or TemplateParameterSubstitutionType;
+
+            return false;
+        }
+
         public static Module GetModule(this Type type)
         {
             Declaration declaration;

diff --git a/src/CLI/CLI.cs b/src/CLI/CLI.cs
@@ -206,33 +206,13 @@ static void GetFilesFromPath(string path, List<string> errorMessages)
 
         static void GetGeneratorKind(string generator, List<string> errorMessages)
         {
-            switch (generator.ToLower())
+            foreach (GeneratorKind generatorKind in GeneratorKind.Registered)
             {
-                case "csharp":
-                    options.Kind = GeneratorKind.CSharp;
-                    return;
-                case "cli":
-                    options.Kind = GeneratorKind.CLI;
-                    return;
-                case "c":
-                    options.Kind = GeneratorKind.C;
-                    return;
-                case "cpp":
-                    options.Kind = GeneratorKind.CPlusPlus;
-                    return;
-                case "napi":
-                    options.Kind = GeneratorKind.NAPI;
-                    return;
-                case "qjs":
-                    options.Kind = GeneratorKind.QuickJS;
-                    return;
-                case "ts":
-                case "typescript":
-                    options.Kind = GeneratorKind.TypeScript;
-                    return;
-                case "emscripten":
-                    options.Kind = GeneratorKind.Emscripten;
+                if (generatorKind.IsCLIOptionMatch(generator.ToLower()))
+                {
+                    options.Kind = generatorKind;
                     return;
+                }
             }
 
             errorMessages.Add($"Unknown generator kind: {generator}.");

diff --git a/src/CLI/Generator.cs b/src/CLI/Generator.cs
@@ -198,7 +198,7 @@ public void Postprocess(Driver driver, ASTContext ctx)
         public void Run()
         {
             var messageBuilder = new StringBuilder();
-            messageBuilder.Append($"Generating {GetGeneratorKindName(options.Kind)}");
+            messageBuilder.Append($"Generating {options.Kind.Name}");
             messageBuilder.Append($" bindings for {GetPlatformName(options.Platform)} {options.Architecture}");
 
             if (options.Cpp11ABI)
@@ -225,20 +225,5 @@ private static string GetPlatformName(TargetPlatform? platform)
                     return platform.ToString();
             }
         }
-
-        private static string GetGeneratorKindName(GeneratorKind kind)
-        {
-            switch (kind)
-            {
-                case GeneratorKind.CLI:
-                    return "C++/CLI";
-                case GeneratorKind.CSharp:
-                    return "C#";
-                case GeneratorKind.NAPI:
-                    return "N-API";
-                default:
-                    return kind.ToString();
-            }
-        }
     }
 }
diff --git a/src/CppParser/AST.cpp b/src/CppParser/AST.cpp
@@ -793,6 +793,8 @@ ClassTemplatePartialSpecialization::ClassTemplatePartialSpecialization()
 
 ClassTemplatePartialSpecialization::~ClassTemplatePartialSpecialization() {}
 
+DEF_VECTOR(ClassTemplatePartialSpecialization, Declaration*, Parameters)
+
 FunctionTemplate::FunctionTemplate() : Template(DeclarationKind::FunctionTemplate) {}
 
 FunctionTemplate::~FunctionTemplate() {}