diff options
| author | chriseth <c@ethdev.com> | 2015-10-16 21:20:09 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-10-16 21:20:09 +0800 |
| commit | e5d473448bbe980594d5f923823f349731922de3 (patch) | |
| tree | 9f32c0bfa6c32fa341ebd112db4c32fddc732b53 | |
| parent | 52eaa477d4bd9ad2f591148727d1ac9fd500d283 (diff) | |
| parent | 7b56206a9809c12d9c6e94a0f1dd43f40506c9b5 (diff) | |
| download | dexon-solidity-e5d473448bbe980594d5f923823f349731922de3.tar.gz dexon-solidity-e5d473448bbe980594d5f923823f349731922de3.tar.zst dexon-solidity-e5d473448bbe980594d5f923823f349731922de3.zip | |
Merge pull request #144 from chriseth/doNotCatchInternalErrors
Do not catch InternalCompilerErrors as part of fatal error handling.
| -rw-r--r-- | libsolidity/CompilerStack.cpp | 4 | ||||
| -rw-r--r-- | libsolidity/NameAndTypeResolver.cpp | 10 | ||||
| -rw-r--r-- | libsolidity/Parser.cpp | 8 | ||||
| -rw-r--r-- | libsolidity/TypeChecker.cpp | 2 |
4 files changed, 15 insertions, 9 deletions
diff --git a/libsolidity/CompilerStack.cpp b/libsolidity/CompilerStack.cpp index 12e49b58..03120f66 100644 --- a/libsolidity/CompilerStack.cpp +++ b/libsolidity/CompilerStack.cpp @@ -104,7 +104,9 @@ bool CompilerStack::parse() for (auto& sourcePair: m_sources) { sourcePair.second.scanner->reset(); - sourcePair.second.ast = Parser(m_errors).parse(sourcePair.second.scanner); // todo check for errors + sourcePair.second.ast = Parser(m_errors).parse(sourcePair.second.scanner); + if (!sourcePair.second.ast) + solAssert(!Error::containsOnlyWarnings(m_errors), "Parser returned null but did not report error."); } if (!Error::containsOnlyWarnings(m_errors)) // errors while parsing. sould stop before type checking diff --git a/libsolidity/NameAndTypeResolver.cpp b/libsolidity/NameAndTypeResolver.cpp index abf0788a..edd0704d 100644 --- a/libsolidity/NameAndTypeResolver.cpp +++ b/libsolidity/NameAndTypeResolver.cpp @@ -49,8 +49,10 @@ bool NameAndTypeResolver::registerDeclarations(SourceUnit& _sourceUnit) { DeclarationRegistrationHelper registrar(m_scopes, _sourceUnit, m_errors); } - catch (FatalError) + catch (FatalError const& _e) { + if (m_errors.empty()) + throw; // Something is weird here, rather throw again. return false; } return true; @@ -124,6 +126,8 @@ bool NameAndTypeResolver::resolveNamesAndTypes(ContractDefinition& _contract) } catch (FatalError const& _e) { + if (m_errors.empty()) + throw; // Something is weird here, rather throw again. return false; } return true; @@ -136,8 +140,10 @@ bool NameAndTypeResolver::updateDeclaration(Declaration const& _declaration) m_scopes[nullptr].registerDeclaration(_declaration, false, true); solAssert(_declaration.scope() == nullptr, "Updated declaration outside global scope."); } - catch(FatalError const& _error) + catch (FatalError const& _error) { + if (m_errors.empty()) + throw; // Something is weird here, rather throw again. return false; } return true; diff --git a/libsolidity/Parser.cpp b/libsolidity/Parser.cpp index 1bb16b84..f7e17b42 100644 --- a/libsolidity/Parser.cpp +++ b/libsolidity/Parser.cpp @@ -88,12 +88,10 @@ ASTPointer<SourceUnit> Parser::parse(shared_ptr<Scanner> const& _scanner) } return nodeFactory.createNode<SourceUnit>(nodes); } - catch(FatalError const& _error) - { - return nullptr; - } - catch(Exception const& _e) + catch (FatalError const& _error) { + if (m_errors.empty()) + throw; // Something is weird here, rather throw again. return nullptr; } } diff --git a/libsolidity/TypeChecker.cpp b/libsolidity/TypeChecker.cpp index dcaecdfb..5ea5825d 100644 --- a/libsolidity/TypeChecker.cpp +++ b/libsolidity/TypeChecker.cpp @@ -43,7 +43,7 @@ bool TypeChecker::checkTypeRequirements(const ContractDefinition& _contract) if (m_errors.empty()) throw; // Something is weird here, rather throw again. } - return Error::containsOnlyWarnings(m_errors); + return Error::containsOnlyWarnings(m_errors); } TypePointer const& TypeChecker::type(Expression const& _expression) const |