mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
4ee2114127
This commit is the culmination of several months of work to decouple Solidity from the webthree-umbrella so that it can be developed in parallel with cpp-ethereum (the Ethereum C++ runtime) and so that even for the Solidity unit-tests there is no hard-dependency onto the C++ runtime. The Tests-over-IPC refactoring was a major step in the same process which was already committed. This commit contains the following changes: - A subset of the CMake functionality in webthree-helpers was extracted and tailored for Solidity into ./cmake. Further cleanup is certainly possible. - A subset of the libdevcore functionality in libweb3core was extracted and tailored for Solidity into ./libdevcore. Further cleanup is certainly possible - The gas price constants in EVMSchedule were orphaned into libevmasm. - Some other refactorings and cleanups were made to sever unnecessary EVM dependencies in the Solidity unit-tests. - TravisCI and Appveyor support was added, covering builds and running of the unit-tests (Linux and macOS only for now) - A bug-fix was made to get the Tests-over-IPC running on macOS. - There are still reliability issues in the unit-tests, which need immediate attention. The Travis build has been flipped to run the unit-tests 5 times, to try to flush these out. - The Emscripten automation which was previously in webthree-umbrella was merged into the TravisCI automation here. - The development ZIP deployment step has been commented out, but we will want to read that ONLY for release branch. Further iteration on these changes will definitely be needed, but I feel these have got to sufficient maturity than holding them back further isn't winning us anything. It is go time :-)
108 lines
2.8 KiB
C++
108 lines
2.8 KiB
C++
/*
|
|
This file is part of cpp-ethereum.
|
|
|
|
cpp-ethereum is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
cpp-ethereum is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
/** @file CommonData.cpp
|
|
* @author Gav Wood <i@gavwood.com>
|
|
* @date 2014
|
|
*/
|
|
|
|
#include "CommonData.h"
|
|
#include <random>
|
|
|
|
#if defined(_MSC_VER)
|
|
#pragma warning(push)
|
|
#pragma warning(disable:4724) // potential mod by 0, line 78 of boost/random/uniform_int_distribution.hpp (boost 1.55)
|
|
#endif
|
|
#include <boost/random/uniform_int_distribution.hpp>
|
|
#if defined(_MSC_VER)
|
|
#pragma warning(pop)
|
|
#endif
|
|
#include "Exceptions.h"
|
|
using namespace std;
|
|
using namespace dev;
|
|
|
|
std::string dev::escaped(std::string const& _s, bool _all)
|
|
{
|
|
static const map<char, char> prettyEscapes{{'\r', 'r'}, {'\n', 'n'}, {'\t', 't'}, {'\v', 'v'}};
|
|
std::string ret;
|
|
ret.reserve(_s.size() + 2);
|
|
ret.push_back('"');
|
|
for (auto i: _s)
|
|
if (i == '"' && !_all)
|
|
ret += "\\\"";
|
|
else if (i == '\\' && !_all)
|
|
ret += "\\\\";
|
|
else if (prettyEscapes.count(i) && !_all)
|
|
{
|
|
ret += '\\';
|
|
ret += prettyEscapes.find(i)->second;
|
|
}
|
|
else if (i < ' ' || _all)
|
|
{
|
|
ret += "\\x";
|
|
ret.push_back("0123456789abcdef"[(uint8_t)i / 16]);
|
|
ret.push_back("0123456789abcdef"[(uint8_t)i % 16]);
|
|
}
|
|
else
|
|
ret.push_back(i);
|
|
ret.push_back('"');
|
|
return ret;
|
|
}
|
|
|
|
int dev::fromHex(char _i, WhenError _throw)
|
|
{
|
|
if (_i >= '0' && _i <= '9')
|
|
return _i - '0';
|
|
if (_i >= 'a' && _i <= 'f')
|
|
return _i - 'a' + 10;
|
|
if (_i >= 'A' && _i <= 'F')
|
|
return _i - 'A' + 10;
|
|
if (_throw == WhenError::Throw)
|
|
BOOST_THROW_EXCEPTION(BadHexCharacter() << errinfo_invalidSymbol(_i));
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
bytes dev::fromHex(std::string const& _s, WhenError _throw)
|
|
{
|
|
unsigned s = (_s.size() >= 2 && _s[0] == '0' && _s[1] == 'x') ? 2 : 0;
|
|
std::vector<uint8_t> ret;
|
|
ret.reserve((_s.size() - s + 1) / 2);
|
|
|
|
if (_s.size() % 2)
|
|
{
|
|
int h = fromHex(_s[s++], WhenError::DontThrow);
|
|
if (h != -1)
|
|
ret.push_back(h);
|
|
else if (_throw == WhenError::Throw)
|
|
BOOST_THROW_EXCEPTION(BadHexCharacter());
|
|
else
|
|
return bytes();
|
|
}
|
|
for (unsigned i = s; i < _s.size(); i += 2)
|
|
{
|
|
int h = fromHex(_s[i], WhenError::DontThrow);
|
|
int l = fromHex(_s[i + 1], WhenError::DontThrow);
|
|
if (h != -1 && l != -1)
|
|
ret.push_back((byte)(h * 16 + l));
|
|
else if (_throw == WhenError::Throw)
|
|
BOOST_THROW_EXCEPTION(BadHexCharacter());
|
|
else
|
|
return bytes();
|
|
}
|
|
return ret;
|
|
}
|