cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TestFramework: Merge Options.h into Common.h

Browse Source
This commit is contained in:
Mathias Baumann
2020-01-29 12:27:05 +01:00
parent 2f1f8e25c1
commit 00e4d13975
61 changed files with 244 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libyul/Common.cpp
+4 -4
View File
@@ -21,7 +21,7 @@
#include <test/libyul/Common.h>
#include <test/Options.h>
#include <test/Common.h>
#include <liblangutil/SourceReferenceFormatter.h>
@@ -48,7 +48,7 @@ namespace
{
Dialect const& defaultDialect(bool _yul)
{
return _yul ? yul::Dialect::yul() : yul::EVMDialect::strictAssemblyForEVM(solidity::test::Options::get().evmVersion());
return _yul ? yul::Dialect::yul() : yul::EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion());
}
}
@@ -64,9 +64,9 @@ void yul::test::printErrors(ErrorList const& _errors)
pair<shared_ptr<Block>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(string const& _source, bool _yul)
{
AssemblyStack stack(
solidity::test::Options::get().evmVersion(),
solidity::test::CommonOptions::get().evmVersion(),
_yul ? AssemblyStack::Language::Yul : AssemblyStack::Language::StrictAssembly,
solidity::test::Options::get().optimize ?
solidity::test::CommonOptions::get().optimize ?
solidity::frontend::OptimiserSettings::standard() :
solidity::frontend::OptimiserSettings::minimal()
);