Mercurial > hg > octave-nkf
annotate liboctave/str-vec.cc @ 12733:b67c2d580a25 stable
maint: clean up top-level directory
* build-aux/bootstrap: Rename from bootstrap.
* build-aux/bootstrap.conf: Rename from bootstrap.conf.
* build-aux/changelog.tmpl: Rename from changelog.tmpl.
* build-aux/bootstrap.conf: Update for new file locations.
* build-aux/common.mk: Rename from common.mk.
* build-aux/diff-template: Rename from diff-template.
* build-aux/mk-opts.pl: Rename from mk-opts.pl.
* build-aux/mkinstalldirs: Rename from mkinstalldirs.
* build-aux/move-if-change: Rename from move-if-change.
* etc/CHECKLIST: Rename from CHECKLIST.
* etc/HACKING: Rename from HACKING.
* etc/NEWS.1: Rename from NEWS.1.
* etc/NEWS.2: Rename from NEWS.2.
* etc/NEWS.3: Rename from NEWS.3.
* etc/OLD-ChangeLogs/ChangeLog: Rename from OLD-ChangeLogs/ChangeLog.
* etc/OLD-ChangeLogs/ChangeLog.1: Rename from
OLD-ChangeLogs/ChangeLog.1.
* etc/OLD-ChangeLogs/doc-ChangeLog: Rename from
OLD-ChangeLogs/doc-ChangeLog.
* etc/OLD-ChangeLogs/libcruft-ChangeLog: Rename from
OLD-ChangeLogs/libcruft-ChangeLog.
* etc/OLD-ChangeLogs/liboctave-ChangeLog: Rename from
OLD-ChangeLogs/liboctave-ChangeLog.
* etc/OLD-ChangeLogs/scripts-ChangeLog: Rename from
OLD-ChangeLogs/scripts-ChangeLog.
* etc/OLD-ChangeLogs/src-ChangeLog: Rename from
OLD-ChangeLogs/src-ChangeLog.
* etc/OLD-ChangeLogs/test-ChangeLog: Rename from
OLD-ChangeLogs/test-ChangeLog.
* etc/PROJECTS: Rename from PROJECTS.
* etc/README.Cygwin: Rename from README.Cygwin.
* etc/README.Linux: Rename from README.Linux.
* etc/README.MacOS: Rename from README.MacOS.
* etc/README.MinGW: Rename from README.MinGW.
* etc/README.Windows: Rename from README.Windows.
* etc/README.devel: Rename from README.devel.
* etc/README.ftp: Rename from README.ftp.
* etc/README.gnuplot: Rename from README.gnuplot.
* etc/README.kpathsea: Rename from README.kpathsea.
* etc/README.mirrors: Rename from README.mirrors.
* etc/README.snapshots: Rename from README.snapshots.
* etc/gdbinit: Rename from gdbinit.
* m4/acinclude.m4: Rename from acinclude.m4.
* src/mkoctfile.cc.in: Rename from mkoctfile.cc.in.
* src/mkoctfile.in: Rename from mkoctfile.in.
* src/octave-config.cc.in: Rename from octave-config.cc.in.
* src/octave-config.in: Rename from octave-config.in.
* config.guess, config.sub, missing, octave-sh: Delete.
* Makefile.am: Include build-aux/common.mk instead of common.mk.
* examples/Makefile.am, libcruft/Makefile.am,
liboctave/Makefile.am, liboctave/config-ops.sh,
scripts/Makefile.am, src/DLD-FUNCTIONS/config-module.sh,
test/Makefile.am, autogen.sh, doc/Makefile.am,
doc/faq/Makefile.am, doc/icons/Makefile.am,
doc/interpreter/Makefile.am, doc/interpreter/config-images.sh,
doc/liboctave/Makefile.am, doc/refcard/Makefile.am,
build-aux/common.mk, src/Makefile.am: Update for new file locations.
* Makefile.am: Don't build mkoctfile or octave-config here.
* README: Update INSTALL info.
* build-aux/mkinstalldirs: Update to new version.
* src/Makefile.am (mkoctfile, octave-config): New targets.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 10 Jun 2011 14:35:42 -0400 |
| parents | 57632dea2446 |
| children | 8ec12d686796 |
| rev | line source |
|---|---|
| 1810 | 1 /* |
| 2 | |
| 11523 | 3 Copyright (C) 1996-2011 John W. Eaton |
| 1810 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 1810 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 1810 | 20 |
| 21 */ | |
| 22 | |
| 2940 | 23 /* |
| 24 | |
| 25 The function string_vector::list_in_columns was adapted from a similar | |
| 26 function distributed in the GNU file utilities, copyright (C) 85, 88, | |
| 27 90, 91, 95, 1996 Free Software Foundation, Inc. | |
| 28 | |
| 29 */ | |
| 30 | |
| 1810 | 31 #ifdef HAVE_CONFIG_H |
| 32 #include <config.h> | |
| 33 #endif | |
| 34 | |
| 3503 | 35 #include <iostream> |
| 1810 | 36 #include <string> |
| 37 | |
| 2926 | 38 #include "cmd-edit.h" |
| 2937 | 39 #include "lo-utils.h" |
| 1810 | 40 #include "str-vec.h" |
| 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 | 45 string_vector::string_vector (const std::list<std::string>& lst) |
| 5894 | 46 : Array<std::string> () |
| 5880 | 47 { |
| 48 size_t n = lst.size (); | |
| 49 | |
| 50 resize (n); | |
| 51 | |
| 52 octave_idx_type i = 0; | |
| 53 | |
| 54 for (std::list<std::string>::const_iterator p = lst.begin (); | |
| 55 p != lst.end (); | |
| 56 p++) | |
| 57 elem(i++) = *p; | |
| 58 } | |
| 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 | 75 // Create a string vector from a NULL terminated list of C strings. |
| 76 | |
| 77 string_vector::string_vector (const char * const *s) | |
| 3504 | 78 : Array<std::string> () |
| 2493 | 79 { |
| 5275 | 80 octave_idx_type n = 0; |
| 2493 | 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 | 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 | 89 |
| 90 resize (n); | |
| 91 | |
| 5275 | 92 for (octave_idx_type i = 0; i < n; i++) |
| 2493 | 93 elem (i) = s[i]; |
| 94 } | |
| 95 | |
| 96 // Create a string vector from up to N C strings. Assumes that N is | |
| 97 // nonnegative. | |
| 98 | |
| 5275 | 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 | 101 { |
| 5275 | 102 for (octave_idx_type i = 0; i < n; i++) |
| 2493 | 103 elem (i) = s[i]; |
| 104 } | |
| 105 | |
| 2941 | 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 | 119 string_vector::uniq (void) |
| 120 { | |
| 5275 | 121 octave_idx_type len = length (); |
| 2941 | 122 |
| 123 if (len > 0) | |
| 124 { | |
| 5275 | 125 octave_idx_type k = 0; |
| 2941 | 126 |
| 5275 | 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 | 131 |
| 132 if (len != ++k) | |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
133 resize (k); |
| 2941 | 134 } |
| 135 | |
| 136 return *this; | |
| 137 } | |
| 138 | |
| 4392 | 139 string_vector& |
| 140 string_vector::append (const std::string& s) | |
| 141 { | |
| 5275 | 142 octave_idx_type len = length (); |
| 4392 | 143 |
| 144 resize (len + 1); | |
| 145 | |
| 146 elem(len) = s; | |
| 147 | |
| 148 return *this; | |
| 149 } | |
| 150 | |
| 151 string_vector& | |
| 152 string_vector::append (const string_vector& sv) | |
| 153 { | |
| 5275 | 154 octave_idx_type len = length (); |
| 155 octave_idx_type sv_len = sv.length (); | |
| 156 octave_idx_type new_len = len + sv_len; | |
| 4392 | 157 |
| 158 resize (new_len); | |
| 159 | |
| 5275 | 160 for (octave_idx_type i = 0; i < sv_len; i++) |
| 4392 | 161 elem(len + i) = sv[i]; |
| 162 | |
| 163 return *this; | |
| 164 } | |
| 165 | |
| 2937 | 166 char ** |
| 167 string_vector::c_str_vec (void) const | |
| 168 { | |
| 5275 | 169 octave_idx_type len = length (); |
| 2937 | 170 |
| 171 char **retval = new char * [len + 1]; | |
| 172 | |
| 173 retval [len] = 0; | |
| 174 | |
| 5275 | 175 for (octave_idx_type i = 0; i < len; i++) |
| 2937 | 176 retval[i] = strsave (elem(i).c_str ()); |
| 177 | |
| 178 return retval; | |
| 179 } | |
| 180 | |
| 181 void | |
| 182 string_vector::delete_c_str_vec (const char * const *v) | |
| 183 { | |
| 5304 | 184 const char * const *p = v; |
| 185 | |
| 186 while (*p) | |
| 187 delete [] *p++; | |
| 2937 | 188 |
| 189 delete [] v; | |
| 190 } | |
| 191 | |
| 2940 | 192 // Format a list in neat columns. |
| 1810 | 193 |
| 3504 | 194 std::ostream& |
| 5690 | 195 string_vector::list_in_columns (std::ostream& os, int width) const |
| 1810 | 196 { |
| 197 // Compute the maximum name length. | |
| 198 | |
| 5275 | 199 octave_idx_type max_name_length = 0; |
| 200 octave_idx_type total_names = length (); | |
| 1810 | 201 |
|
9831
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
202 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
|
203 { |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
204 // 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
|
205 |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
206 os << "\n"; |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
207 return os; |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
208 } |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
209 |
| 5275 | 210 for (octave_idx_type i = 0; i < total_names; i++) |
| 1810 | 211 { |
| 5275 | 212 octave_idx_type name_length = elem (i).length (); |
| 1810 | 213 if (name_length > max_name_length) |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
214 max_name_length = name_length; |
| 1810 | 215 } |
| 216 | |
| 217 // Allow at least two spaces between names. | |
| 218 | |
| 219 max_name_length += 2; | |
| 220 | |
| 221 // Calculate the maximum number of columns that will fit. | |
| 222 | |
| 5690 | 223 octave_idx_type line_length |
| 224 = (width <= 0) ? command_editor::terminal_cols () : width; | |
| 225 | |
| 5275 | 226 octave_idx_type nc = line_length / max_name_length; |
| 4587 | 227 if (nc == 0) |
| 228 nc = 1; | |
| 1810 | 229 |
| 230 // Calculate the number of rows that will be in each column except | |
| 231 // possibly for a short column on the right. | |
| 232 | |
| 5275 | 233 octave_idx_type nr = total_names / nc + (total_names % nc != 0); |
| 1810 | 234 |
| 235 // Recalculate columns based on rows. | |
| 236 | |
| 4587 | 237 nc = total_names / nr + (total_names % nr != 0); |
| 1810 | 238 |
| 5275 | 239 octave_idx_type count; |
| 240 for (octave_idx_type row = 0; row < nr; row++) | |
| 1810 | 241 { |
| 242 count = row; | |
| 5275 | 243 octave_idx_type pos = 0; |
| 1810 | 244 |
| 245 // Print the next row. | |
| 246 | |
| 247 while (1) | |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
248 { |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
249 std::string nm = elem (count); |
| 1810 | 250 |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
251 os << nm; |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
252 octave_idx_type name_length = nm.length (); |
| 1810 | 253 |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
254 count += nr; |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
255 if (count >= total_names) |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
256 break; |
| 1810 | 257 |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
258 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
|
259 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
|
260 os << " "; |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
261 pos += max_name_length; |
|
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
262 } |
| 1810 | 263 os << "\n"; |
| 264 } | |
| 265 | |
| 266 return os; | |
| 267 } |