fixup! Review suggestions

ethereum · Sep 6, 2023 · 8b269ff · 8b269ff
1 parent 91025e0
commit 8b269ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/liblangutil/Token.h b/liblangutil/Token.h
@@ -328,7 +328,7 @@ namespace TokenTraits
 	{
 		return tok == Token::Assembly || tok == Token::Contract || tok == Token::External || tok == Token::Fallback ||
 			tok == Token::Pragma || tok == Token::Import || tok == Token::As || tok == Token::Function || tok == Token::Let ||
-			tok == Token::Return || tok == Token::Type || tok == Token::Bool || tok == Token::If || tok == Token::Else ||
+			tok == Token::Return || tok == Token::Type || tok == Token::If || tok == Token::Else ||
 			tok == Token::Do || tok == Token::While || tok == Token::For || tok == Token::Continue || tok == Token::Break;
 			// TODO: see isExperimentalSolidityKeyword below
 			// || (tok > Token::NonExperimentalEnd && tok < Token::ExperimentalEnd);

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
@@ -654,16 +654,13 @@ bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
 
 bool CompilerStack::analyzeExperimental()
 {
-	bool noErrors = true;
 	solAssert(!m_experimentalAnalysis);
 	m_experimentalAnalysis = std::make_unique<experimental::Analysis>(m_errorReporter);
 	std::vector<std::shared_ptr<SourceUnit const>> sourceAsts;
 	for (Source const* source: m_sourceOrder)
 		if (source->ast)
 			sourceAsts.emplace_back(source->ast);
-	if (!m_experimentalAnalysis->check(sourceAsts))
-		noErrors = false;
-	return noErrors;
+	return m_experimentalAnalysis->check(sourceAsts);
 }
 
 bool CompilerStack::parseAndAnalyze(State _stopAfter)