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

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-08-23 15:52:15 +02:00
parent 888b7217cb 6a56990302
commit bc67246432
530 changed files with 9207 additions and 33307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libs/3rdparty/cplusplus/Parser.cpp vendored
View File

@@ -44,12 +44,10 @@ using namespace CPlusPlus;
namespace {
class DebugRule {
const char *name;
static int depth;
public:
DebugRule(const char *name, const char *spell, unsigned idx, bool blocked)
: name(name)
{
for (int i = 0; i <= depth; ++i)
fputc('-', stderr);
@@ -2878,7 +2876,12 @@ bool Parser::parseStringLiteral(ExpressionAST *&node)
|| LA() == T_WIDE_STRING_LITERAL
|| LA() == T_UTF8_STRING_LITERAL
|| LA() == T_UTF16_STRING_LITERAL
|| LA() == T_UTF32_STRING_LITERAL)) {
|| LA() == T_UTF32_STRING_LITERAL
|| LA() == T_RAW_STRING_LITERAL
|| LA() == T_RAW_WIDE_STRING_LITERAL
|| LA() == T_RAW_UTF8_STRING_LITERAL
|| LA() == T_RAW_UTF16_STRING_LITERAL
|| LA() == T_RAW_UTF32_STRING_LITERAL)) {
return false;
}
@@ -2888,7 +2891,12 @@ bool Parser::parseStringLiteral(ExpressionAST *&node)
|| LA() == T_WIDE_STRING_LITERAL
|| LA() == T_UTF8_STRING_LITERAL
|| LA() == T_UTF16_STRING_LITERAL
|| LA() == T_UTF32_STRING_LITERAL) {
|| LA() == T_UTF32_STRING_LITERAL
|| LA() == T_RAW_STRING_LITERAL
|| LA() == T_RAW_WIDE_STRING_LITERAL
|| LA() == T_RAW_UTF8_STRING_LITERAL
|| LA() == T_RAW_UTF16_STRING_LITERAL
|| LA() == T_RAW_UTF32_STRING_LITERAL) {
*ast = new (_pool) StringLiteralAST;
(*ast)->literal_token = consumeToken();
ast = &(*ast)->next;
@@ -4120,6 +4128,11 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
case T_UTF8_STRING_LITERAL:
case T_UTF16_STRING_LITERAL:
case T_UTF32_STRING_LITERAL:
case T_RAW_STRING_LITERAL:
case T_RAW_WIDE_STRING_LITERAL:
case T_RAW_UTF8_STRING_LITERAL:
case T_RAW_UTF16_STRING_LITERAL:
case T_RAW_UTF32_STRING_LITERAL:
return parseStringLiteral(node);
case T_NULLPTR: