Skip to content

Fix incorrect template argument kind #578

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 2 commits into from
Apr 4, 2025
Merged

Fix incorrect template argument kind #578

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b62dec
Fix incorrect template argument kind
MrJul Nov 11, 2024
74b8873
Disable TemplateParameterPackTest for now
MrJul Nov 20, 2024
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
30 changes: 29 additions & 1 deletion sources/libClangSharp/ClangSharp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,38 @@ using namespace clang::cxstring;
using namespace clang::cxtu;
using namespace clang::cxtype;

CXTemplateArgumentKind ConvertTemplateArgumentKind(TemplateArgument::ArgKind kind) {
switch (kind) {
case TemplateArgument::Null:
return CXTemplateArgumentKind_Null;
case TemplateArgument::Type:
return CXTemplateArgumentKind_Type;
case TemplateArgument::Declaration:
return CXTemplateArgumentKind_Declaration;
case TemplateArgument::NullPtr:
return CXTemplateArgumentKind_NullPtr;
case TemplateArgument::Integral:
return CXTemplateArgumentKind_Integral;
case TemplateArgument::StructuralValue:
// Does not exist in CXTemplateArgumentKind
return CXTemplateArgumentKind_Invalid;
case TemplateArgument::Template:
return CXTemplateArgumentKind_Template;
case TemplateArgument::TemplateExpansion:
return CXTemplateArgumentKind_TemplateExpansion;
case TemplateArgument::Expression:
return CXTemplateArgumentKind_Expression;
case TemplateArgument::Pack:
return CXTemplateArgumentKind_Pack;
default:
return CXTemplateArgumentKind_Invalid;
}
}

CX_TemplateArgument MakeCXTemplateArgument(const TemplateArgument* TA, CXTranslationUnit TU, bool needsDispose = false) {
if (TA) {
assert(TU && "Invalid arguments!");
return { static_cast<CXTemplateArgumentKind>(TA->getKind()), (needsDispose ? 1 : 0), TA, TU };
return { ConvertTemplateArgumentKind(TA->getKind()), (needsDispose ? 1 : 0), TA, TU };
}

return { };
Expand Down
22 changes: 22 additions & 0 deletions tests/ClangSharp.UnitTests/CursorTests/DeclTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,26 @@ class MyClass<int, U>
var templateParameter = classTemplatePartialSpecializationDecl.TemplateParameters.Single();
Assert.That(templateParameter.Name, Is.EqualTo("U"));
}

[Test]
public void TemplateParameterPackTest()
{
var inputContents = $@"template<class... Types>
class tuple;

tuple<int, long> SomeFunction();
";

using var translationUnit = CreateTranslationUnit(inputContents);

var functionDecl = translationUnit.TranslationUnitDecl.Decls.OfType<FunctionDecl>().Single();
var tupleDecl = functionDecl.ReturnType.AsCXXRecordDecl as ClassTemplateSpecializationDecl;
Assert.That(tupleDecl, Is.Not.Null);
Assert.That(tupleDecl!.TemplateArgs.Count, Is.EqualTo(1));

var packElements = tupleDecl.TemplateArgs[0].PackElements;
Assert.That(packElements.Count, Is.EqualTo(2));
Assert.That(packElements[0].AsType.AsString, Is.EqualTo("int"));
Assert.That(packElements[1].AsType.AsString, Is.EqualTo("long"));
}
}
Loading