Mercurial > hg > octave-lyh
annotate src/OPERATORS/op-str-str.cc @ 14846:460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Example: func() => func ()
* dynamic.txi, func.txi, oop.txi, var.txi, embedded.cc, fortdemo.cc,
funcdemo.cc, paramdemo.cc, stringdemo.cc, unwinddemo.cc, Array.cc, Array.h,
CColVector.cc, CDiagMatrix.h, CMatrix.cc, CNDArray.cc, CRowVector.cc,
CSparse.cc, CmplxGEPBAL.cc, EIG.cc, MSparse.cc, MatrixType.cc,
Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc, Sparse.h,
SparseCmplxCHOL.cc, SparseCmplxCHOL.h, SparseCmplxLU.cc, SparseCmplxQR.cc,
SparseCmplxQR.h, SparseQR.cc, SparseQR.h, SparsedbleCHOL.cc, SparsedbleCHOL.h,
SparsedbleLU.cc, SparsedbleLU.h, base-lu.cc, cmd-hist.cc, dColVector.cc,
dDiagMatrix.h, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dbleCHOL.cc,
dbleGEPBAL.cc, dim-vector.cc, eigs-base.cc, f2c-main.c, fCColVector.cc,
fCDiagMatrix.h, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fCmplxGEPBAL.cc,
fColVector.cc, fDiagMatrix.h, fEIG.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc,
file-ops.cc, file-stat.cc, floatCHOL.cc, floatGEPBAL.cc, idx-vector.h,
lo-specfun.cc, lo-sysdep.cc, mx-inlines.cc, oct-binmap.h, oct-convn.cc,
oct-md5.cc, oct-mem.h, oct-rand.cc, oct-syscalls.cc, randgamma.c, randmtzig.c,
sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-dmsolve.cc,
tempname.c, curl.m, divergence.m, randi.m, dlmwrite.m, edit.m, getappdata.m,
what.m, getarchdir.m, install.m, installed_packages.m, repackage.m,
unload_packages.m, colorbar.m, figure.m, isosurface.m, legend.m, loglog.m,
plot.m, plot3.m, plotyy.m, polar.m, __errplot__.m, __ghostscript__.m,
__marching_cube__.m, __plt__.m, __scatter__.m, semilogx.m, semilogy.m,
trimesh.m, trisurf.m, demo.m, test.m, datetick.m, __delaunayn__.cc,
__dsearchn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, balance.cc,
bsxfun.cc, ccolamd.cc, cellfun.cc, chol.cc, daspk.cc, dasrt.cc, dassl.cc,
dmperm.cc, eig.cc, eigs.cc, fftw.cc, filter.cc, find.cc, kron.cc, lookup.cc,
lsode.cc, matrix_type.cc, md5sum.cc, mgorth.cc, qr.cc, quad.cc, rand.cc,
regexp.cc, symbfact.cc, tril.cc, urlwrite.cc, op-bm-bm.cc, op-cdm-cdm.cc,
op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-scm.cc,
op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-fcdm-fcdm.cc,
op-fcm-fcm.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-scm.cc,
op-s-sm.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-str.cc, op-struct.cc, bitfcns.cc,
data.cc, debug.cc, dynamic-ld.cc, error.cc, gl-render.cc, graphics.cc,
graphics.in.h, load-path.cc, ls-hdf5.cc, ls-mat5.cc, ls-mat5.h,
ls-oct-ascii.cc, ls-oct-ascii.h, mex.cc, mk-errno-list, oct-map.cc, oct-obj.h,
oct-parse.yy, octave-config.in.cc, ov-base-int.cc, ov-base-mat.cc, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc,
ov-class.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-intx.h, ov-range.h, ov-re-mat.cc, ov-re-sparse.cc,
ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.h, ov.h, pr-output.cc, pt-id.cc,
pt-id.h, pt-mat.cc, pt-select.cc, sparse.cc, symtab.cc, symtab.h, syscalls.cc,
toplev.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h, Dork.m,
getStash.m, myStash.m, Gork.m, Pork.m, myStash.m, getStash.m, myStash.m,
getStash.m, myStash.m, fntests.m: Use Octave coding convention for
cuddled parenthis in function calls with empty argument lists.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sun, 08 Jul 2012 11:28:50 -0700 |
| parents | 72c96de7a403 |
| children |
| rev | line source |
|---|---|
|
9700
95a30d00f779
fix typo from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
9699
diff
changeset
|
1 /* |
| 2928 | 2 |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
3 Copyright (C) 1996-2012 John W. Eaton |
| 2928 | 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. | |
| 2928 | 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/>. | |
| 2928 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "gripes.h" | |
| 4055 | 28 #include "oct-obj.h" |
| 2928 | 29 #include "ov.h" |
| 30 #include "ov-str-mat.h" | |
| 31 #include "ov-typeinfo.h" | |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
32 #include "ov-null-mat.h" |
| 2928 | 33 #include "ops.h" |
| 34 | |
| 3203 | 35 // string unary ops. |
| 36 | |
| 5279 | 37 DEFUNOP (transpose, char_matrix_str) |
| 3203 | 38 { |
| 39 CAST_UNOP_ARG (const octave_char_matrix_str&); | |
| 40 | |
| 4673 | 41 if (v.ndims () > 2) |
| 42 { | |
| 43 error ("transpose not defined for N-d objects"); | |
| 44 return octave_value (); | |
| 45 } | |
| 46 else | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
47 return octave_value (v.char_matrix_value ().transpose (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
48 a.is_sq_string () ? '\'' : '"'); |
| 3203 | 49 } |
| 50 | |
| 2928 | 51 // string by string ops. |
| 52 | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
53 #define DEFCHARNDBINOP_FN(name, op, t1, t2, e1, e2, f) \ |
| 6456 | 54 BINOPDECL (name, a1, a2) \ |
| 55 { \ | |
| 56 dim_vector a1_dims = a1.dims (); \ | |
| 57 dim_vector a2_dims = a2.dims (); \ | |
| 58 \ | |
| 59 bool a1_is_scalar = a1_dims.all_ones (); \ | |
| 60 bool a2_is_scalar = a2_dims.all_ones (); \ | |
| 61 \ | |
| 62 CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ | |
| 63 \ | |
| 64 if (a1_is_scalar) \ | |
| 65 { \ | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
66 if (a2_is_scalar) \ |
|
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
67 return octave_value ((v1.e1 ## _value ())(0) op (v2.e2 ## _value ())(0)); \ |
|
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
68 else \ |
|
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
69 return octave_value (f ((v1.e1 ## _value ())(0), v2.e2 ## _value ())); \ |
| 6456 | 70 } \ |
| 71 else \ | |
| 72 { \ | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
73 if (a2_is_scalar) \ |
|
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
74 return octave_value (f (v1.e1 ## _value (), (v2.e2 ## _value ())(0))); \ |
|
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
75 else \ |
|
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9700
diff
changeset
|
76 return octave_value (f (v1.e1 ## _value (), v2.e2 ## _value ())); \ |
| 6456 | 77 } \ |
| 78 } | |
| 2928 | 79 |
| 6456 | 80 DEFCHARNDBINOP_FN (lt, <, char_matrix_str, char_matrix_str, char_array, char_array, mx_el_lt) |
| 81 DEFCHARNDBINOP_FN (le, <=, char_matrix_str, char_matrix_str, char_array, char_array, mx_el_le) | |
| 82 DEFCHARNDBINOP_FN (eq, ==, char_matrix_str, char_matrix_str, char_array, char_array, mx_el_eq) | |
| 83 DEFCHARNDBINOP_FN (ge, >=, char_matrix_str, char_matrix_str, char_array, char_array, mx_el_ge) | |
| 84 DEFCHARNDBINOP_FN (gt, >, char_matrix_str, char_matrix_str, char_array, char_array, mx_el_gt) | |
| 85 DEFCHARNDBINOP_FN (ne, !=, char_matrix_str, char_matrix_str, char_array, char_array, mx_el_ne) | |
| 2928 | 86 |
| 87 DEFASSIGNOP (assign, char_matrix_str, char_matrix_str) | |
| 88 { | |
| 89 CAST_BINOP_ARGS (octave_char_matrix_str&, const octave_char_matrix_str&); | |
| 90 | |
|
10852
47e013327758
fix bug in n-dimensional character assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
9933
diff
changeset
|
91 v1.assign (idx, v2.char_array_value ()); |
| 2928 | 92 return octave_value (); |
| 93 } | |
| 94 | |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
95 DEFNULLASSIGNOP_FN (null_assign, char_matrix_str, delete_elements) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
96 |
| 5533 | 97 DEFNDCHARCATOP_FN (str_str, char_matrix_str, char_matrix_str, concat) |
| 4915 | 98 |
| 2928 | 99 void |
| 100 install_str_str_ops (void) | |
| 101 { | |
| 3538 | 102 INSTALL_UNOP (op_transpose, octave_char_matrix_str, transpose); |
| 5279 | 103 INSTALL_UNOP (op_transpose, octave_char_matrix_sq_str, transpose); |
| 104 | |
| 3538 | 105 INSTALL_UNOP (op_hermitian, octave_char_matrix_str, transpose); |
| 5279 | 106 INSTALL_UNOP (op_hermitian, octave_char_matrix_sq_str, transpose); |
| 3203 | 107 |
| 6456 | 108 INSTALL_BINOP (op_lt, octave_char_matrix_str, octave_char_matrix_str, lt); |
| 109 INSTALL_BINOP (op_lt, octave_char_matrix_str, octave_char_matrix_sq_str, lt); | |
| 110 INSTALL_BINOP (op_lt, octave_char_matrix_sq_str, octave_char_matrix_str, lt); | |
| 111 INSTALL_BINOP (op_lt, octave_char_matrix_sq_str, octave_char_matrix_sq_str, lt); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
112 |
| 6456 | 113 INSTALL_BINOP (op_le, octave_char_matrix_str, octave_char_matrix_str, le); |
| 114 INSTALL_BINOP (op_le, octave_char_matrix_str, octave_char_matrix_sq_str, le); | |
| 115 INSTALL_BINOP (op_le, octave_char_matrix_sq_str, octave_char_matrix_str, le); | |
| 116 INSTALL_BINOP (op_le, octave_char_matrix_sq_str, octave_char_matrix_sq_str, le); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
117 |
| 3538 | 118 INSTALL_BINOP (op_eq, octave_char_matrix_str, octave_char_matrix_str, eq); |
| 5279 | 119 INSTALL_BINOP (op_eq, octave_char_matrix_str, octave_char_matrix_sq_str, eq); |
| 120 INSTALL_BINOP (op_eq, octave_char_matrix_sq_str, octave_char_matrix_str, eq); | |
| 121 INSTALL_BINOP (op_eq, octave_char_matrix_sq_str, octave_char_matrix_sq_str, eq); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
122 |
| 6456 | 123 INSTALL_BINOP (op_ge, octave_char_matrix_str, octave_char_matrix_str, ge); |
| 124 INSTALL_BINOP (op_ge, octave_char_matrix_str, octave_char_matrix_sq_str, ge); | |
| 125 INSTALL_BINOP (op_ge, octave_char_matrix_sq_str, octave_char_matrix_str, ge); | |
| 126 INSTALL_BINOP (op_ge, octave_char_matrix_sq_str, octave_char_matrix_sq_str, ge); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
127 |
| 6456 | 128 INSTALL_BINOP (op_gt, octave_char_matrix_str, octave_char_matrix_str, gt); |
| 129 INSTALL_BINOP (op_gt, octave_char_matrix_str, octave_char_matrix_sq_str, gt); | |
| 130 INSTALL_BINOP (op_gt, octave_char_matrix_sq_str, octave_char_matrix_str, gt); | |
| 131 INSTALL_BINOP (op_gt, octave_char_matrix_sq_str, octave_char_matrix_sq_str, gt); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
132 |
| 3538 | 133 INSTALL_BINOP (op_ne, octave_char_matrix_str, octave_char_matrix_str, ne); |
| 5279 | 134 INSTALL_BINOP (op_ne, octave_char_matrix_str, octave_char_matrix_sq_str, ne); |
| 135 INSTALL_BINOP (op_ne, octave_char_matrix_sq_str, octave_char_matrix_str, ne); | |
| 136 INSTALL_BINOP (op_ne, octave_char_matrix_sq_str, octave_char_matrix_sq_str, ne); | |
| 2928 | 137 |
| 4915 | 138 INSTALL_CATOP (octave_char_matrix_str, octave_char_matrix_str, str_str); |
| 5279 | 139 INSTALL_CATOP (octave_char_matrix_str, octave_char_matrix_sq_str, str_str); |
| 140 INSTALL_CATOP (octave_char_matrix_sq_str, octave_char_matrix_str, str_str); | |
| 141 INSTALL_CATOP (octave_char_matrix_sq_str, octave_char_matrix_sq_str, str_str); | |
| 4915 | 142 |
| 3538 | 143 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_char_matrix_str, assign); |
| 5279 | 144 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_char_matrix_sq_str, assign); |
| 145 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_char_matrix_str, assign); | |
| 146 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_char_matrix_sq_str, assign); | |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
147 |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
148 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_null_matrix, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
149 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_null_str, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
150 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_null_sq_str, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
151 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_null_matrix, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
152 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_null_str, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
153 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_null_sq_str, null_assign); |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
154 |
| 2928 | 155 } |