# | Line 35 | Line 35 | |
---|---|---|
35 | * | |
36 | * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). | |
37 | * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). | |
38 | < | * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). |
39 | < | * [4] Vardeman & Gezelter, in progress (2009). |
38 | > | * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). |
39 | > | * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). |
40 | > | * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). |
41 | */ | |
42 | ||
43 | < | #include <algorithm> |
43 | > | #include "config.h" |
44 | > | #include <algorithm> |
45 | > | #include <stdlib.h> |
46 | > | #include <cctype> |
47 | > | #include <cstdlib> |
48 | > | #include <string> |
49 | #include "utils/StringUtils.hpp" | |
50 | ||
51 | + | #ifdef _MSC_VER |
52 | + | #define strcasecmp _stricmp |
53 | + | #define strdup _strdup |
54 | + | #define strtoull _strtoui64 |
55 | + | #endif |
56 | + | |
57 | + | |
58 | namespace OpenMD { | |
59 | std::string UpperCase(const std::string& S) { | |
60 | std::string uc = S; | |
# | Line 97 | Line 110 | namespace OpenMD { | |
110 | int foundText = 0; | |
111 | int lineNum; | |
112 | char* the_token; | |
100 | – | char* eof_test; |
113 | ||
114 | // rewind the stream | |
115 | theStream.seekg (0, std::ios::beg); | |
# | Line 171 | Line 183 | namespace OpenMD { | |
183 | foo = strtok(working_line, " ,;\t"); | |
184 | ||
185 | if (foo != NULL) { | |
186 | + | |
187 | + | if (!strcasecmp(foo, "end")) { |
188 | + | free(working_line); |
189 | + | return 1; |
190 | + | } |
191 | ||
175 | – | if (!strcasecmp(foo, "end")) return 1; |
176 | – | |
192 | } | |
193 | ||
194 | + | free(working_line); |
195 | return 0; | |
196 | } | |
197 | ||
# | Line 217 | Line 233 | namespace OpenMD { | |
233 | std::string getSuffix(const std::string& str) { | |
234 | return str.substr(0, str.find('.')); | |
235 | } | |
236 | < | |
236 | > | |
237 | bool isInteger(const std::string& str) { | |
238 | ||
239 | bool result = false; | |
# | Line 233 | Line 249 | namespace OpenMD { | |
249 | ||
250 | return result; | |
251 | } | |
236 | – | |
237 | – | bool CaseInsensitiveEquals(const char ch1, const char ch2) { |
238 | – | return std::toupper((unsigned char)ch1) == std::toupper((unsigned char)ch2); |
239 | – | } |
240 | – | |
241 | – | size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2) { |
242 | – | std::string::const_iterator pos = std::search(str1.begin(), str1.end(), str2.begin(), str2.end(), CaseInsensitiveEquals); |
243 | – | if (pos == str1.end()) |
244 | – | return std::string::npos; |
245 | – | else |
246 | – | return pos - str1.begin(); |
247 | – | } |
252 | ||
253 | + | bool CaseInsensitiveEquals(const char ch1, const char ch2) { |
254 | + | return std::toupper((unsigned char)ch1) == std::toupper((unsigned char)ch2); |
255 | + | } |
256 | + | |
257 | + | size_t CaseInsensitiveFind(const std::string& str1, const std::string& str2) { |
258 | + | std::string::const_iterator pos = std::search(str1.begin(), str1.end(), str2.begin(), str2.end(), CaseInsensitiveEquals); |
259 | + | if (pos == str1.end()) |
260 | + | return std::string::npos; |
261 | + | else |
262 | + | return pos - str1.begin(); |
263 | + | } |
264 | + | |
265 | /** | |
266 | < | * memparse - parse a string with mem suffixes into a number |
267 | < | * @ptr: Where parse begins |
268 | < | * @retptr: (output) Pointer to next char after parse completes |
266 | > | * memparse - parse a string with mem suffixes into a number |
267 | > | * @param ptr: Where parse begins |
268 | > | * @param retptr: (output) Pointer to next char after parse completes |
269 | * | |
270 | < | * Parses a string into a number. The number stored at @ptr is |
271 | < | * potentially suffixed with %K (for kilobytes, or 1024 bytes), |
272 | < | * %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or |
273 | < | * 1073741824). If the number is suffixed with K, M, or G, then |
274 | < | * the return value is the number multiplied by one kilobyte, one |
275 | < | * megabyte, or one gigabyte, respectively. |
270 | > | * Parses a string into a number. The number stored at @param ptr is |
271 | > | * potentially suffixed with %K (for kilobytes, or 1024 bytes), |
272 | > | * %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or |
273 | > | * 1073741824). If the number is suffixed with K, M, or G, then |
274 | > | * the return value is the number multiplied by one kilobyte, one |
275 | > | * megabyte, or one gigabyte, respectively. |
276 | */ | |
277 | unsigned long long memparse (char *ptr, char **retptr) { | |
278 | unsigned long long ret = strtoull (ptr, retptr, 0); | |
# | Line 277 | Line 293 | size_t CaseInsensitiveFind(const std::string& str1, co | |
293 | } | |
294 | return ret; | |
295 | } | |
296 | < | |
296 | > | |
297 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |