diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-06-09 19:28:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-09 19:28:36 +0800 |
| commit | 3e91177c4d3966be32eea6b4b7b3a63058022dc7 (patch) | |
| tree | 287502ea0f3131d39ea07059a630534b01d2f043 /libsolidity/codegen/CompilerContext.cpp | |
| parent | 76667fed4f9865c4a3a5a267c469446f8bce1bef (diff) | |
| parent | 114c157b04f0ea1429b67d52c35e32f13c5ae9a4 (diff) | |
| download | dexon-solidity-3e91177c4d3966be32eea6b4b7b3a63058022dc7.tar dexon-solidity-3e91177c4d3966be32eea6b4b7b3a63058022dc7.tar.gz dexon-solidity-3e91177c4d3966be32eea6b4b7b3a63058022dc7.tar.bz2 dexon-solidity-3e91177c4d3966be32eea6b4b7b3a63058022dc7.tar.lz dexon-solidity-3e91177c4d3966be32eea6b4b7b3a63058022dc7.tar.xz dexon-solidity-3e91177c4d3966be32eea6b4b7b3a63058022dc7.tar.zst dexon-solidity-3e91177c4d3966be32eea6b4b7b3a63058022dc7.zip | |
Merge pull request #2359 from ethereum/remove-asmstack
Remove AsmStack
Diffstat (limited to 'libsolidity/codegen/CompilerContext.cpp')
| -rw-r--r-- | libsolidity/codegen/CompilerContext.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index 9c4fbcbb..d98efcad 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -25,8 +25,11 @@ #include <libsolidity/ast/AST.h> #include <libsolidity/codegen/Compiler.h> #include <libsolidity/interface/Version.h> -#include <libsolidity/inlineasm/AsmData.h> -#include <libsolidity/inlineasm/AsmStack.h> +#include <libsolidity/interface/ErrorReporter.h> +#include <libsolidity/inlineasm/AsmParser.h> +#include <libsolidity/inlineasm/AsmCodeGen.h> +#include <libsolidity/inlineasm/AsmAnalysis.h> +#include <libsolidity/inlineasm/AsmAnalysisInfo.h> #include <boost/algorithm/string/replace.hpp> @@ -302,7 +305,18 @@ void CompilerContext::appendInlineAssembly( } }; - solAssert(assembly::InlineAssemblyStack().parseAndAssemble(*assembly, *m_asm, identifierAccess), "Failed to assemble inline assembly block."); + ErrorList errors; + ErrorReporter errorReporter(errors); + auto scanner = make_shared<Scanner>(CharStream(*assembly), "--CODEGEN--"); + auto parserResult = assembly::Parser(errorReporter).parse(scanner); + solAssert(parserResult, "Failed to parse inline assembly block."); + solAssert(errorReporter.errors().empty(), "Failed to parse inline assembly block."); + + assembly::AsmAnalysisInfo analysisInfo; + assembly::AsmAnalyzer analyzer(analysisInfo, errorReporter, false, identifierAccess.resolve); + solAssert(analyzer.analyze(*parserResult), "Failed to analyze inline assembly block."); + solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block."); + assembly::CodeGenerator::assemble(*parserResult, analysisInfo, *m_asm, identifierAccess); } FunctionDefinition const& CompilerContext::resolveVirtualFunction( |