--- trunk/src/utils/StringUtils.cpp 2011/05/11 16:32:48 1558 +++ trunk/src/utils/StringUtils.cpp 2013/06/16 15:15:42 1879 @@ -35,13 +35,26 @@ * * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). - * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). - * [4] Vardeman & Gezelter, in progress (2009). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ -#include +#include "config.h" +#include +#include +#include +#include +#include #include "utils/StringUtils.hpp" +#ifdef _MSC_VER +#define strcasecmp _stricmp +#define strdup _strdup +#define strtoull _strtoui64 +#endif + + namespace OpenMD { std::string UpperCase(const std::string& S) { std::string uc = S; @@ -97,7 +110,6 @@ namespace OpenMD { int foundText = 0; int lineNum; char* the_token; - char* eof_test; // rewind the stream theStream.seekg (0, std::ios::beg); @@ -171,11 +183,15 @@ namespace OpenMD { foo = strtok(working_line, " ,;\t"); if (foo != NULL) { + + if (!strcasecmp(foo, "end")) { + free(working_line); + return 1; + } - if (!strcasecmp(foo, "end")) return 1; - } + free(working_line); return 0; } @@ -217,7 +233,7 @@ namespace OpenMD { std::string getSuffix(const std::string& str) { return str.substr(0, str.find('.')); } - + bool isInteger(const std::string& str) { bool result = false; @@ -233,17 +249,49 @@ namespace OpenMD { return result; } - -bool CaseInsensitiveEquals(const char ch1, const char ch2) { - return std::toupper((unsigned char)ch1) == std::toupper((unsigned char)ch2); -} -size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2) { - std::string::const_iterator pos = std::search(str1.begin(), str1.end(), str2.begin(), str2.end(), CaseInsensitiveEquals); - if (pos == str1.end()) - return std::string::npos; - else - return pos - str1.begin(); -} - + bool CaseInsensitiveEquals(const char ch1, const char ch2) { + return std::toupper((unsigned char)ch1) == std::toupper((unsigned char)ch2); + } + + size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2) { + std::string::const_iterator pos = std::search(str1.begin(), str1.end(), str2.begin(), str2.end(), CaseInsensitiveEquals); + if (pos == str1.end()) + return std::string::npos; + else + return pos - str1.begin(); + } + + /** + * memparse - parse a string with mem suffixes into a number + * @param ptr: Where parse begins + * @param retptr: (output) Pointer to next char after parse completes + * + * Parses a string into a number. The number stored at @param ptr is + * potentially suffixed with %K (for kilobytes, or 1024 bytes), + * %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or + * 1073741824). If the number is suffixed with K, M, or G, then + * the return value is the number multiplied by one kilobyte, one + * megabyte, or one gigabyte, respectively. + */ + unsigned long long memparse (char *ptr, char **retptr) { + unsigned long long ret = strtoull (ptr, retptr, 0); + + switch (**retptr) { + case 'G': + case 'g': + ret <<= 10; + case 'M': + case 'm': + ret <<= 10; + case 'K': + case 'k': + ret <<= 10; + (*retptr)++; + default: + break; + } + return ret; + } + }