Extract new function MathLib::isDec() our of isInt()

amai2012 · amai2012 · commit 6da650891391 · 2014-04-11T22:15:25.000+02:00
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
@@ -397,13 +397,8 @@ bool MathLib::isBin(const std::string& s)
     return state == DIGITS;
 }
 
-bool MathLib::isInt(const std::string & s)
+bool MathLib::isDec(const std::string & s)
 {
-    // check for two known types: hexadecimal and octal
-    if (isHex(s) || isOct(s)) {
-        return true;
-    }
-
     enum {START, PLUSMINUS, DIGIT, SUFFIX} state = START;
     for (std::string::const_iterator it = s.begin(); it != s.end(); ++it) {
         switch (state) {
@@ -434,6 +429,11 @@ bool MathLib::isInt(const std::string & s)
     return state == DIGIT;
 }
 
+bool MathLib::isInt(const std::string & s)
+{
+    return isDec(s) || isHex(s) || isOct(s);
+}
+
 std::string MathLib::add(const std::string & first, const std::string & second)
 {
     if (MathLib::isInt(first) && MathLib::isInt(second)) {
diff --git a/lib/mathlib.h b/lib/mathlib.h
@@ -47,6 +47,7 @@ class CPPCHECKLIB MathLib {
     static bool isFloat(const std::string &str);
     static bool isNegative(const std::string &str);
     static bool isPositive(const std::string &str);
+    static bool isDec(const std::string & str);
     static bool isHex(const std::string& str);
     static bool isOct(const std::string& str);
     static bool isBin(const std::string& str);

Original file line number	Diff line number	Diff line change
`@@ -397,13 +397,8 @@ bool MathLib::isBin(const std::string& s)`
`397`	`397`	`return state == DIGITS;`
`398`	`398`	`}`
`399`	`399`
`400`		`-bool MathLib::isInt(const std::string & s)`
	`400`	`+bool MathLib::isDec(const std::string & s)`
`401`	`401`	`{`
`402`		`- // check for two known types: hexadecimal and octal`
`403`		`- if (isHex(s) \|\| isOct(s)) {`
`404`		`- return true;`
`405`		`- }`
`406`		`-`
`407`	`402`	`enum {START, PLUSMINUS, DIGIT, SUFFIX} state = START;`
`408`	`403`	`for (std::string::const_iterator it = s.begin(); it != s.end(); ++it) {`
`409`	`404`	`switch (state) {`
`@@ -434,6 +429,11 @@ bool MathLib::isInt(const std::string & s)`
`434`	`429`	`return state == DIGIT;`
`435`	`430`	`}`
`436`	`431`
	`432`	`+bool MathLib::isInt(const std::string & s)`
	`433`	`+{`
	`434`	`+ return isDec(s) \|\| isHex(s) \|\| isOct(s);`
	`435`	`+}`
	`436`	`+`
`437`	`437`	`std::string MathLib::add(const std::string & first, const std::string & second)`
`438`	`438`	`{`
`439`	`439`	`if (MathLib::isInt(first) && MathLib::isInt(second)) {`