mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 15:04:44 +01:00
Code Issues Projects Releases Wiki Activity

style: Fix whitespace in Parse* functions

Browse source
This commit is contained in:
MarcoFalke 2021-10-08 15:39:19 +02:00
parent fa03dec7e9
commit fa053c0019
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/core_read.cpp
View file

@ -26,20 +26,20 @@ opcodetype ParseOpCode(const std::string& s)
{ {
static std::map<std::string, opcodetype> mapOpNames; static std::map<std::string, opcodetype> mapOpNames;
if (mapOpNames.empty()) if (mapOpNames.empty()) {
{ for (unsigned int op = 0; op <= MAX_OPCODE; op++) {
for (unsigned int op = 0; op <= MAX_OPCODE; op++)
{
// Allow OP_RESERVED to get into mapOpNames // Allow OP_RESERVED to get into mapOpNames
if (op < OP_NOP && op != OP_RESERVED) if (op < OP_NOP && op != OP_RESERVED) {
continue; continue;
}
std::string strName = GetOpName(static_cast<opcodetype>(op)); std::string strName = GetOpName(static_cast<opcodetype>(op));
if (strName == "OP_UNKNOWN") if (strName == "OP_UNKNOWN") {
continue; continue;
}
mapOpNames[strName] = static_cast<opcodetype>(op); mapOpNames[strName] = static_cast<opcodetype>(op);
// Convenience: OP_ADD and just ADD are both recognized: // Convenience: OP_ADD and just ADD are both recognized:
if (strName.compare(0, 3, "OP_") == 0) { // strName starts with "OP_" if (strName.compare(0, 3, "OP_") == 0) { // strName starts with "OP_"
mapOpNames[strName.substr(3)] = static_cast<opcodetype>(op); mapOpNames[strName.substr(3)] = static_cast<opcodetype>(op);
} }
} }
@ -59,42 +59,33 @@ CScript ParseScript(const std::string& s)
std::vector<std::string> words; std::vector<std::string> words;
boost::algorithm::split(words, s, boost::algorithm::is_any_of(" \t\n"), boost::algorithm::token_compress_on); boost::algorithm::split(words, s, boost::algorithm::is_any_of(" \t\n"), boost::algorithm::token_compress_on);
for (const std::string& w : words) for (const std::string& w : words) {
{ if (w.empty()) {
if (w.empty())
{
// Empty string, ignore. (boost::split given '' will return one word) // Empty string, ignore. (boost::split given '' will return one word)
} } else if (std::all_of(w.begin(), w.end(), ::IsDigit) ||
else if (std::all_of(w.begin(), w.end(), ::IsDigit) || (w.front() == '-' && w.size() > 1 && std::all_of(w.begin() + 1, w.end(), ::IsDigit)))
(w.front() == '-' && w.size() > 1 && std::all_of(w.begin()+1, w.end(), ::IsDigit)))
{ {
// Number // Number
int64_t n = LocaleIndependentAtoi<int64_t>(w); int64_t n = LocaleIndependentAtoi<int64_t>(w);
//limit the range of numbers ParseScript accepts in decimal // limit the range of numbers ParseScript accepts in decimal
//since numbers outside -0xFFFFFFFF...0xFFFFFFFF are illegal in scripts // since numbers outside -0xFFFFFFFF...0xFFFFFFFF are illegal in scripts
if (n > int64_t{0xffffffff} || n < -1 * int64_t{0xffffffff}) { if (n > int64_t{0xffffffff} || n < -1 * int64_t{0xffffffff}) {
throw std::runtime_error("script parse error: decimal numeric value only allowed in the " throw std::runtime_error("script parse error: decimal numeric value only allowed in the "
"range -0xFFFFFFFF...0xFFFFFFFF"); "range -0xFFFFFFFF...0xFFFFFFFF");
} }
result << n; result << n;
} } else if (w.substr(0, 2) == "0x" && w.size() > 2 && IsHex(std::string(w.begin() + 2, w.end()))) {
else if (w.substr(0,2) == "0x" && w.size() > 2 && IsHex(std::string(w.begin()+2, w.end())))
{
// Raw hex data, inserted NOT pushed onto stack: // Raw hex data, inserted NOT pushed onto stack:
std::vector<unsigned char> raw = ParseHex(std::string(w.begin()+2, w.end())); std::vector<unsigned char> raw = ParseHex(std::string(w.begin() + 2, w.end()));
result.insert(result.end(), raw.begin(), raw.end()); result.insert(result.end(), raw.begin(), raw.end());
} } else if (w.size() >= 2 && w.front() == '\'' && w.back() == '\'') {
else if (w.size() >= 2 && w.front() == '\'' && w.back() == '\'')
{
// Single-quoted string, pushed as data. NOTE: this is poor-man's // Single-quoted string, pushed as data. NOTE: this is poor-man's
// parsing, spaces/tabs/newlines in single-quoted strings won't work. // parsing, spaces/tabs/newlines in single-quoted strings won't work.
std::vector<unsigned char> value(w.begin()+1, w.end()-1); std::vector<unsigned char> value(w.begin() + 1, w.end() - 1);
result << value; result << value;
} } else {
else
{
// opcode, e.g. OP_ADD or ADD: // opcode, e.g. OP_ADD or ADD:
result << ParseOpCode(w); result << ParseOpCode(w);
} }