Browse Source

Fixed isPrint.

Branimir Karadžić 8 years ago
parent
commit
b6ecee0d7d
2 changed files with 10 additions and 5 deletions
  1. 1 1
      src/debug.cpp
  2. 9 4
      src/string.cpp

+ 1 - 1
src/debug.cpp

@@ -125,7 +125,7 @@ namespace bx
 					ascii[asciiPos] = '\0';
 					ascii[asciiPos] = '\0';
 					debugPrintf("\t" DBG_ADDRESS "\t" HEX_DUMP_FORMAT "\t%s\n", data, hex, ascii);
 					debugPrintf("\t" DBG_ADDRESS "\t" HEX_DUMP_FORMAT "\t%s\n", data, hex, ascii);
 					data += asciiPos;
 					data += asciiPos;
-					hexPos = 0;
+					hexPos   = 0;
 					asciiPos = 0;
 					asciiPos = 0;
 				}
 				}
 			}
 			}

+ 9 - 4
src/string.cpp

@@ -25,14 +25,19 @@ namespace bx
 			;
 			;
 	}
 	}
 
 
+	inline bool isInRange(char _ch, char _from, char _to)
+	{
+		return unsigned(_ch - _from) < unsigned(_to-_from);
+	}
+
 	bool isUpper(char _ch)
 	bool isUpper(char _ch)
 	{
 	{
-		return _ch >= 'A' && _ch <= 'Z';
+		return isInRange(_ch, 'A', 'Z');
 	}
 	}
 
 
 	bool isLower(char _ch)
 	bool isLower(char _ch)
 	{
 	{
-		return _ch >= 'a' && _ch <= 'z';
+		return isInRange(_ch, 'a', 'z');
 	}
 	}
 
 
 	bool isAlpha(char _ch)
 	bool isAlpha(char _ch)
@@ -42,7 +47,7 @@ namespace bx
 
 
 	bool isNumeric(char _ch)
 	bool isNumeric(char _ch)
 	{
 	{
-		return _ch >= '0' && _ch <= '9';
+		return isInRange(_ch, '0', '9');
 	}
 	}
 
 
 	bool isAlphaNum(char _ch)
 	bool isAlphaNum(char _ch)
@@ -52,7 +57,7 @@ namespace bx
 
 
 	bool isPrint(char _ch)
 	bool isPrint(char _ch)
 	{
 	{
-		return isAlphaNum(_ch) || isSpace(_ch);
+		return isInRange(_ch, ' ', '~');
 	}
 	}
 
 
 	char toLower(char _ch)
 	char toLower(char _ch)