diff options
| author | chriseth <chris@ethereum.org> | 2017-05-30 22:45:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 22:45:36 +0800 |
| commit | 254b55728f66ea164e9085700a294ac4837f2029 (patch) | |
| tree | a4c464d4d40baaa260f071c1028f347bd287e44d /libsolidity/interface/AssemblyStack.cpp | |
| parent | 0066a08aa8f6c469cde7947ec50ca662a32123a0 (diff) | |
| parent | 89b60ffbd4c2dde26fa5e9f1d750729b5c89373e (diff) | |
| download | dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.tar.gz dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.tar.zst dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.zip | |
Merge pull request #2264 from roadriverrail/refactor_error_log
Refactor error reporting
Diffstat (limited to 'libsolidity/interface/AssemblyStack.cpp')
| -rw-r--r-- | libsolidity/interface/AssemblyStack.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp index c4bd63c4..b027ac3c 100644 --- a/libsolidity/interface/AssemblyStack.cpp +++ b/libsolidity/interface/AssemblyStack.cpp @@ -45,13 +45,13 @@ bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string { m_analysisSuccessful = false; m_scanner = make_shared<Scanner>(CharStream(_source), _sourceName); - m_parserResult = assembly::Parser(m_errors, m_language == Language::JULIA).parse(m_scanner); - if (!m_errors.empty()) + m_parserResult = assembly::Parser(m_errorReporter, m_language == Language::JULIA).parse(m_scanner); + if (!m_errorReporter.errors().empty()) return false; solAssert(m_parserResult, ""); m_analysisInfo = make_shared<assembly::AsmAnalysisInfo>(); - assembly::AsmAnalyzer analyzer(*m_analysisInfo, m_errors); + assembly::AsmAnalyzer analyzer(*m_analysisInfo, m_errorReporter); m_analysisSuccessful = analyzer.analyze(*m_parserResult); return m_analysisSuccessful; } @@ -66,7 +66,7 @@ eth::LinkerObject AssemblyStack::assemble(Machine _machine) { case Machine::EVM: { - auto assembly = assembly::CodeGenerator(m_errors).assemble(*m_parserResult, *m_analysisInfo); + auto assembly = assembly::CodeGenerator(m_errorReporter).assemble(*m_parserResult, *m_analysisInfo); return assembly.assemble(); } case Machine::EVM15: |