Skip to content

Handle << and >> in expressions in template parameter lists #7

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
Mar 2, 2016
Merged

Handle << and >> in expressions in template parameter lists #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e304e5f
Handle template expressions that may use the << or >> operators
focalintent Feb 24, 2016
fe0ba95
Make sure we don't throw things away while collecting the signature, …
focalintent Feb 24, 2016
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
38 changes: 28 additions & 10 deletions c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,20 +1392,38 @@ static void skipToMatch (const char *const pair)

if (c == begin)
{
++matchLevel;
if (braceFormatting && getDirectiveNestLevel () != initialLevel)
{
skipToFormattedBraceMatch ();
break;
// watch out for '<<' in template arguments
int x = cppGetc ();
if(c == '<' && x == '<') {
// we've found a << - do nothing except record the signature
if (CollectingSignature)
vStringPut(Signature, x);
} else {
cppUngetc (x);
++matchLevel;
if (braceFormatting && getDirectiveNestLevel () != initialLevel)
{
skipToFormattedBraceMatch ();
break;
}
}
}
else if (c == end)
{
--matchLevel;
if (braceFormatting && getDirectiveNestLevel () != initialLevel)
{
skipToFormattedBraceMatch ();
break;
// watch out for '>>' in template arguments
int x = cppGetc ();
if(c == '>' && x == '>') {
// we've found a >> - do nothing except record the signature
if (CollectingSignature)
vStringPut(Signature, x);
} else {
cppUngetc (x);
--matchLevel;
if (braceFormatting && getDirectiveNestLevel () != initialLevel)
{
skipToFormattedBraceMatch ();
break;
}
}
}
}
Expand Down