LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

core_read's ParseScript(): minor cleanups

Browse source 
- use .empty() rather than .size() == 0
- use a const_iterator rather than BOOST_FOREACH
- validate iterators before creating a string from them
This commit is contained in:
Cory Fields 2014-06-23 19:32:54 -04:00 • committed by Jeff Garzik
parent b2aeaa7939
commit 2a5840096f
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/core_read.cpp
View file

@ -21,7 +21,7 @@ CScript ParseScript(std::string s)
static map<string, opcodetype> mapOpNames; static map<string, opcodetype> mapOpNames;
if (mapOpNames.size() == 0) if (mapOpNames.empty())
{ {
for (int op = 0; op <= OP_NOP10; op++) for (int op = 0; op <= OP_NOP10; op++)
{ {
@ -43,36 +43,36 @@ CScript ParseScript(std::string s)
vector<string> words; vector<string> words;
split(words, s, is_any_of(" \t\n"), token_compress_on); split(words, s, is_any_of(" \t\n"), token_compress_on);
BOOST_FOREACH(string w, words) for (std::vector<std::string>::const_iterator w = words.begin(); w != words.end(); ++w)
{ {
if (w.size() == 0) 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 (all(w, is_digit()) || else if (all(*w, is_digit()) ||
(starts_with(w, "-") && all(string(w.begin()+1, w.end()), is_digit()))) (starts_with(*w, "-") && all(string(w->begin()+1, w->end()), is_digit())))
{ {
// Number // Number
int64_t n = atoi64(w); int64_t n = atoi64(*w);
result << n; result << n;
} }
else if (starts_with(w, "0x") && IsHex(string(w.begin()+2, w.end()))) else if (starts_with(*w, "0x") && (w->begin()+2 != w->end()) && IsHex(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(string(w.begin()+2, w.end())); std::vector<unsigned char> raw = ParseHex(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 && starts_with(w, "'") && ends_with(w, "'")) else if (w->size() >= 2 && starts_with(*w, "'") && ends_with(*w, "'"))
{ {
// 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 if (mapOpNames.count(w)) else if (mapOpNames.count(*w))
{ {
// opcode, e.g. OP_ADD or ADD: // opcode, e.g. OP_ADD or ADD:
result << mapOpNames[w]; result << mapOpNames[*w];
} }
else else
{ {