refactor: Replace use of atoi64 in core_read

laanwj · laanwj · commit e4aa1f77b16c · 2019-11-05T21:14:56.000+01:00
Replace use of atoi64 and circuitois way to test if something is a
valid 64-bit integer, with the use of our own function `ParseInt64`.
diff --git a/src/core_read.cpp b/src/core_read.cpp
@@ -50,15 +50,14 @@ CScript ParseScript(const std::string& s)
 
     for (std::vector<std::string>::const_iterator w = words.begin(); w != words.end(); ++w)
     {
+        int64_t n;
         if (w->empty())
         {
             // Empty string, ignore. (boost::split given '' will return one word)
         }
-        else if (std::all_of(w->begin(), w->end(), ::IsDigit) ||
-            (w->front() == '-' && w->size() > 1 && std::all_of(w->begin()+1, w->end(), ::IsDigit)))
+        else if (ParseInt64(*w, &n))
         {
             // Number
-            int64_t n = atoi64(*w);
             result << n;
         }
         else if (w->substr(0,2) == "0x" && w->size() > 2 && IsHex(std::string(w->begin()+2, w->end())))

Original file line number	Diff line number	Diff line change
`@@ -50,15 +50,14 @@ CScript ParseScript(const std::string& s)`
`50`	`50`
`51`	`51`	`for (std::vector<std::string>::const_iterator w = words.begin(); w != words.end(); ++w)`
`52`	`52`	`{`
	`53`	`+ int64_t n;`
`53`	`54`	`if (w->empty())`
`54`	`55`	`{`
`55`	`56`	`// Empty string, ignore. (boost::split given '' will return one word)`
`56`	`57`	`}`
`57`		`- else if (std::all_of(w->begin(), w->end(), ::IsDigit) \|\|`
`58`		`- (w->front() == '-' && w->size() > 1 && std::all_of(w->begin()+1, w->end(), ::IsDigit)))`
	`58`	`+ else if (ParseInt64(*w, &n))`
`59`	`59`	`{`
`60`	`60`	`// Number`
`61`		`- int64_t n = atoi64(*w);`
`62`	`61`	`result << n;`
`63`	`62`	`}`
`64`	`63`	`else if (w->substr(0,2) == "0x" && w->size() > 2 && IsHex(std::string(w->begin()+2, w->end())))`