diff options
| author | chriseth <chris@ethereum.org> | 2018-05-04 18:50:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 18:50:12 +0800 |
| commit | 81d61ca086e8e45108b7989e7f1494d90077401e (patch) | |
| tree | 7ed329c24ea5d5082c325e9ebc270b9b9c31dbc6 /libsolidity/parsing/ParserBase.cpp | |
| parent | a244f1a383ad46e9f789d66434a6828db0021f11 (diff) | |
| parent | ed9f80690bde53e56c6ef5cb046fb20713f3f780 (diff) | |
| download | dexon-solidity-81d61ca086e8e45108b7989e7f1494d90077401e.tar dexon-solidity-81d61ca086e8e45108b7989e7f1494d90077401e.tar.gz dexon-solidity-81d61ca086e8e45108b7989e7f1494d90077401e.tar.bz2 dexon-solidity-81d61ca086e8e45108b7989e7f1494d90077401e.tar.lz dexon-solidity-81d61ca086e8e45108b7989e7f1494d90077401e.tar.xz dexon-solidity-81d61ca086e8e45108b7989e7f1494d90077401e.tar.zst dexon-solidity-81d61ca086e8e45108b7989e7f1494d90077401e.zip | |
Merge pull request #4059 from ethereum/parser-simplify
Simplify the parser expectations
Diffstat (limited to 'libsolidity/parsing/ParserBase.cpp')
| -rw-r--r-- | libsolidity/parsing/ParserBase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libsolidity/parsing/ParserBase.cpp b/libsolidity/parsing/ParserBase.cpp index 5b83c5bd..617a1779 100644 --- a/libsolidity/parsing/ParserBase.cpp +++ b/libsolidity/parsing/ParserBase.cpp @@ -63,7 +63,7 @@ Token::Value ParserBase::advance() return m_scanner->next(); } -void ParserBase::expectToken(Token::Value _value) +void ParserBase::expectToken(Token::Value _value, bool _advance) { Token::Value tok = m_scanner->currentToken(); if (tok != _value) @@ -98,7 +98,8 @@ void ParserBase::expectToken(Token::Value _value) string("'") ); } - m_scanner->next(); + if (_advance) + m_scanner->next(); } void ParserBase::increaseRecursionDepth() |