comparison libinterp/octave-value/ov-base.h @ 17787:175b392e91fe

Use GNU style coding conventions for code in libinterp/ * libinterp/corefcn/Cell.h, libinterp/corefcn/__contourc__.cc, libinterp/corefcn/__dispatch__.cc, libinterp/corefcn/__lin_interpn__.cc, libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc, libinterp/corefcn/balance.cc, libinterp/corefcn/besselj.cc, libinterp/corefcn/betainc.cc, libinterp/corefcn/bitfcns.cc, libinterp/corefcn/bsxfun.cc, libinterp/corefcn/c-file-ptr-stream.cc, libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/cellfun.cc, libinterp/corefcn/colloc.cc, libinterp/corefcn/comment-list.h, libinterp/corefcn/conv2.cc, libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/data.cc, libinterp/corefcn/debug.cc, libinterp/corefcn/defaults.cc, libinterp/corefcn/defaults.in.h, libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc, libinterp/corefcn/det.cc, libinterp/corefcn/dirfns.cc, libinterp/corefcn/display.cc, libinterp/corefcn/dlmread.cc, libinterp/corefcn/dot.cc, libinterp/corefcn/dynamic-ld.cc, libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/eig.cc, libinterp/corefcn/ellipj.cc, libinterp/corefcn/error.cc, libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h, libinterp/corefcn/fft.cc, libinterp/corefcn/fft2.cc, libinterp/corefcn/fftn.cc, libinterp/corefcn/file-io.cc, libinterp/corefcn/filter.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gammainc.cc, libinterp/corefcn/gcd.cc, libinterp/corefcn/getgrent.cc, libinterp/corefcn/getpwent.cc, libinterp/corefcn/getrusage.cc, libinterp/corefcn/givens.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h, libinterp/corefcn/help.cc, libinterp/corefcn/hess.cc, libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc, libinterp/corefcn/input.h, libinterp/corefcn/inv.cc, libinterp/corefcn/jit-ir.h, libinterp/corefcn/jit-typeinfo.cc, libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/jit-util.h, libinterp/corefcn/kron.cc, libinterp/corefcn/load-path.cc, libinterp/corefcn/load-path.h, libinterp/corefcn/load-save.cc, libinterp/corefcn/load-save.h, libinterp/corefcn/lookup.cc, libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-hdf5.h, libinterp/corefcn/ls-mat-ascii.cc, libinterp/corefcn/ls-mat-ascii.h, libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h, libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/lsode.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc, libinterp/corefcn/mappers.cc, libinterp/corefcn/matrix_type.cc, libinterp/corefcn/max.cc, libinterp/corefcn/md5sum.cc, libinterp/corefcn/mex.cc, libinterp/corefcn/mexproto.h, libinterp/corefcn/mgorth.cc, libinterp/corefcn/mxarray.in.h, libinterp/corefcn/nproc.cc, libinterp/corefcn/oct-hist.cc, libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-stdstrm.h, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h, libinterp/corefcn/octave-link.cc, libinterp/corefcn/octave-link.h, libinterp/corefcn/pager.cc, libinterp/corefcn/pinv.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/procstream.h, libinterp/corefcn/profiler.cc, libinterp/corefcn/pt-jit.cc, libinterp/corefcn/pt-jit.h, libinterp/corefcn/quad.cc, libinterp/corefcn/quadcc.cc, libinterp/corefcn/qz.cc, libinterp/corefcn/rand.cc, libinterp/corefcn/rcond.cc, libinterp/corefcn/regexp.cc, libinterp/corefcn/schur.cc, libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sighandlers.h, libinterp/corefcn/sparse-xdiv.cc, libinterp/corefcn/sparse-xdiv.h, libinterp/corefcn/sparse-xpow.cc, libinterp/corefcn/sparse.cc, libinterp/corefcn/spparms.cc, libinterp/corefcn/sqrtm.cc, libinterp/corefcn/str2double.cc, libinterp/corefcn/strfind.cc, libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc, libinterp/corefcn/svd.cc, libinterp/corefcn/syl.cc, libinterp/corefcn/symtab.cc, libinterp/corefcn/symtab.h, libinterp/corefcn/syscalls.cc, libinterp/corefcn/sysdep.cc, libinterp/corefcn/sysdep.h, libinterp/corefcn/time.cc, libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h, libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc, libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h, libinterp/corefcn/typecast.cc, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc, libinterp/corefcn/variables.h, libinterp/corefcn/xdiv.cc, libinterp/corefcn/xdiv.h, libinterp/corefcn/xnorm.h, libinterp/corefcn/xpow.cc, libinterp/corefcn/xpow.h, libinterp/corefcn/zfstream.cc, libinterp/corefcn/zfstream.h, libinterp/dldfcn/__delaunayn__.cc, libinterp/dldfcn/__dsearchn__.cc, libinterp/dldfcn/__eigs__.cc, libinterp/dldfcn/__fltk_uigetfile__.cc, libinterp/dldfcn/__glpk__.cc, libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__init_gnuplot__.cc, libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/dldfcn/amd.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/chol.cc, libinterp/dldfcn/colamd.cc, libinterp/dldfcn/convhulln.cc, libinterp/dldfcn/dmperm.cc, libinterp/dldfcn/fftw.cc, libinterp/dldfcn/qr.cc, libinterp/dldfcn/symbfact.cc, libinterp/dldfcn/symrcm.cc, libinterp/dldfcn/tsearch.cc, libinterp/octave-value/ov-base-diag.cc, libinterp/octave-value/ov-base-diag.h, libinterp/octave-value/ov-base-int.cc, libinterp/octave-value/ov-base-int.h, libinterp/octave-value/ov-base-mat.h, libinterp/octave-value/ov-base-scalar.cc, libinterp/octave-value/ov-base-scalar.h, libinterp/octave-value/ov-base-sparse.cc, libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.cc, libinterp/octave-value/ov-base.h, libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-bool-mat.h, libinterp/octave-value/ov-bool-sparse.cc, libinterp/octave-value/ov-bool-sparse.h, libinterp/octave-value/ov-bool.cc, libinterp/octave-value/ov-bool.h, libinterp/octave-value/ov-builtin.cc, libinterp/octave-value/ov-builtin.h, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-cell.h, libinterp/octave-value/ov-ch-mat.cc, libinterp/octave-value/ov-ch-mat.h, libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-colon.h, libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-complex.h, libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-diag.h, libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-mat.h, libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-cx-sparse.h, libinterp/octave-value/ov-dld-fcn.h, libinterp/octave-value/ov-fcn-handle.cc, libinterp/octave-value/ov-fcn-handle.h, libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-fcn-inline.h, libinterp/octave-value/ov-fcn.h, libinterp/octave-value/ov-float.cc, libinterp/octave-value/ov-float.h, libinterp/octave-value/ov-flt-complex.cc, libinterp/octave-value/ov-flt-complex.h, libinterp/octave-value/ov-flt-cx-diag.cc, libinterp/octave-value/ov-flt-cx-diag.h, libinterp/octave-value/ov-flt-cx-mat.cc, libinterp/octave-value/ov-flt-cx-mat.h, libinterp/octave-value/ov-flt-re-diag.cc, libinterp/octave-value/ov-flt-re-diag.h, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-flt-re-mat.h, libinterp/octave-value/ov-int16.cc, libinterp/octave-value/ov-int32.cc, libinterp/octave-value/ov-int64.cc, libinterp/octave-value/ov-int8.cc, libinterp/octave-value/ov-intx.h, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-lazy-idx.h, libinterp/octave-value/ov-mex-fcn.cc, libinterp/octave-value/ov-mex-fcn.h, libinterp/octave-value/ov-null-mat.cc, libinterp/octave-value/ov-null-mat.h, libinterp/octave-value/ov-oncleanup.cc, libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-perm.h, libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-diag.cc, libinterp/octave-value/ov-re-diag.h, libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-re-mat.h, libinterp/octave-value/ov-re-sparse.cc, libinterp/octave-value/ov-re-sparse.h, libinterp/octave-value/ov-scalar.cc, libinterp/octave-value/ov-scalar.h, libinterp/octave-value/ov-str-mat.cc, libinterp/octave-value/ov-str-mat.h, libinterp/octave-value/ov-struct.cc, libinterp/octave-value/ov-struct.h, libinterp/octave-value/ov-type-conv.h, libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov-typeinfo.h, libinterp/octave-value/ov-uint16.cc, libinterp/octave-value/ov-uint32.cc, libinterp/octave-value/ov-uint64.cc, libinterp/octave-value/ov-uint8.cc, libinterp/octave-value/ov-usr-fcn.cc, libinterp/octave-value/ov-usr-fcn.h, libinterp/octave-value/ov.cc, libinterp/octave-value/ov.h, libinterp/octave.cc, libinterp/operators/op-b-bm.cc, libinterp/operators/op-b-sbm.cc, libinterp/operators/op-bm-b.cc, libinterp/operators/op-bm-bm.cc, libinterp/operators/op-cdm-cdm.cc, libinterp/operators/op-chm.cc, libinterp/operators/op-class.cc, libinterp/operators/op-cm-cm.cc, libinterp/operators/op-cm-cs.cc, libinterp/operators/op-cm-s.cc, libinterp/operators/op-cm-scm.cc, libinterp/operators/op-cm-sm.cc, libinterp/operators/op-cs-cm.cc, libinterp/operators/op-cs-cs.cc, libinterp/operators/op-cs-scm.cc, libinterp/operators/op-cs-sm.cc, libinterp/operators/op-dm-dm.cc, libinterp/operators/op-dm-scm.cc, libinterp/operators/op-double-conv.cc, libinterp/operators/op-fcdm-fcdm.cc, libinterp/operators/op-fcm-fcm.cc, libinterp/operators/op-fcm-fcs.cc, libinterp/operators/op-fcm-fm.cc, libinterp/operators/op-fcm-fs.cc, libinterp/operators/op-fcs-fcm.cc, libinterp/operators/op-fcs-fcs.cc, libinterp/operators/op-fcs-fm.cc, libinterp/operators/op-fcs-fs.cc, libinterp/operators/op-fdm-fdm.cc, libinterp/operators/op-float-conv.cc, libinterp/operators/op-fm-fcm.cc, libinterp/operators/op-fm-fcs.cc, libinterp/operators/op-fm-fm.cc, libinterp/operators/op-fm-fs.cc, libinterp/operators/op-fs-fcm.cc, libinterp/operators/op-fs-fcs.cc, libinterp/operators/op-fs-fm.cc, libinterp/operators/op-fs-fs.cc, libinterp/operators/op-m-cm.cc, libinterp/operators/op-m-cs.cc, libinterp/operators/op-m-m.cc, libinterp/operators/op-m-s.cc, libinterp/operators/op-m-scm.cc, libinterp/operators/op-m-sm.cc, libinterp/operators/op-pm-scm.cc, libinterp/operators/op-range.cc, libinterp/operators/op-s-cm.cc, libinterp/operators/op-s-cs.cc, libinterp/operators/op-s-scm.cc, libinterp/operators/op-sbm-b.cc, libinterp/operators/op-sbm-bm.cc, libinterp/operators/op-sbm-sbm.cc, libinterp/operators/op-scm-cm.cc, libinterp/operators/op-scm-cs.cc, libinterp/operators/op-scm-m.cc, libinterp/operators/op-scm-s.cc, libinterp/operators/op-scm-scm.cc, libinterp/operators/op-scm-sm.cc, libinterp/operators/op-sm-cm.cc, libinterp/operators/op-sm-m.cc, libinterp/operators/op-sm-s.cc, libinterp/operators/op-sm-scm.cc, libinterp/operators/op-sm-sm.cc, libinterp/operators/op-str-m.cc, libinterp/operators/op-str-s.cc, libinterp/operators/op-str-str.cc, libinterp/operators/ops.h, libinterp/parse-tree/lex.h, libinterp/parse-tree/parse.h, libinterp/parse-tree/pt-arg-list.cc, libinterp/parse-tree/pt-arg-list.h, libinterp/parse-tree/pt-assign.cc, libinterp/parse-tree/pt-assign.h, libinterp/parse-tree/pt-binop.cc, libinterp/parse-tree/pt-binop.h, libinterp/parse-tree/pt-bp.h, libinterp/parse-tree/pt-cbinop.cc, libinterp/parse-tree/pt-check.cc, libinterp/parse-tree/pt-colon.cc, libinterp/parse-tree/pt-colon.h, libinterp/parse-tree/pt-const.cc, libinterp/parse-tree/pt-decl.cc, libinterp/parse-tree/pt-decl.h, libinterp/parse-tree/pt-eval.cc, libinterp/parse-tree/pt-except.h, libinterp/parse-tree/pt-exp.h, libinterp/parse-tree/pt-fcn-handle.cc, libinterp/parse-tree/pt-id.cc, libinterp/parse-tree/pt-id.h, libinterp/parse-tree/pt-idx.cc, libinterp/parse-tree/pt-idx.h, libinterp/parse-tree/pt-loop.h, libinterp/parse-tree/pt-mat.cc, libinterp/parse-tree/pt-misc.cc, libinterp/parse-tree/pt-misc.h, libinterp/parse-tree/pt-pr-code.cc, libinterp/parse-tree/pt-select.h, libinterp/parse-tree/pt-stmt.h, libinterp/parse-tree/token.h, libinterp/version.cc: Use GNU style coding conventions for code in libinterp/
author Rik <rik@octave.org>
date Mon, 28 Oct 2013 19:51:46 -0700
parents d63878346099
children ebb3ef964372
comparison
equal deleted inserted replaced
17786:34d9812a943b 17787:175b392e91fe
95 { return btyp <= btyp_float_complex; } 95 { return btyp <= btyp_float_complex; }
96 96
97 inline bool btyp_isarray (builtin_type_t btyp) 97 inline bool btyp_isarray (builtin_type_t btyp)
98 { return btyp <= btyp_char; } 98 { return btyp <= btyp_char; }
99 99
100 // Compute a numeric type for a possibly mixed-type operation, using these rules: 100 // Compute numeric type for a possible mixed-type operation, using these rules:
101 // bool -> double 101 // bool -> double
102 // single + double -> single 102 // single + double -> single
103 // real + complex -> complex 103 // real + complex -> complex
104 // integer + real -> integer 104 // integer + real -> integer
105 // uint + uint -> uint (the bigger one) 105 // uint + uint -> uint (the bigger one)
186 186
187 // type conversion, including result type information 187 // type conversion, including result type information
188 class type_conv_info 188 class type_conv_info
189 { 189 {
190 public: 190 public:
191 type_conv_info (type_conv_fcn f = 0, int t = -1) : _fcn (f), _type_id (t) { } 191 type_conv_info (type_conv_fcn f = 0, int t = -1)
192 : _fcn (f), _type_id (t) { }
192 193
193 operator type_conv_fcn (void) const { return _fcn; } 194 operator type_conv_fcn (void) const { return _fcn; }
194 195
195 octave_base_value * operator () (const octave_base_value &v) const 196 octave_base_value * operator () (const octave_base_value &v) const
196 { return (*_fcn) (v); } 197 { return (*_fcn) (v); }
197 198
198 int type_id (void) const { return _type_id; } 199 int type_id (void) const { return _type_id; }
199 200
200 private: 201 private:
201 type_conv_fcn _fcn; 202 type_conv_fcn _fcn;
224 virtual octave_base_value * 225 virtual octave_base_value *
225 unique_clone (void) { return clone (); } 226 unique_clone (void) { return clone (); }
226 227
227 virtual type_conv_info 228 virtual type_conv_info
228 numeric_conversion_function (void) const 229 numeric_conversion_function (void) const
229 { return type_conv_info (); } 230 { return type_conv_info (); }
230 231
231 virtual type_conv_info 232 virtual type_conv_info
232 numeric_demotion_function (void) const 233 numeric_demotion_function (void) const
233 { return type_conv_info (); } 234 { return type_conv_info (); }
234 235
235 virtual octave_value squeeze (void) const; 236 virtual octave_value squeeze (void) const;
236 237
237 virtual octave_value full_value (void) const; 238 virtual octave_value full_value (void) const;
238 239
289 virtual idx_vector index_vector (void) const; 290 virtual idx_vector index_vector (void) const;
290 291
291 virtual dim_vector dims (void) const { return dim_vector (); } 292 virtual dim_vector dims (void) const { return dim_vector (); }
292 293
293 octave_idx_type rows (void) const 294 octave_idx_type rows (void) const
294 { 295 {
295 const dim_vector dv = dims (); 296 const dim_vector dv = dims ();
296 297
297 return dv(0); 298 return dv(0);
298 } 299 }
299 300
300 octave_idx_type columns (void) const 301 octave_idx_type columns (void) const
301 { 302 {
302 const dim_vector dv = dims (); 303 const dim_vector dv = dims ();
303 304
304 return dv(1); 305 return dv(1);
305 } 306 }
306 307
307 virtual int ndims (void) const 308 virtual int ndims (void) const
308 { return dims ().length (); } 309 { return dims ().length (); }
309 310
310 virtual octave_idx_type numel (void) const { return dims ().numel (); } 311 virtual octave_idx_type numel (void) const { return dims ().numel (); }
311 312
312 virtual octave_idx_type capacity (void) const { return numel (); } 313 virtual octave_idx_type capacity (void) const { return numel (); }
313 314
468 virtual double double_value (bool = false) const; 469 virtual double double_value (bool = false) const;
469 470
470 virtual float float_value (bool = false) const; 471 virtual float float_value (bool = false) const;
471 472
472 virtual double scalar_value (bool frc_str_conv = false) const 473 virtual double scalar_value (bool frc_str_conv = false) const
473 { return double_value (frc_str_conv); } 474 { return double_value (frc_str_conv); }
474 475
475 virtual float float_scalar_value (bool frc_str_conv = false) const 476 virtual float float_scalar_value (bool frc_str_conv = false) const
476 { return float_value (frc_str_conv); } 477 { return float_value (frc_str_conv); }
477 478
478 virtual Cell cell_value (void) const; 479 virtual Cell cell_value (void) const;
479 480
480 virtual Matrix matrix_value (bool = false) const; 481 virtual Matrix matrix_value (bool = false) const;
481 482
517 518
518 virtual FloatDiagMatrix float_diag_matrix_value (bool = false) const; 519 virtual FloatDiagMatrix float_diag_matrix_value (bool = false) const;
519 520
520 virtual ComplexDiagMatrix complex_diag_matrix_value (bool = false) const; 521 virtual ComplexDiagMatrix complex_diag_matrix_value (bool = false) const;
521 522
522 virtual FloatComplexDiagMatrix float_complex_diag_matrix_value (bool = false) const; 523 virtual FloatComplexDiagMatrix
524 float_complex_diag_matrix_value (bool = false) const;
523 525
524 virtual PermMatrix perm_matrix_value (void) const; 526 virtual PermMatrix perm_matrix_value (void) const;
525 527
526 virtual octave_int8 int8_scalar_value (void) const; 528 virtual octave_int8 int8_scalar_value (void) const;
527 529
574 virtual std::list<std::string> parent_class_name_list (void) const; 576 virtual std::list<std::string> parent_class_name_list (void) const;
575 577
576 virtual string_vector parent_class_names (void) const; 578 virtual string_vector parent_class_names (void) const;
577 579
578 virtual octave_base_value *find_parent_class (const std::string&) 580 virtual octave_base_value *find_parent_class (const std::string&)
579 { return 0; } 581 { return 0; }
580 582
581 virtual octave_base_value *unique_parent_class (const std::string&) 583 virtual octave_base_value *unique_parent_class (const std::string&)
582 { return 0; } 584 { return 0; }
583 585
584 virtual octave_function *function_value (bool silent = false); 586 virtual octave_function *function_value (bool silent = false);
585 587
586 virtual octave_user_function *user_function_value (bool silent = false); 588 virtual octave_user_function *user_function_value (bool silent = false);
587 589
675 677
676 virtual void dump (std::ostream& os) const; 678 virtual void dump (std::ostream& os) const;
677 679
678 // Standard mappers. Register new ones here. 680 // Standard mappers. Register new ones here.
679 enum unary_mapper_t 681 enum unary_mapper_t
680 { 682 {
681 umap_abs, 683 umap_abs,
682 umap_acos, 684 umap_acos,
683 umap_acosh, 685 umap_acosh,
684 umap_angle, 686 umap_angle,
685 umap_arg, 687 umap_arg,
686 umap_asin, 688 umap_asin,
687 umap_asinh, 689 umap_asinh,
688 umap_atan, 690 umap_atan,
689 umap_atanh, 691 umap_atanh,
690 umap_cbrt, 692 umap_cbrt,
691 umap_ceil, 693 umap_ceil,
692 umap_conj, 694 umap_conj,
693 umap_cos, 695 umap_cos,
694 umap_cosh, 696 umap_cosh,
695 umap_erf, 697 umap_erf,
696 umap_erfinv, 698 umap_erfinv,
697 umap_erfcinv, 699 umap_erfcinv,
698 umap_erfc, 700 umap_erfc,
699 umap_erfcx, 701 umap_erfcx,
700 umap_erfi, 702 umap_erfi,
701 umap_dawson, 703 umap_dawson,
702 umap_exp, 704 umap_exp,
703 umap_expm1, 705 umap_expm1,
704 umap_finite, 706 umap_finite,
705 umap_fix, 707 umap_fix,
706 umap_floor, 708 umap_floor,
707 umap_gamma, 709 umap_gamma,
708 umap_imag, 710 umap_imag,
709 umap_isinf, 711 umap_isinf,
710 umap_isna, 712 umap_isna,
711 umap_isnan, 713 umap_isnan,
712 umap_lgamma, 714 umap_lgamma,
713 umap_log, 715 umap_log,
714 umap_log2, 716 umap_log2,
715 umap_log10, 717 umap_log10,
716 umap_log1p, 718 umap_log1p,
717 umap_real, 719 umap_real,
718 umap_round, 720 umap_round,
719 umap_roundb, 721 umap_roundb,
720 umap_signum, 722 umap_signum,
721 umap_sin, 723 umap_sin,
722 umap_sinh, 724 umap_sinh,
723 umap_sqrt, 725 umap_sqrt,
724 umap_tan, 726 umap_tan,
725 umap_tanh, 727 umap_tanh,
726 umap_xisalnum, 728 umap_xisalnum,
727 umap_xisalpha, 729 umap_xisalpha,
728 umap_xisascii, 730 umap_xisascii,
729 umap_xiscntrl, 731 umap_xiscntrl,
730 umap_xisdigit, 732 umap_xisdigit,
731 umap_xisgraph, 733 umap_xisgraph,
732 umap_xislower, 734 umap_xislower,
733 umap_xisprint, 735 umap_xisprint,
734 umap_xispunct, 736 umap_xispunct,
735 umap_xisspace, 737 umap_xisspace,
736 umap_xisupper, 738 umap_xisupper,
737 umap_xisxdigit, 739 umap_xisxdigit,
738 umap_xsignbit, 740 umap_xsignbit,
739 umap_xtoascii, 741 umap_xtoascii,
740 umap_xtolower, 742 umap_xtolower,
741 umap_xtoupper, 743 umap_xtoupper,
742 umap_unknown, 744 umap_unknown,
743 num_unary_mappers = umap_unknown 745 num_unary_mappers = umap_unknown
744 }; 746 };
745 747
746 virtual octave_value map (unary_mapper_t) const; 748 virtual octave_value map (unary_mapper_t) const;
747 749
748 // These are fast indexing & assignment shortcuts for extracting 750 // These are fast indexing & assignment shortcuts for extracting
749 // or inserting a single scalar from/to an array. 751 // or inserting a single scalar from/to an array.
787 octave_value numeric_assign (const std::string& type, 789 octave_value numeric_assign (const std::string& type,
788 const std::list<octave_value_list>& idx, 790 const std::list<octave_value_list>& idx,
789 const octave_value& rhs); 791 const octave_value& rhs);
790 792
791 void reset_indent_level (void) const 793 void reset_indent_level (void) const
792 { curr_print_indent_level = 0; } 794 { curr_print_indent_level = 0; }
793 795
794 void increment_indent_level (void) const 796 void increment_indent_level (void) const
795 { curr_print_indent_level += 2; } 797 { curr_print_indent_level += 2; }
796 798
797 void decrement_indent_level (void) const 799 void decrement_indent_level (void) const
798 { curr_print_indent_level -= 2; } 800 { curr_print_indent_level -= 2; }
799 801
800 int current_print_indent_level (void) const 802 int current_print_indent_level (void) const
801 { return curr_print_indent_level; } 803 { return curr_print_indent_level; }
802 804
803 void indent (std::ostream& os) const; 805 void indent (std::ostream& os) const;
804 806
805 void newline (std::ostream& os) const; 807 void newline (std::ostream& os) const;
806 808