From 8b269ffd23ed13c51aa8f5c9d289787aecb0d5f5 Mon Sep 17 00:00:00 2001 From: Matheus Aguiar Date: Wed, 6 Sep 2023 10:26:34 -0300 Subject: [PATCH] fixup! Review suggestions --- liblangutil/Token.h | 2 +- libsolidity/interface/CompilerStack.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/liblangutil/Token.h b/liblangutil/Token.h index 2159cedb7c79..00b4b90682be 100644 --- 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 index fc3c378d7a7a..44413afdf5f8 100644 --- 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(m_errorReporter); std::vector> 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)