jyapayne/cppast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expose __attribute__ and __declspec attributes. Closes #50.

Browse source
This commit is contained in:
Rokas Kupstys 2018-03-27 11:50:08 +03:00 • committed by Jonathan Müller
commit 2122dad8b0
1 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/libclang/cxtokenizer.cpp
View file

@ -545,12 +545,23 @@ namespace
auto arguments = parse_attribute_arguments(stream); auto arguments = parse_attribute_arguments(stream);
result.push_back(cpp_attribute(cpp_attribute_kind::alignas_, std::move(arguments))); result.push_back(cpp_attribute(cpp_attribute_kind::alignas_, std::move(arguments)));
} }
else if (skip_if(stream, "__attribute__")) else if (skip_if(stream, "__attribute__") && stream.peek() == "(")
{ {
// GCC/clang attributes // GCC/clang attributes
// __attribute__(<attribute>) // __attribute__((<attribute>))
// ^ // ^^
skip_brackets(stream); skip(stream, "(");
skip(stream, "(");
auto scope = parse_attribute_using(stream);
while (!skip_if(stream, ")"))
{
auto attribute = parse_attribute_token(stream, scope);
result.push_back(std::move(attribute));
detail::skip_if(stream, ",");
}
skip(stream, ")");
return true; return true;
} }
else if (skip_if(stream, "__declspec")) else if (skip_if(stream, "__declspec"))
@ -558,7 +569,15 @@ namespace
// MSVC declspec // MSVC declspec
// __declspec(<attribute>) // __declspec(<attribute>)
// ^ // ^
skip_brackets(stream); skip(stream, "(");
auto scope = parse_attribute_using(stream);
while (!skip_if(stream, ")"))
{
auto attribute = parse_attribute_token(stream, scope);
result.push_back(std::move(attribute));
detail::skip_if(stream, ",");
}
return true; return true;
} }