Mercurial > hg > octave-thorsten

comparison liboctave/str-vec.cc @ 15018:3d8ace26c5b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding conventions for cuddled parentheses in liboctave/. * Array-util.cc, Array.cc, Array.h, CMatrix.cc, CNDArray.cc, CSparse.cc, CmplxQR.cc, CollocWt.cc, DASPK.cc, DASRT.cc, DASSL.cc, EIG.cc, LSODE.cc, MSparse.cc, MatrixType.cc, Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc, Sparse.h, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc, SparsedbleCHOL.cc, SparsedbleLU.cc, boolSparse.cc, cmd-hist.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dSparse.cc, data-conv.cc, dbleQR.cc, dbleSVD.cc, dim-vector.cc, eigs-base.cc, f2c-main.c, fCMatrix.cc, fCNDArray.cc, fCmplxQR.cc, fEIG.cc, fMatrix.cc, fNDArray.cc, floatQR.cc, floatSVD.cc, idx-vector.cc, kpse.cc, lo-specfun.cc, mx-inlines.cc, mx-op-defs.h, oct-alloc.cc, oct-binmap.h, oct-fftw.cc, oct-group.h, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.cc, oct-md5.cc, oct-rand.cc, oct-sort.cc, oct-syscalls.cc, randgamma.c, randmtzig.c, randpoisson.c, sparse-base-chol.cc, sparse-base-lu.cc, sparse-dmsolve.cc, str-vec.cc, str-vec.h, tempnam.c, tempname.c: Use Octave coding conventions for cuddled parentheses in liboctave/.
author Rik <rik@octave.org>
date Thu, 26 Jul 2012 08:13:22 -0700
parents afa5e1d20671
children
comparison
equal deleted inserted replaced
15017:dd4ad69e4ab9 15018:3d8ace26c5b4
52 octave_idx_type i = 0; 52 octave_idx_type i = 0;
53 53
54 for (std::list<std::string>::const_iterator p = lst.begin (); 54 for (std::list<std::string>::const_iterator p = lst.begin ();
55 p != lst.end (); 55 p != lst.end ();
56 p++) 56 p++)
57 elem(i++) = *p; 57 elem (i++) = *p;
58 } 58 }
59 59
60 string_vector::string_vector (const std::set<std::string>& lst) 60 string_vector::string_vector (const std::set<std::string>& lst)
61 : Array<std::string> () 61 : Array<std::string> ()
62 { 62 {
67 octave_idx_type i = 0; 67 octave_idx_type i = 0;
68 68
69 for (std::set<std::string>::const_iterator p = lst.begin (); 69 for (std::set<std::string>::const_iterator p = lst.begin ();
70 p != lst.end (); 70 p != lst.end ();
71 p++) 71 p++)
72 elem(i++) = *p; 72 elem (i++) = *p;
73 } 73 }
74 74
75 // Create a string vector from a NULL terminated list of C strings. 75 // Create a string vector from a NULL terminated list of C strings.
76 76
77 string_vector::string_vector (const char * const *s) 77 string_vector::string_vector (const char * const *s)
123 if (len > 0) 123 if (len > 0)
124 { 124 {
125 octave_idx_type k = 0; 125 octave_idx_type k = 0;
126 126
127 for (octave_idx_type i = 1; i < len; i++) 127 for (octave_idx_type i = 1; i < len; i++)
128 if (elem(i) != elem(k)) 128 if (elem (i) != elem (k))
129 if (++k != i) 129 if (++k != i)
130 elem(k) = elem(i); 130 elem (k) = elem (i);
131 131
132 if (len != ++k) 132 if (len != ++k)
133 resize (k); 133 resize (k);
134 } 134 }
135 135
141 { 141 {
142 octave_idx_type len = length (); 142 octave_idx_type len = length ();
143 143
144 resize (len + 1); 144 resize (len + 1);
145 145
146 elem(len) = s; 146 elem (len) = s;
147 147
148 return *this; 148 return *this;
149 } 149 }
150 150
151 string_vector& 151 string_vector&
156 octave_idx_type new_len = len + sv_len; 156 octave_idx_type new_len = len + sv_len;
157 157
158 resize (new_len); 158 resize (new_len);
159 159
160 for (octave_idx_type i = 0; i < sv_len; i++) 160 for (octave_idx_type i = 0; i < sv_len; i++)
161 elem(len + i) = sv[i]; 161 elem (len + i) = sv[i];
162 162
163 return *this; 163 return *this;
164 } 164 }
165 165
166 std::string 166 std::string
173 if (len > 0) 173 if (len > 0)
174 { 174 {
175 octave_idx_type i; 175 octave_idx_type i;
176 176
177 for (i = 0; i < len - 1; i++) 177 for (i = 0; i < len - 1; i++)
178 retval += elem(i) + sep; 178 retval += elem (i) + sep;
179 179
180 retval += elem(i); 180 retval += elem (i);
181 } 181 }
182 182
183 return retval; 183 return retval;
184 } 184 }
185 185
188 { 188 {
189 octave_idx_type len = length (); 189 octave_idx_type len = length ();
190 190
191 char **retval = new char * [len + 1]; 191 char **retval = new char * [len + 1];
192 192
193 retval [len] = 0; 193 retval[len] = 0;
194 194
195 for (octave_idx_type i = 0; i < len; i++) 195 for (octave_idx_type i = 0; i < len; i++)
196 retval[i] = strsave (elem(i).c_str ()); 196 retval[i] = strsave (elem (i).c_str ());
197 197
198 return retval; 198 return retval;
199 } 199 }
200 200
201 void 201 void