annotate liboctave/str-vec.cc @ 14193:72aebe619641 stable rc-3-6-0-0

3.6.0-rc0 release candidate * configure.ac (AC_INIT): Version is now 3.6.0-rc0. (OCTAVE_RELEASE_DATE): Now 2012-01-10. (OCTAVE_API_VERSION_NUMBER): Now 47.
author John W. Eaton <jwe@octave.org>
date Tue, 10 Jan 2012 16:43:41 -0500
parents 72c96de7a403
children afa5e1d20671
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
1 /*
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
2
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 12964
diff changeset
3 Copyright (C) 1996-2012 John W. Eaton
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
4
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
6
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5894
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5894
diff changeset
10 option) any later version.
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
11
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
15 for more details.
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
16
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5894
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5894
diff changeset
19 <http://www.gnu.org/licenses/>.
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
20
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
21 */
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
22
2940
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
23 /*
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
24
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
25 The function string_vector::list_in_columns was adapted from a similar
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
26 function distributed in the GNU file utilities, copyright (C) 85, 88,
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
27 90, 91, 95, 1996 Free Software Foundation, Inc.
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
28
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
29 */
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
30
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
31 #ifdef HAVE_CONFIG_H
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
32 #include <config.h>
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
33 #endif
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
34
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3040
diff changeset
35 #include <iostream>
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
36 #include <string>
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
37
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
38 #include "cmd-edit.h"
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
39 #include "lo-utils.h"
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
40 #include "str-vec.h"
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
41
9582
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
42 // FIXME -- isn't there some STL trick that could be used to make this
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
43 // work for all STL containers of std::string objects?
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
44
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
45 string_vector::string_vector (const std::list<std::string>& lst)
5894
acf8b96ca9c9 [project @ 2006-07-16 22:15:44 by jwe]
jwe
parents: 5880
diff changeset
46 : Array<std::string> ()
5880
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
47 {
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
48 size_t n = lst.size ();
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
49
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
50 resize (n);
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
51
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
52 octave_idx_type i = 0;
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
53
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
54 for (std::list<std::string>::const_iterator p = lst.begin ();
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
55 p != lst.end ();
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
56 p++)
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
57 elem(i++) = *p;
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
58 }
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe]
jwe
parents: 5760
diff changeset
59
9582
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
60 string_vector::string_vector (const std::set<std::string>& lst)
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
61 : Array<std::string> ()
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
62 {
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
63 size_t n = lst.size ();
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
64
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
65 resize (n);
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
66
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
67 octave_idx_type i = 0;
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
68
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
69 for (std::set<std::string>::const_iterator p = lst.begin ();
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
70 p != lst.end ();
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
71 p++)
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
72 elem(i++) = *p;
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
73 }
bdcfb756d721 improve error messages for ambiguous graphics property names
John W. Eaton <jwe@octave.org>
parents: 8920
diff changeset
74
2493
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
75 // Create a string vector from a NULL terminated list of C strings.
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
76
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
77 string_vector::string_vector (const char * const *s)
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
78 : Array<std::string> ()
2493
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
79 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
80 octave_idx_type n = 0;
2493
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
81
10477
a9649f994b07 avoid segfault in string_vector constructor
John W. Eaton <jwe@octave.org>
parents: 10355
diff changeset
82 if (s)
a9649f994b07 avoid segfault in string_vector constructor
John W. Eaton <jwe@octave.org>
parents: 10355
diff changeset
83 {
a9649f994b07 avoid segfault in string_vector constructor
John W. Eaton <jwe@octave.org>
parents: 10355
diff changeset
84 const char * const *t = s;
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2941
diff changeset
85
10477
a9649f994b07 avoid segfault in string_vector constructor
John W. Eaton <jwe@octave.org>
parents: 10355
diff changeset
86 while (*t++)
a9649f994b07 avoid segfault in string_vector constructor
John W. Eaton <jwe@octave.org>
parents: 10355
diff changeset
87 n++;
a9649f994b07 avoid segfault in string_vector constructor
John W. Eaton <jwe@octave.org>
parents: 10355
diff changeset
88 }
2493
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
89
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
90 resize (n);
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
91
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
92 for (octave_idx_type i = 0; i < n; i++)
2493
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
93 elem (i) = s[i];
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
94 }
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
95
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
96 // Create a string vector from up to N C strings. Assumes that N is
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
97 // nonnegative.
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
98
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
99 string_vector::string_vector (const char * const *s, octave_idx_type n)
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
100 : Array<std::string> (dim_vector (n, 1))
2493
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
101 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
102 for (octave_idx_type i = 0; i < n; i++)
2493
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
103 elem (i) = s[i];
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
104 }
8ed4362aa0d6 [project @ 1996-11-11 02:35:04 by jwe]
jwe
parents: 1993
diff changeset
105
2941
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
106 string_vector&
8678
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
107 string_vector::sort (bool make_uniq)
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
108 {
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
109 // Don't use Array<std::string>::sort () to allow sorting in place.
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
110 octave_sort<std::string> lsort;
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
111 lsort.sort (Array<std::string>::fortran_vec (), length ());
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
112
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
113 if (make_uniq)
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
114 uniq ();
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
115
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
116 return *this;
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
117 }
e2b4c19c455c redo changeset 4238f2600a17 with fixes to sorting
Jaroslav Hajek <highegg@gmail.com>
parents: 8671
diff changeset
118 string_vector&
2941
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
119 string_vector::uniq (void)
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
120 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
121 octave_idx_type len = length ();
2941
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
122
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
123 if (len > 0)
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
124 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
125 octave_idx_type k = 0;
2941
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
126
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
127 for (octave_idx_type i = 1; i < len; i++)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
128 if (elem(i) != elem(k))
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
129 if (++k != i)
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
130 elem(k) = elem(i);
2941
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
131
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
132 if (len != ++k)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
133 resize (k);
2941
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
134 }
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
135
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
136 return *this;
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
137 }
b779a5b8aed4 [project @ 1997-05-08 02:14:34 by jwe]
jwe
parents: 2940
diff changeset
138
4392
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
139 string_vector&
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
140 string_vector::append (const std::string& s)
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
141 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
142 octave_idx_type len = length ();
4392
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
143
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
144 resize (len + 1);
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
145
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
146 elem(len) = s;
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
147
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
148 return *this;
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
149 }
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
150
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
151 string_vector&
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
152 string_vector::append (const string_vector& sv)
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
153 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
154 octave_idx_type len = length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
155 octave_idx_type sv_len = sv.length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
156 octave_idx_type new_len = len + sv_len;
4392
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
157
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
158 resize (new_len);
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
159
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
160 for (octave_idx_type i = 0; i < sv_len; i++)
4392
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
161 elem(len + i) = sv[i];
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
162
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
163 return *this;
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
164 }
dd108fa566fa [project @ 2003-04-26 17:00:24 by jwe]
jwe
parents: 4220
diff changeset
165
12964
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
166 std::string
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
167 string_vector::join (const std::string& sep) const
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
168 {
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
169 std::string retval;
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
170
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
171 octave_idx_type len = length ();
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
172
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
173 if (len > 0)
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
174 {
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
175 octave_idx_type i;
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
176
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
177 for (i = 0; i < len - 1; i++)
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
178 retval += elem(i) + sep;
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
179
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
180 retval += elem(i);
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
181 }
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
182
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
183 return retval;
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
184 }
8ec12d686796 new string_vector::join method
John W. Eaton <jwe@octave.org>
parents: 11570
diff changeset
185
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
186 char **
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
187 string_vector::c_str_vec (void) const
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
188 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
189 octave_idx_type len = length ();
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
190
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
191 char **retval = new char * [len + 1];
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
192
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
193 retval [len] = 0;
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
194
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
195 for (octave_idx_type i = 0; i < len; i++)
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
196 retval[i] = strsave (elem(i).c_str ());
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
197
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
198 return retval;
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
199 }
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
200
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
201 void
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
202 string_vector::delete_c_str_vec (const char * const *v)
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
203 {
5304
7b6edb02f8c9 [project @ 2005-04-25 16:36:32 by jwe]
jwe
parents: 5275
diff changeset
204 const char * const *p = v;
7b6edb02f8c9 [project @ 2005-04-25 16:36:32 by jwe]
jwe
parents: 5275
diff changeset
205
7b6edb02f8c9 [project @ 2005-04-25 16:36:32 by jwe]
jwe
parents: 5275
diff changeset
206 while (*p)
7b6edb02f8c9 [project @ 2005-04-25 16:36:32 by jwe]
jwe
parents: 5275
diff changeset
207 delete [] *p++;
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
208
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
209 delete [] v;
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
210 }
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2926
diff changeset
211
2940
c05d4e1a9bee [project @ 1997-05-06 16:40:51 by jwe]
jwe
parents: 2937
diff changeset
212 // Format a list in neat columns.
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
213
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
214 std::ostream&
5690
161ebd1f3410 [project @ 2006-03-17 06:17:24 by jwe]
jwe
parents: 5307
diff changeset
215 string_vector::list_in_columns (std::ostream& os, int width) const
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
216 {
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
217 // Compute the maximum name length.
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
218
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
219 octave_idx_type max_name_length = 0;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
220 octave_idx_type total_names = length ();
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
221
9831
737624cb7560 list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents: 9582
diff changeset
222 if (total_names == 0)
737624cb7560 list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents: 9582
diff changeset
223 {
737624cb7560 list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents: 9582
diff changeset
224 // List empty, remember to end output with a newline.
737624cb7560 list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents: 9582
diff changeset
225
737624cb7560 list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents: 9582
diff changeset
226 os << "\n";
737624cb7560 list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents: 9582
diff changeset
227 return os;
737624cb7560 list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents: 9582
diff changeset
228 }
737624cb7560 list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents: 9582
diff changeset
229
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
230 for (octave_idx_type i = 0; i < total_names; i++)
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
231 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
232 octave_idx_type name_length = elem (i).length ();
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
233 if (name_length > max_name_length)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
234 max_name_length = name_length;
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
235 }
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
236
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
237 // Allow at least two spaces between names.
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
238
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
239 max_name_length += 2;
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
240
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
241 // Calculate the maximum number of columns that will fit.
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
242
5690
161ebd1f3410 [project @ 2006-03-17 06:17:24 by jwe]
jwe
parents: 5307
diff changeset
243 octave_idx_type line_length
161ebd1f3410 [project @ 2006-03-17 06:17:24 by jwe]
jwe
parents: 5307
diff changeset
244 = (width <= 0) ? command_editor::terminal_cols () : width;
161ebd1f3410 [project @ 2006-03-17 06:17:24 by jwe]
jwe
parents: 5307
diff changeset
245
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
246 octave_idx_type nc = line_length / max_name_length;
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4397
diff changeset
247 if (nc == 0)
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4397
diff changeset
248 nc = 1;
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
249
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
250 // Calculate the number of rows that will be in each column except
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
251 // possibly for a short column on the right.
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
252
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
253 octave_idx_type nr = total_names / nc + (total_names % nc != 0);
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
254
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
255 // Recalculate columns based on rows.
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
256
4587
7b957b442818 [project @ 2003-11-10 15:50:39 by jwe]
jwe
parents: 4397
diff changeset
257 nc = total_names / nr + (total_names % nr != 0);
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
258
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
259 octave_idx_type count;
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
260 for (octave_idx_type row = 0; row < nr; row++)
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
261 {
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
262 count = row;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 4636
diff changeset
263 octave_idx_type pos = 0;
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
264
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
265 // Print the next row.
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
266
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
267 while (1)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
268 {
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
269 std::string nm = elem (count);
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
270
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
271 os << nm;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
272 octave_idx_type name_length = nm.length ();
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
273
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
274 count += nr;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
275 if (count >= total_names)
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
276 break;
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
277
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
278 octave_idx_type spaces_to_pad = max_name_length - name_length;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
279 for (octave_idx_type i = 0; i < spaces_to_pad; i++)
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
280 os << " ";
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
281 pos += max_name_length;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
282 }
1810
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
283 os << "\n";
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
284 }
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
285
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
286 return os;
f988f753ab52 [project @ 1996-01-29 07:30:21 by jwe]
jwe
parents:
diff changeset
287 }