ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/utils/StringUtils.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/utils/StringUtils.cpp (file contents):
Revision 1590 by gezelter, Mon Oct 18 16:29:53 2004 UTC vs.
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC

# Line 1 | Line 1
1 + /*
2 + * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 + *
4 + * The University of Notre Dame grants you ("Licensee") a
5 + * non-exclusive, royalty free, license to use, modify and
6 + * redistribute this software in source and binary code form, provided
7 + * that the following conditions are met:
8 + *
9 + * 1. Acknowledgement of the program authors must be made in any
10 + *    publication of scientific results based in part on use of the
11 + *    program.  An acceptable form of acknowledgement is citation of
12 + *    the article in which the program was described (Matthew
13 + *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 + *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 + *    Parallel Simulation Engine for Molecular Dynamics,"
16 + *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 + *
18 + * 2. Redistributions of source code must retain the above copyright
19 + *    notice, this list of conditions and the following disclaimer.
20 + *
21 + * 3. Redistributions in binary form must reproduce the above copyright
22 + *    notice, this list of conditions and the following disclaimer in the
23 + *    documentation and/or other materials provided with the
24 + *    distribution.
25 + *
26 + * This software is provided "AS IS," without a warranty of any
27 + * kind. All express or implied conditions, representations and
28 + * warranties, including any implied warranty of merchantability,
29 + * fitness for a particular purpose or non-infringement, are hereby
30 + * excluded.  The University of Notre Dame and its licensors shall not
31 + * be liable for any damages suffered by licensee as a result of
32 + * using, modifying or distributing the software or its
33 + * derivatives. In no event will the University of Notre Dame or its
34 + * licensors be liable for any lost revenue, profit or data, or for
35 + * direct, indirect, special, consequential, incidental or punitive
36 + * damages, however caused and regardless of the theory of liability,
37 + * arising out of the use of or inability to use software, even if the
38 + * University of Notre Dame has been advised of the possibility of
39 + * such damages.
40 + */
41 +
42   #include "utils/StringUtils.hpp"
43  
44 < using namespace std;
45 < using namespace oopse;
46 <
6 < string UpperCase(const string& S) {
7 <  string uc = S;
44 > namespace oopse {
45 > std::string UpperCase(const std::string& S) {
46 >  std::string uc = S;
47    unsigned int n = uc.size();
48    for (unsigned int j = 0; j < n; j++) {  
49      char sj = uc[j];
# Line 13 | Line 52 | string LowerCase(const string& S) {
52    return uc;
53   }
54  
55 < string LowerCase(const string& S) {
56 <  string lc = S;
55 > std::string LowerCase(const std::string& S) {
56 >  std::string lc = S;
57    unsigned int n = lc.size();
58    for (unsigned int j = 0; j < n; j++) {
59      char sj = lc[j];
# Line 23 | Line 62 | int findBegin(istream theStream, char* startText ){
62    return lc;
63   }
64  
65 < int findBegin(istream theStream, char* startText ){
65 > char* trimSpaces(char *str) {
66 >  size_t len;
67 >  char *right, *left;
68 >
69 >  if (strlen(str) == 0) return(str);
70 >  
71 >  /* Trim whitespace from left side */
72 >  for (left = str; isspace(*left); left++);
73 >
74 >  /* Trim whitespace from right side */
75 >  if ((len = strlen(left)))
76 >    {
77 >      right = left + (len - 1);
78 >      
79 >      while (isspace(*right))
80 >        {
81 >          *right = '\0';
82 >          right--;
83 >        }
84 >    }
85 >
86 >  /* Only do the str copy if there were spaces to the left */
87 >  if (left != str)
88 >    strcpy(str, left);
89 >  
90 >  return (str);
91 > }
92 >
93 > int findBegin(std::istream &theStream, char* startText ){
94    const int MAXLEN = 1024;
95    char readLine[MAXLEN];  
96    int foundText = 0;
# Line 32 | Line 99 | int findBegin(istream theStream, char* startText ){
99    char* eof_test;
100  
101    // rewind the stream
102 <  theStream.seekg (0, ios::beg);
102 >  theStream.seekg (0, std::ios::beg);
103    lineNum = 0;
104    
105    if (!theStream.eof()) {
# Line 50 | Line 117 | int findBegin(istream theStream, char* startText ){
117               "stream ended unexpectedly.\n", lineNum);
118        return -1;
119      }
120 <
120 >    
121      the_token = strtok( readLine, " ,;\t" );
122 <
123 <    if (!strcasecmp("begin", the_token)) {
124 <      the_token = TrimSpaces(strtok( NULL, " ,;\t" ));
125 <      foundText = !strcasecmp( startText, the_token );
126 <    }
127 <
122 >    if ( the_token != NULL)
123 >      if (!strcasecmp("begin", the_token)) {
124 >        the_token = strtok( NULL, " ,;\t" );
125 >        if ( the_token != NULL){
126 >          foundText = !strcasecmp( startText, the_token );
127 >        }
128 >      }
129 >    
130      if (!foundText) {
131        if (!theStream.eof()) {
132          theStream.getline(readLine, MAXLEN);
# Line 65 | Line 134 | int findBegin(istream theStream, char* startText ){
134        } else {
135          printf( "Error fast forwarding stream at line %d: "
136                  "stream ended unexpectedly.\n", lineNum);
137 <        return -1;
137 >        return -1;
138        }
139      }
140    }
# Line 92 | Line 161 | char* TrimSpaces(char *str) {
161    return(ntokens);
162   }
163  
95 – char* TrimSpaces(char *str) {
96 –  size_t len;
97 –  char *right, *left;
98 –  
99 –  if (strlen(str) == 0) return(str);
100 –  
101 –  /* Trim whitespace from left side */
102 –  for (left = str; isspace(*left); left++);
103 –  
104 –  /* Trim whitespace from right side */
105 –  if ((len = strlen(left)))
106 –    {
107 –      right = left + (len - 1);
108 –      
109 –      while (isspace(*right))
110 –        {
111 –          *right = '\0';
112 –          right--;
113 –        }
114 –    }
115 –  
116 –  /* Only do the str copy if their was spaces to the left */
117 –  if (left != str)
118 –    strcpy(str, left);
119 –  
120 –  return (str);
121 – }
122 –
164   int isEndLine(char *line) {
165    char *working_line;
166    char *foo;
# Line 128 | Line 169 | int isEndLine(char *line) {
169    
170    foo = strtok(working_line, " ,;\t");
171  
172 < if (!strcasecmp(foo, "end")) return 1;
172 >  if (foo != NULL) {
173 >
174 >    if (!strcasecmp(foo, "end")) return 1;
175 >
176 >  }
177  
178   return 0;
179   }
180 +
181 +
182 + std::string getPrefix(const std::string& str) {
183 +  return str.substr(0, str.rfind('.'));
184 + }
185 +
186 + std::string getSuffix(const std::string& str) {
187 +    return str.substr(0, str.find('.'));
188 + }
189 +
190 + }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines