phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-25 02:33:24 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: Use C++11 range based for loop in ParseScript

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

20
src/core_read.cpp
View file

@ -59,17 +59,17 @@ 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 (std::vector<std::string>::const_iterator w = words.begin(); w != words.end(); ++w) 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
@ -80,23 +80,23 @@ CScript ParseScript(const std::string& s)
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);
} }
} }