Skip to content

Fixed empty specialized template handling #14

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

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Fixed empty specialized template handling #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 0.8.0-alpha-016 (13 Dec 2023)
- Fixed empty template parameter name specialization

## 0.8.0-alpha-015 (13 Dec 2023)
- Fixed partial template specialization

Expand Down
2 changes: 2 additions & 0 deletions src/CppAst.Tests/TestMisc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class Vector3d : public VectorBase<T, 3>
Assert.AreEqual(CppTemplateKind.PartialTemplateClass, compilation.Classes[1].TemplateKind);
Assert.AreEqual(1, compilation.Classes[1].TemplateParameters.Count);
Assert.AreEqual("T", compilation.Classes[1].TemplateParameters[0].FullName);
Assert.IsNotNull(compilation.Classes[1].PrimaryTemplate);
Assert.AreEqual(1, compilation.Classes[1].TemplateSpecializedArguments.Count);
Assert.AreEqual(CppTemplateArgumentKind.AsInteger, compilation.Classes[1].TemplateSpecializedArguments[0].ArgKind);
Assert.AreEqual(2, compilation.Classes[1].TemplateSpecializedArguments[0].ArgAsInteger);
Expand All @@ -135,6 +136,7 @@ class Vector3d : public VectorBase<T, 3>
Assert.AreEqual(CppTemplateKind.PartialTemplateClass, compilation.Classes[4].TemplateKind);
Assert.AreEqual(1, compilation.Classes[4].TemplateParameters.Count);
Assert.AreEqual("T", compilation.Classes[4].TemplateParameters[0].FullName);
Assert.IsNotNull(compilation.Classes[4].PrimaryTemplate);
Assert.AreEqual(1, compilation.Classes[4].TemplateSpecializedArguments.Count);
Assert.AreEqual(CppTemplateArgumentKind.AsInteger, compilation.Classes[4].TemplateSpecializedArguments[0].ArgKind);
Assert.AreEqual(3, compilation.Classes[4].TemplateSpecializedArguments[0].ArgAsInteger);
Expand Down
4 changes: 2 additions & 2 deletions src/CppAst/CppAst.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFrameworks>net6.0</TargetFrameworks>
<VersionPrefix>0.8.0</VersionPrefix>
<VersionSuffix>alpha</VersionSuffix>
<BuildNumber>015</BuildNumber>
<BuildNumber>016</BuildNumber>
<PackageId>CppAst.cgnx</PackageId>
<Description>CppAst is a .NET library providing a C/C++ parser for header files with access to the full AST, comments and macros</Description>
<Copyright>Alexandre Mutel</Copyright>
Expand All @@ -26,7 +26,7 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Version>0.8.0-alpha-015</Version>
<Version>0.8.0-alpha-016</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
36 changes: 25 additions & 11 deletions src/CppAst/CppModelBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,16 @@ private void AddTemplateSpecializedArguments(List<CppTemplateArgument> sourceArg
}
else
{
/* This is quite impossible, just to make sure */
if (existingParams.Count() > 1)
/** Don't really know what to do with the case if we have the same template parameter multiple times */
if (existingParams.Count() == 1)
{
throw new InvalidOperationException($"The same template parameter `{p.SourceParam.FullName}` exists more than one times");
}
var existingParam = existingParams[0];
if (!existingParam.IsSpecializedArgument && p.IsSpecializedArgument)
{
/* We need to replace the already existing non-specialized parameter with the new specialized one */
var index = destinationArguments.IndexOf(existingParam);
destinationArguments[index] = p;
var existingParam = existingParams[0];
if (!existingParam.IsSpecializedArgument && p.IsSpecializedArgument)
{
/* We need to replace the already existing non-specialized parameter with the new specialized one */
var index = destinationArguments.IndexOf(existingParam);
destinationArguments[index] = p;
}
}
}
}
Expand All @@ -142,6 +141,22 @@ private void UpdateTemplateType(CppClass cppClass)
if (cppClass.TemplateKind == CppTemplateKind.TemplateClass && cppClass.TemplateParameters.Count > 0 && cppClass.TemplateSpecializedArguments.Count > 0)
{
cppClass.TemplateKind = CppTemplateKind.PartialTemplateClass;
/** We need to set the primary template */
if (cppClass.PrimaryTemplate == null && cppClass.BaseTypes.Count > 0)
{
foreach (var b in cppClass.BaseTypes)
{
if (b.Type is CppClass)
{
var clz = b.Type as CppClass;
if (clz.TemplateKind == CppTemplateKind.TemplateClass)
{
cppClass.PrimaryTemplate = clz;
break;
}
}
}
}
}
}

Expand Down Expand Up @@ -265,7 +280,6 @@ private CppContainerContext GetOrCreateDeclarationContainer(CXCursor cursor, voi
Debug.Assert(cppClass.PrimaryTemplate.TemplateParameters.Count == tempArgsCount);
}


for (uint i = 0; i < tempArgsCount; i++)
{
var arg = cursor.GetTemplateArgument(i);
Expand Down