feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Name demangler: Try to fix template parameter packs.

Browse Source 
Hard to test at the moment: gcc and clang produce different manglings,
neither of which c++filt can decode.

Change-Id: Ic4ad8887a3ad76086cd8be911334dda21afa85db
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2012-07-20 15:45:29 +02:00
parent cf9895ae01
commit 94dda38664
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/debugger/namedemangler/parsetreenodes.cpp
View File

@@ -831,10 +831,10 @@ QByteArray ExpressionNode::toByteArray() const
repr.append(CHILD_TO_BYTEARRAY(0)).append(".*").append(CHILD_TO_BYTEARRAY(1)); repr.append(CHILD_TO_BYTEARRAY(0)).append(".*").append(CHILD_TO_BYTEARRAY(1));
break; break;
case ParameterPackSizeType: case ParameterPackSizeType:
repr = CHILD_TO_BYTEARRAY(0); // TODO: What does this look like? repr = "sizeof...(" + CHILD_TO_BYTEARRAY(0) + ')';
break; break;
case PackExpansionType: case PackExpansionType:
repr = CHILD_TO_BYTEARRAY(0); // TODO: What does this look like? repr = CHILD_TO_BYTEARRAY(0) + "...";
break; break;
case ThrowType: case ThrowType:
repr.append("throw ").append(CHILD_TO_BYTEARRAY(0)); repr.append("throw ").append(CHILD_TO_BYTEARRAY(0));
@@ -2008,7 +2008,7 @@ bool TemplateArgNode::mangledRepresentationStartsWith(char c)
{ {
return TypeNode::mangledRepresentationStartsWith(c) return TypeNode::mangledRepresentationStartsWith(c)
|| ExprPrimaryNode::mangledRepresentationStartsWith(c) || ExprPrimaryNode::mangledRepresentationStartsWith(c)
|| c == 'X' || c == 'I'; || c == 'X' || c == 'J';
} }
/* /*
@@ -2021,7 +2021,7 @@ void TemplateArgNode::parse()
{ {
m_isTemplateArgumentPack = false; m_isTemplateArgumentPack = false;
char next = PEEK(); const char next = PEEK();
if (TypeNode::mangledRepresentationStartsWith(next)) { if (TypeNode::mangledRepresentationStartsWith(next)) {
PARSE_RULE_AND_ADD_RESULT_AS_CHILD(TypeNode); PARSE_RULE_AND_ADD_RESULT_AS_CHILD(TypeNode);
} else if (ExprPrimaryNode::mangledRepresentationStartsWith(next)) { } else if (ExprPrimaryNode::mangledRepresentationStartsWith(next)) {
@@ -2032,6 +2032,7 @@ void TemplateArgNode::parse()
if (ADVANCE() != 'E') if (ADVANCE() != 'E')
throw ParseException(QString::fromLatin1("Invalid template-arg")); throw ParseException(QString::fromLatin1("Invalid template-arg"));
} else if (next == 'J') { } else if (next == 'J') {
m_isTemplateArgumentPack = true;
ADVANCE(); ADVANCE();
while (TemplateArgNode::mangledRepresentationStartsWith(PEEK())) while (TemplateArgNode::mangledRepresentationStartsWith(PEEK()))
PARSE_RULE_AND_ADD_RESULT_AS_CHILD(TemplateArgNode); PARSE_RULE_AND_ADD_RESULT_AS_CHILD(TemplateArgNode);
@@ -2048,12 +2049,9 @@ QByteArray TemplateArgNode::toByteArray() const
{ {
if (m_isTemplateArgumentPack) { if (m_isTemplateArgumentPack) {
QByteArray repr; QByteArray repr;
for (int i = 0; i < childCount(); ++i) { for (int i = 0; i < childCount(); ++i)
if (i > 0 && i < childCount() - 1) repr.append(CHILD_TO_BYTEARRAY(i)).append(", ");
repr += ", "; // TODO: Probably not the right syntax return repr += "typename...";
repr += CHILD_TO_BYTEARRAY(i);
}
return repr;
} }
return CHILD_TO_BYTEARRAY(0); return CHILD_TO_BYTEARRAY(0);
} }
@@ -2402,7 +2400,7 @@ QByteArray TypeNode::toByteArray() const
if (qualPtrRefList.isEmpty()) { if (qualPtrRefList.isEmpty()) {
switch (currentNode->m_type) { switch (currentNode->m_type) {
case PackExpansionType: return CHILD_TO_BYTEARRAY(0); // TODO: What's the syntax? case PackExpansionType: return CHILD_TO_BYTEARRAY(0) + "...";
case VendorType: return pasteAllChildren(); case VendorType: return pasteAllChildren();
case OtherType: return pasteAllChildren(); case OtherType: return pasteAllChildren();
@@ -2463,6 +2461,7 @@ QByteArray TypeNode::qualPtrRefListToByteArray(const QList<const ParseTreeNode *
if (!repr.isEmpty()) if (!repr.isEmpty())
repr.prepend(' '); repr.prepend(' ');
repr.prepend("&&"); repr.prepend("&&");
break;
default: default:
DEMANGLER_ASSERT(false); DEMANGLER_ASSERT(false);
} }