Mercurial > octave
annotate liboctave/util/str-vec.cc @ 21301:40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
* mk-octave-config-h.sh, mk-opts.pl, Backend.cc, BaseControl.cc,
ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc,
EditControl.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc,
ListBoxControl.cc, Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc,
ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc,
PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc,
SliderControl.cc, TextControl.cc, TextEdit.cc, ToggleButtonControl.cc,
ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc,
annotation-dialog.cc, gl-select.cc, module.mk, kpty.cpp, color-picker.cc,
dialog.cc, documentation-dock-widget.cc, files-dock-widget.cc,
find-files-dialog.cc, find-files-model.cc, history-dock-widget.cc,
file-editor-tab.cc, file-editor-tab.h, file-editor.cc, find-dialog.cc,
marker.cc, octave-qscintilla.cc, octave-txt-lexer.cc, main-window.cc,
octave-cmd.cc, octave-dock-widget.cc, octave-gui.cc, octave-interpreter.cc,
octave-qt-link.cc, parser.cc, webinfo.cc, resource-manager.cc,
settings-dialog.cc, shortcut-manager.cc, terminal-dock-widget.cc,
thread-manager.cc, welcome-wizard.cc, workspace-model.cc, workspace-view.cc,
build-env-features.sh, build-env.in.cc, Cell.cc, __contourc__.cc,
__dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __ilu__.cc, __lin_interpn__.cc,
__pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc, bitfcns.cc,
bsxfun.cc, c-file-ptr-stream.cc, cdisplay.c, cellfun.cc, coct-hdf5-types.c,
colloc.cc, comment-list.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
debug.cc, defaults.cc, defun.cc, det.cc, dirfns.cc, display.cc, dlmread.cc,
dot.cc, dynamic-ld.cc, eig.cc, ellipj.cc, error.cc, errwarn.cc, event-queue.cc,
fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc,
gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
gl-render.cc, gl2ps-print.cc, graphics.cc, gripes.cc, hash.cc, help.cc,
hess.cc, hex2num.cc, hook-fcn.cc, input.cc, inv.cc, jit-ir.cc, jit-typeinfo.cc,
jit-util.cc, kron.cc, load-path.cc, load-save.cc, lookup.cc,
ls-ascii-helper.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc,
ls-oct-binary.cc, ls-oct-text.cc, ls-utils.cc, lsode.cc, lu.cc, luinc.cc,
mappers.cc, matrix_type.cc, max.cc, mex.cc, mgorth.cc, nproc.cc,
oct-errno.in.cc, oct-fstrm.cc, oct-hdf5-types.cc, oct-hist.cc, oct-iostrm.cc,
oct-lvalue.cc, oct-map.cc, oct-prcstrm.cc, oct-procbuf.cc, oct-stream.cc,
oct-strstrm.cc, oct-tex-lexer.in.ll, oct-tex-parser.in.yy, octave-link.cc,
ordschur.cc, pager.cc, pinv.cc, pr-output.cc, procstream.cc, profiler.cc,
psi.cc, pt-jit.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc,
schur.cc, sighandlers.cc, siglist.c, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc,
spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, text-renderer.cc, time.cc,
toplev.cc, tril.cc, tsearch.cc, txt-eng.cc, typecast.cc, urlwrite.cc, utils.cc,
variables.cc, xdiv.cc, xgl2ps.c, xnorm.cc, xpow.cc, zfstream.cc,
__delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_fltk__.cc, __init_gnuplot__.cc, __magick_read__.cc, __osmesa_print__.cc,
__voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc,
colamd.cc, convhulln.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc,
mkbuiltins, mkops, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-mat.cc,
ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-ch-mat.cc,
ov-class.cc, ov-classdef.cc, ov-colon.cc, ov-complex.cc, ov-cs-list.cc,
ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-fcn-handle.cc,
ov-fcn-inline.cc, ov-fcn.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc,
ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.cc, ov-lazy-idx.cc,
ov-mex-fcn.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-perm.cc, ov-range.cc,
ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc,
ov-struct.cc, ov-typeinfo.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc,
ov-uint8.cc, ov-usr-fcn.cc, ov.cc, ovl.cc, octave.cc, op-b-b.cc, op-b-bm.cc,
op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc,
op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc,
op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc,
op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc,
op-dm-template.cc, op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc,
op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc,
op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc,
op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc,
op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc,
op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc,
op-int-conv.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc,
op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc,
op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc,
op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc,
op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc,
op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc,
op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, lex.ll, oct-parse.in.yy,
pt-arg-list.cc, pt-array-list.cc, pt-assign.cc, pt-binop.cc, pt-bp.cc,
pt-cbinop.cc, pt-cell.cc, pt-check.cc, pt-classdef.cc, pt-cmd.cc, pt-colon.cc,
pt-const.cc, pt-decl.cc, pt-eval.cc, pt-except.cc, pt-exp.cc, pt-fcn-handle.cc,
pt-funcall.cc, pt-id.cc, pt-idx.cc, pt-jump.cc, pt-loop.cc, pt-mat.cc,
pt-misc.cc, pt-pr-code.cc, pt-select.cc, pt-stmt.cc, pt-unop.cc, pt.cc,
token.cc, Array-jit.cc, Array-os.cc, Array-sym.cc, Array-tc.cc, version.cc,
Array-C.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc,
Array-i.cc, Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-util.cc,
Array-voidp.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc,
CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MArray-C.cc,
MArray-d.cc, MArray-f.cc, MArray-fC.cc, MArray-i.cc, MArray-s.cc, MArray.cc,
MDiagArray2.cc, MSparse-C.cc, MSparse-d.cc, MatrixType.cc, PermMatrix.cc,
Range.cc, Sparse-C.cc, Sparse-b.cc, Sparse-d.cc, Sparse.cc, boolMatrix.cc,
boolNDArray.cc, boolSparse.cc, chMatrix.cc, chNDArray.cc, dColVector.cc,
dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc,
dim-vector.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc,
fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc,
fRowVector.cc, idx-vector.cc, int16NDArray.cc, int32NDArray.cc,
int64NDArray.cc, int8NDArray.cc, intNDArray.cc, uint16NDArray.cc,
uint32NDArray.cc, uint64NDArray.cc, uint8NDArray.cc, blaswrap.c, cquit.c,
f77-extern.cc, f77-fcn.c, lo-error.c, quit.cc, CollocWt.cc, DASPK.cc, DASRT.cc,
DASSL.cc, EIG.cc, LSODE.cc, ODES.cc, Quad.cc, aepbalance.cc, chol.cc,
eigs-base.cc, fEIG.cc, gepbalance.cc, hess.cc, lo-mappers.cc, lo-specfun.cc,
lu.cc, oct-convn.cc, oct-fftw.cc, oct-norm.cc, oct-rand.cc, oct-spparms.cc,
qr.cc, qrp.cc, randgamma.c, randmtzig.c, randpoisson.c, schur.cc,
sparse-chol.cc, sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, svd.cc,
mk-ops.awk, dir-ops.cc, file-ops.cc, file-stat.cc, lo-sysdep.cc, mach-info.cc,
oct-env.cc, oct-group.cc, oct-passwd.cc, oct-syscalls.cc, oct-time.cc,
oct-uname.cc, cmd-edit.cc, cmd-hist.cc, data-conv.cc, f2c-main.c,
glob-match.cc, kpse.cc, lo-array-errwarn.cc, lo-array-gripes.cc, lo-cutils.c,
lo-ieee.cc, lo-regexp.cc, lo-utils.cc, oct-base64.cc, oct-glob.cc,
oct-inttypes.cc, oct-locbuf.cc, oct-mutex.cc, oct-rl-edit.c, oct-rl-hist.c,
oct-shlib.cc, oct-sort.cc, pathsearch.cc, singleton-cleanup.cc, sparse-sort.cc,
sparse-util.cc, str-vec.cc, unwind-prot.cc, url-transfer.cc,
display-available.c, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc,
octave-config.in.cc:
Use '#include "config.h"' rather than <config.h>.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 18 Feb 2016 13:34:50 -0800 |
| parents | f7121e111991 |
| children | aba2e6293dd8 |
| rev | line source |
|---|---|
| 1810 | 1 /* |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
18676
diff
changeset
|
3 Copyright (C) 1996-2015 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 |
|
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21202
diff
changeset
|
32 # include "config.h" |
| 1810 | 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 | |
|
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
42 // FIXME: isn't there some STL trick that could be used to make this |
|
9582
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++) | |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
57 elem (i++) = *p; |
| 5880 | 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++) |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
72 elem (i++) = *p; |
|
9582
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; |
|
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
111 lsort.sort (Array<std::string>::fortran_vec (), numel ()); |
|
8678
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 { | |
|
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
121 octave_idx_type len = numel (); |
| 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++) |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
128 if (elem (i) != elem (k)) |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
129 if (++k != i) |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
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 { | |
|
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
142 octave_idx_type len = numel (); |
| 4392 | 143 |
| 144 resize (len + 1); | |
| 145 | |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
146 elem (len) = s; |
| 4392 | 147 |
| 148 return *this; | |
| 149 } | |
| 150 | |
| 151 string_vector& | |
| 152 string_vector::append (const string_vector& sv) | |
| 153 { | |
|
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
154 octave_idx_type len = numel (); |
|
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
155 octave_idx_type sv_len = sv.numel (); |
| 5275 | 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++) |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
161 elem (len + i) = sv[i]; |
| 4392 | 162 |
| 163 return *this; | |
| 164 } | |
| 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 |
|
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
171 octave_idx_type len = numel (); |
|
12964
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++) |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
178 retval += elem (i) + sep; |
|
12964
8ec12d686796
new string_vector::join method
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
179 |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
180 retval += elem (i); |
|
12964
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 | 186 char ** |
| 187 string_vector::c_str_vec (void) const | |
| 188 { | |
|
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
189 octave_idx_type len = numel (); |
| 2937 | 190 |
| 191 char **retval = new char * [len + 1]; | |
| 192 | |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
193 retval[len] = 0; |
| 2937 | 194 |
| 5275 | 195 for (octave_idx_type i = 0; i < len; i++) |
|
15018
3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
Rik <rik@octave.org>
parents:
14841
diff
changeset
|
196 retval[i] = strsave (elem (i).c_str ()); |
| 2937 | 197 |
| 198 return retval; | |
| 199 } | |
| 200 | |
| 201 void | |
| 202 string_vector::delete_c_str_vec (const char * const *v) | |
| 203 { | |
| 5304 | 204 const char * const *p = v; |
| 205 | |
| 206 while (*p) | |
| 207 delete [] *p++; | |
| 2937 | 208 |
| 209 delete [] v; | |
| 210 } | |
| 211 | |
| 2940 | 212 // Format a list in neat columns. |
| 1810 | 213 |
| 3504 | 214 std::ostream& |
|
14841
afa5e1d20671
* str-vec.h, str-vec.cc (string_vector::list_in_columns): Accept prefix.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
215 string_vector::list_in_columns (std::ostream& os, int width, |
|
afa5e1d20671
* str-vec.h, str-vec.cc (string_vector::list_in_columns): Accept prefix.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
216 const std::string& prefix) const |
| 1810 | 217 { |
| 218 // Compute the maximum name length. | |
| 219 | |
| 5275 | 220 octave_idx_type max_name_length = 0; |
|
20232
a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
Carnë Draug <carandraug@octave.org>
parents:
19697
diff
changeset
|
221 octave_idx_type total_names = numel (); |
| 1810 | 222 |
|
9831
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
223 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
|
224 { |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
225 // 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
|
226 |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
227 os << "\n"; |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
228 return os; |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
229 } |
|
737624cb7560
list_in_columns: Don't SIGFPE when given empty first argument
David Grundberg <davidg@cs.umu.se>
parents:
9582
diff
changeset
|
230 |
| 5275 | 231 for (octave_idx_type i = 0; i < total_names; i++) |
| 1810 | 232 { |
| 5275 | 233 octave_idx_type name_length = elem (i).length (); |
| 1810 | 234 if (name_length > max_name_length) |
|
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
235 max_name_length = name_length; |
| 1810 | 236 } |
| 237 | |
| 238 // Allow at least two spaces between names. | |
| 239 | |
| 240 max_name_length += 2; | |
| 241 | |
| 242 // Calculate the maximum number of columns that will fit. | |
| 243 | |
| 5690 | 244 octave_idx_type line_length |
|
14841
afa5e1d20671
* str-vec.h, str-vec.cc (string_vector::list_in_columns): Accept prefix.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
245 = ((width <= 0 ? command_editor::terminal_cols () : width) |
|
afa5e1d20671
* str-vec.h, str-vec.cc (string_vector::list_in_columns): Accept prefix.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
246 - prefix.length ()); |
| 5690 | 247 |
| 5275 | 248 octave_idx_type nc = line_length / max_name_length; |
| 4587 | 249 if (nc == 0) |
| 250 nc = 1; | |
| 1810 | 251 |
| 252 // Calculate the number of rows that will be in each column except | |
|
18676
5bd1ca29c5f0
Clean up questionable code bits identified by clang sanitize.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
253 // possibly for a short column on the right. |
| 1810 | 254 |
| 5275 | 255 octave_idx_type nr = total_names / nc + (total_names % nc != 0); |
| 1810 | 256 |
| 5275 | 257 octave_idx_type count; |
| 258 for (octave_idx_type row = 0; row < nr; row++) | |
| 1810 | 259 { |
| 260 count = row; | |
| 5275 | 261 octave_idx_type pos = 0; |
| 1810 | 262 |
| 263 // Print the next row. | |
| 264 | |
|
14841
afa5e1d20671
* str-vec.h, str-vec.cc (string_vector::list_in_columns): Accept prefix.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
265 os << prefix; |
|
afa5e1d20671
* str-vec.h, str-vec.cc (string_vector::list_in_columns): Accept prefix.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
266 |
| 1810 | 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 | 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 | 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 | 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 | 283 os << "\n"; |
| 284 } | |
| 285 | |
| 286 return os; | |
| 287 } |