generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 10:32:56 +01:00
Code Issues Projects Releases Wiki Activity

merge CppParser C++11 and other improvements from appinf

Browse Source
This commit is contained in:
Günter Obiltschnig
2019-11-16 19:01:02 +01:00
parent 03f22ded65
commit cc664cba89
8 changed files with 97 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CppParser/src/Parser.cpp
View File

@@ -161,7 +161,7 @@ void Parser::parse()
std::string m(exc.message());
std::string where(_currentPath);
where.append("(");
where.append(NumberFormatter::format(static_cast<int>(_istr.getCurrentLineNumber())));
where.append(NumberFormatter::format(_istr.getCurrentLineNumber()));
where.append(")");
throw SyntaxException(m, where);
}
@@ -493,6 +493,8 @@ const Token* Parser::parseUsing(const Token* pNext)
{
poco_assert (isKeyword(pNext, IdentifierToken::KW_USING));
_pCurrentSymbol = 0;
int line = _istr.getCurrentLineNumber();
pNext = next();
if (isKeyword(pNext, IdentifierToken::KW_NAMESPACE))
{
@@ -511,13 +513,32 @@ const Token* Parser::parseUsing(const Token* pNext)
{
std::string id;
pNext = parseIdentifier(pNext, id);
currentNameSpace()->importSymbol(id);
if (isOperator(pNext, OperatorToken::OP_ASSIGN))
{
pNext = next();
std::string decl("using ");
decl += id;
decl += " = ";
while (!isOperator(pNext, OperatorToken::OP_SEMICOLON) && !isEOF(pNext))
{
append(decl, pNext);
pNext = next();
}
TypeAlias* pTypeAlias = new TypeAlias(decl, currentNameSpace());
addSymbol(pTypeAlias, line);
}
else
{
currentNameSpace()->importSymbol(id);
}
}
}
if (!isOperator(pNext, OperatorToken::OP_SEMICOLON))
syntaxError("semicolon");
return next();
pNext = next();
_pCurrentSymbol = 0;
return pNext;
}