diff options
| author | chriseth <chris@ethereum.org> | 2018-01-10 22:25:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 22:25:53 +0800 |
| commit | a75d5333d8ae614316b9c707e2022c2d144eaf33 (patch) | |
| tree | 24ae6722975b86c4702d12feb825f3e3aa8663c5 /libsolidity/codegen/CompilerContext.cpp | |
| parent | 2548228b365d56612e2f039f735be0fdf6ce0807 (diff) | |
| parent | 8b20a7cd53b04a4b3b3e26df4ddd9ad81d28bb1b (diff) | |
| download | dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.gz dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.bz2 dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.lz dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.xz dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.tar.zst dexon-solidity-a75d5333d8ae614316b9c707e2022c2d144eaf33.zip | |
Merge pull request #3317 from ethereum/looseStrictAsm
Split inline assembly into loose and strict flavour.
Diffstat (limited to 'libsolidity/codegen/CompilerContext.cpp')
| -rw-r--r-- | libsolidity/codegen/CompilerContext.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index ab10d7dd..7a88475a 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -319,14 +319,19 @@ void CompilerContext::appendInlineAssembly( ErrorList errors; ErrorReporter errorReporter(errors); auto scanner = make_shared<Scanner>(CharStream(_assembly), "--CODEGEN--"); - auto parserResult = assembly::Parser(errorReporter).parse(scanner); + auto parserResult = assembly::Parser(errorReporter, assembly::AsmFlavour::Strict).parse(scanner); #ifdef SOL_OUTPUT_ASM cout << assembly::AsmPrinter()(*parserResult) << endl; #endif assembly::AsmAnalysisInfo analysisInfo; bool analyzerResult = false; if (parserResult) - analyzerResult = assembly::AsmAnalyzer(analysisInfo, errorReporter, false, identifierAccess.resolve).analyze(*parserResult); + analyzerResult = assembly::AsmAnalyzer( + analysisInfo, + errorReporter, + assembly::AsmFlavour::Strict, + identifierAccess.resolve + ).analyze(*parserResult); if (!parserResult || !errorReporter.errors().empty() || !analyzerResult) { string message = |