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

Fix issue with trailing return type parser

Browse source
This commit is contained in:
Jonathan Müller 2017-04-10 21:47:16 +02:00
commit 487ef8e15d
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libclang/function_parser.cpp
View file

@ -293,15 +293,18 @@ namespace
// check for trailing return type // check for trailing return type
if (detail::skip_if(stream, "->")) if (detail::skip_if(stream, "->"))
{ {
//detail::print_tokens(context.tu, context.file, stream.cursor());
// this is rather tricky to skip // this is rather tricky to skip
// so loop over all tokens and see if matching keytokens occur // so loop over all tokens and see if matching keytokens occur
// note that this isn't quite correct // note that this isn't quite correct
// use a heuristic to skip brackets, which should be good enough // use a heuristic to skip brackets, which should be good enough
while (!stream.done()) while (!stream.done())
{ {
if (stream.peek() == "(" || stream.peek() == "[" || stream.peek() == "<" if (stream.peek() == "(" || stream.peek() == "[" || stream.peek() == "<")
|| stream.peek() == "{")
detail::skip_brackets(stream); detail::skip_brackets(stream);
else if (stream.peek() == "{")
// begin of definition
break;
else if (detail::skip_if(stream, "override")) else if (detail::skip_if(stream, "override"))
{ {
DEBUG_ASSERT(allow_virtual, detail::parse_error_handler{}, stream.cursor(), DEBUG_ASSERT(allow_virtual, detail::parse_error_handler{}, stream.cursor(),
@ -313,8 +316,8 @@ namespace
} }
else if (detail::skip_if(stream, "final")) else if (detail::skip_if(stream, "final"))
{ {
DEBUG_ASSERT(allow_virtual, detail::parse_error_handler{}, stream.cursor(),
"unexpected token"); "unexpected token");
DEBUG_ASSERT(allow_virtual, detail::parse_error_handler{}, stream.cursor(),
if (result.virtual_keywords) if (result.virtual_keywords)
result.virtual_keywords.value() |= cpp_virtual_flags::final; result.virtual_keywords.value() |= cpp_virtual_flags::final;
else else