Merge pull request #11574 from ethereum/ParserBase

chriseth · web-flow · commit e4cf3713587d · 2021-06-23T13:16:56.000+02:00
[langutil] ParserBase: make advance() overridable and make sure it's used.
diff --git a/liblangutil/ParserBase.cpp b/liblangutil/ParserBase.cpp
@@ -89,7 +89,7 @@ void ParserBase::expectToken(Token _value, bool _advance)
 		_advance = false;
 	}
 	if (_advance)
-		m_scanner->next();
+		advance();
 }
 
 void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentNodeName, bool _advance)
@@ -102,7 +102,7 @@ void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentN
 		SourceLocation errorLoc = currentLocation();
 		int startPosition = errorLoc.start;
 		while (m_scanner->currentToken() != _value && m_scanner->currentToken() != Token::EOS)
-			m_scanner->next();
+			advance();
 
 		string const expectedToken = ParserBase::tokenName(_value);
 		if (m_scanner->currentToken() == Token::EOS)
@@ -126,7 +126,7 @@ void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentN
 	}
 
 	if (_advance)
-		m_scanner->next();
+		advance();
 }
 
 void ParserBase::increaseRecursionDepth()
diff --git a/liblangutil/ParserBase.h b/liblangutil/ParserBase.h
@@ -81,7 +81,7 @@ class ParserBase
 	Token peekNextToken() const;
 	std::string tokenName(Token _token);
 	std::string currentLiteral() const;
-	Token advance();
+	virtual Token advance();
 	///@}
 
 	/// Increases the recursion depth and throws an exception if it is too deep.
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ void ParserBase::expectToken(Token _value, bool _advance)`
`89`	`89`	`_advance = false;`
`90`	`90`	`}`
`91`	`91`	`if (_advance)`
`92`		`- m_scanner->next();`
	`92`	`+ advance();`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentNodeName, bool _advance)`
`@@ -102,7 +102,7 @@ void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentN`
`102`	`102`	`SourceLocation errorLoc = currentLocation();`
`103`	`103`	`int startPosition = errorLoc.start;`
`104`	`104`	`while (m_scanner->currentToken() != _value && m_scanner->currentToken() != Token::EOS)`
`105`		`- m_scanner->next();`
	`105`	`+ advance();`
`106`	`106`
`107`	`107`	`string const expectedToken = ParserBase::tokenName(_value);`
`108`	`108`	`if (m_scanner->currentToken() == Token::EOS)`
`@@ -126,7 +126,7 @@ void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentN`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`if (_advance)`
`129`		`- m_scanner->next();`
	`129`	`+ advance();`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`void ParserBase::increaseRecursionDepth()`