generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-13 18:45:10 +01:00
Code Issues Projects Releases Wiki Activity

CppParser fixes to support function try blocks and unions

Browse Source
This commit is contained in:
Guenter Obiltschnig 2014-07-01 07:13:05 +02:00
parent fb06f5b8aa
commit cecf7cdd1b
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CppParser/src/Parser.cpp
View File

@ -181,6 +181,7 @@ const Token* Parser::parseFile(const Token* pNext)
break; break;
case IdentifierToken::KW_STRUCT: case IdentifierToken::KW_STRUCT:
case IdentifierToken::KW_CLASS: case IdentifierToken::KW_CLASS:
case IdentifierToken::KW_UNION:
pNext = parseClass(pNext); pNext = parseClass(pNext);
break; break;
case IdentifierToken::KW_TEMPLATE: case IdentifierToken::KW_TEMPLATE:
@ -228,6 +229,7 @@ const Token* Parser::parseNameSpace(const Token* pNext)
break; break;
case IdentifierToken::KW_STRUCT: case IdentifierToken::KW_STRUCT:
case IdentifierToken::KW_CLASS: case IdentifierToken::KW_CLASS:
case IdentifierToken::KW_UNION:
pNext = parseClass(pNext); pNext = parseClass(pNext);
break; break;
case IdentifierToken::KW_TEMPLATE: case IdentifierToken::KW_TEMPLATE:
@ -264,7 +266,7 @@ const Token* Parser::parseClass(const Token* pNext)
const Token* Parser::parseClass(const Token* pNext, std::string& decl) const Token* Parser::parseClass(const Token* pNext, std::string& decl)
{ {
poco_assert (isKeyword(pNext, IdentifierToken::KW_CLASS) || isKeyword(pNext, IdentifierToken::KW_STRUCT)); poco_assert (isKeyword(pNext, IdentifierToken::KW_CLASS) || isKeyword(pNext, IdentifierToken::KW_STRUCT) || isKeyword(pNext, IdentifierToken::KW_UNION));
_pCurrentSymbol = 0; _pCurrentSymbol = 0;
bool isClass = isKeyword(pNext, IdentifierToken::KW_CLASS); bool isClass = isKeyword(pNext, IdentifierToken::KW_CLASS);
@ -384,6 +386,7 @@ const Token* Parser::parseClassMembers(const Token* pNext, Struct* pClass)
break; break;
case IdentifierToken::KW_STRUCT: case IdentifierToken::KW_STRUCT:
case IdentifierToken::KW_CLASS: case IdentifierToken::KW_CLASS:
case IdentifierToken::KW_UNION:
pNext = parseClass(pNext); pNext = parseClass(pNext);
break; break;
case IdentifierToken::KW_TEMPLATE: case IdentifierToken::KW_TEMPLATE:
@ -436,7 +439,7 @@ const Token* Parser::parseTemplate(const Token* pNext)
pNext = next(); pNext = next();
expectOperator(pNext, OperatorToken::OP_LT, "<"); expectOperator(pNext, OperatorToken::OP_LT, "<");
pNext = parseTemplateArgs(pNext, decl); pNext = parseTemplateArgs(pNext, decl);
if (isKeyword(pNext, IdentifierToken::KW_CLASS) || isKeyword(pNext, IdentifierToken::KW_STRUCT)) if (isKeyword(pNext, IdentifierToken::KW_CLASS) || isKeyword(pNext, IdentifierToken::KW_STRUCT) || isKeyword(pNext, IdentifierToken::KW_UNION))
return parseClass(pNext, decl); return parseClass(pNext, decl);
else else
return parseVarFunc(pNext, decl); return parseVarFunc(pNext, decl);
@ -649,6 +652,10 @@ const Token* Parser::parseFunc(const Token* pNext, std::string& decl)
if (pFunc) pFunc->makeFinal(); if (pFunc) pFunc->makeFinal();
pNext = next(); pNext = next();
} }
else if (isKeyword(pNext, IdentifierToken::KW_TRY))
{
break; // handled below
}
} }
if (isOperator(pNext, OperatorToken::OP_ASSIGN)) if (isOperator(pNext, OperatorToken::OP_ASSIGN))
{ {
@ -674,6 +681,32 @@ const Token* Parser::parseFunc(const Token* pNext, std::string& decl)
if (pFunc) if (pFunc)
pFunc->makeInline(); pFunc->makeInline();
} }
else if (isKeyword(pNext, IdentifierToken::KW_TRY))
{
pNext = next();
if (isOperator(pNext, OperatorToken::OP_OPENBRACE) || isOperator(pNext, OperatorToken::OP_COLON))
{
while (!isOperator(pNext, OperatorToken::OP_OPENBRACE) && !isEOF(pNext))
pNext = next();
pNext = parseBlock(pNext);
if (isKeyword(pNext, IdentifierToken::KW_CATCH))
{
while (!isOperator(pNext, OperatorToken::OP_OPENBRACE) && !isEOF(pNext))
pNext = next();
pNext = parseBlock(pNext);
}
else syntaxError("expected catch block");
if (!pFunc)
pFunc = dynamic_cast<Function*>(currentNameSpace()->lookup(name));
if (pFunc)
pFunc->makeInline();
}
else syntaxError("expected member initialization or block");
}
else else
{ {
expectOperator(pNext, OperatorToken::OP_SEMICOLON, ";"); expectOperator(pNext, OperatorToken::OP_SEMICOLON, ";");