cerc-io/solidity
10
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

Change EVMVersion namespace

Browse Source
This commit is contained in:
Bhargava Shastry 2020-01-07 22:20:56 +01:00
parent bb96d871e7
commit 31ef914d61
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/tools/ossfuzz/protoToYul.cpp
View File

@ -30,6 +30,7 @@
using namespace std; using namespace std;
using namespace solidity::yul::test::yul_fuzzer; using namespace solidity::yul::test::yul_fuzzer;
using namespace solidity::yul::test; using namespace solidity::yul::test;
using namespace solidity::langutil;
using namespace solidity::util; using namespace solidity::util;
using namespace solidity; using namespace solidity;
@ -86,26 +87,26 @@ string ProtoConverter::createAlphaNum(string const& _strBytes)
return tmp; return tmp;
} }
langutil::EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver) EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver)
{ {
switch (_ver) switch (_ver)
{ {
case Program::HOMESTEAD: case Program::HOMESTEAD:
return langutil::EVMVersion::homestead(); return EVMVersion::homestead();
case Program::TANGERINE: case Program::TANGERINE:
return langutil::EVMVersion::tangerineWhistle(); return EVMVersion::tangerineWhistle();
case Program::SPURIOUS: case Program::SPURIOUS:
return langutil::EVMVersion::spuriousDragon(); return EVMVersion::spuriousDragon();
case Program::BYZANTIUM: case Program::BYZANTIUM:
return langutil::EVMVersion::byzantium(); return EVMVersion::byzantium();
case Program::CONSTANTINOPLE: case Program::CONSTANTINOPLE:
return langutil::EVMVersion::constantinople(); return EVMVersion::constantinople();
case Program::PETERSBURG: case Program::PETERSBURG:
return langutil::EVMVersion::petersburg(); return EVMVersion::petersburg();
case Program::ISTANBUL: case Program::ISTANBUL:
return langutil::EVMVersion::istanbul(); return EVMVersion::istanbul();
case Program::BERLIN: case Program::BERLIN:
return langutil::EVMVersion::berlin(); return EVMVersion::berlin();
} }
} }

6
test/tools/ossfuzz/protoToYul.h
View File

@ -60,7 +60,7 @@ public:
std::string programToString(Program const& _input); std::string programToString(Program const& _input);
/// Returns evm version /// Returns evm version
langutil::EVMVersion version() solidity::langutil::EVMVersion version()
{ {
return m_evmVersion; return m_evmVersion;
} }
@ -281,7 +281,7 @@ private:
/// Returns an EVMVersion object corresponding to the protobuf /// Returns an EVMVersion object corresponding to the protobuf
/// enum of type Program_Version /// enum of type Program_Version
langutil::EVMVersion evmVersionMapping(Program_Version const& _x); solidity::langutil::EVMVersion evmVersionMapping(Program_Version const& _x);
/// Returns a monotonically increasing counter that starts from zero. /// Returns a monotonically increasing counter that starts from zero.
unsigned counter() unsigned counter()
@ -382,6 +382,6 @@ private:
/// block is enabled. /// block is enabled.
bool m_forInitScopeExtEnabled; bool m_forInitScopeExtEnabled;
/// Object that holds the targeted evm version specified by protobuf input /// Object that holds the targeted evm version specified by protobuf input
langutil::EVMVersion m_evmVersion; solidity::langutil::EVMVersion m_evmVersion;
}; };
} }

1
test/tools/ossfuzz/yulProtoFuzzer.cpp
View File

@ -29,6 +29,7 @@
using namespace solidity; using namespace solidity;
using namespace solidity::yul; using namespace solidity::yul;
using namespace solidity::yul::test::yul_fuzzer; using namespace solidity::yul::test::yul_fuzzer;
using namespace solidity::langutil;
using namespace std; using namespace std;
DEFINE_PROTO_FUZZER(Program const& _input) DEFINE_PROTO_FUZZER(Program const& _input)