Mercurial > octave-nkf
comparison libinterp/octave-value/ov-typeinfo.cc @ 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 | ea0d4dea1a17 |
comparison
equal
deleted
inserted
replaced
17786:34d9812a943b | 17787:175b392e91fe |
---|---|
64 octave_value_typeinfo::register_type (const std::string& t_name, | 64 octave_value_typeinfo::register_type (const std::string& t_name, |
65 const std::string& c_name, | 65 const std::string& c_name, |
66 const octave_value& val) | 66 const octave_value& val) |
67 { | 67 { |
68 return (instance_ok ()) | 68 return (instance_ok ()) |
69 ? instance->do_register_type (t_name, c_name, val) : -1; | 69 ? instance->do_register_type (t_name, c_name, val) : -1; |
70 } | 70 } |
71 | 71 |
72 bool | 72 bool |
73 octave_value_typeinfo::register_unary_class_op (octave_value::unary_op op, | 73 octave_value_typeinfo::register_unary_class_op (octave_value::unary_op op, |
74 octave_value_typeinfo::unary_class_op_fcn f) | 74 octave_value_typeinfo::unary_class_op_fcn f) |
75 { | 75 { |
76 return (instance_ok ()) | 76 return (instance_ok ()) |
77 ? instance->do_register_unary_class_op (op, f) : false; | 77 ? instance->do_register_unary_class_op (op, f) : false; |
78 } | 78 } |
79 | 79 |
80 bool | 80 bool |
81 octave_value_typeinfo::register_unary_op (octave_value::unary_op op, | 81 octave_value_typeinfo::register_unary_op (octave_value::unary_op op, |
82 int t, octave_value_typeinfo::unary_op_fcn f) | 82 int t, |
83 { | 83 octave_value_typeinfo::unary_op_fcn f) |
84 return (instance_ok ()) | 84 { |
85 ? instance->do_register_unary_op (op, t, f) : false; | 85 return (instance_ok ()) |
86 ? instance->do_register_unary_op (op, t, f) : false; | |
86 } | 87 } |
87 | 88 |
88 bool | 89 bool |
89 octave_value_typeinfo::register_non_const_unary_op (octave_value::unary_op op, | 90 octave_value_typeinfo::register_non_const_unary_op (octave_value::unary_op op, |
90 int t, | 91 int t, |
91 octave_value_typeinfo::non_const_unary_op_fcn f) | 92 octave_value_typeinfo::non_const_unary_op_fcn f) |
92 { | 93 { |
93 return (instance_ok ()) | 94 return (instance_ok ()) |
94 ? instance->do_register_non_const_unary_op (op, t, f) : false; | 95 ? instance->do_register_non_const_unary_op (op, t, f) : false; |
95 } | 96 } |
96 | 97 |
97 bool | 98 bool |
98 octave_value_typeinfo::register_binary_class_op (octave_value::binary_op op, | 99 octave_value_typeinfo::register_binary_class_op (octave_value::binary_op op, |
99 octave_value_typeinfo::binary_class_op_fcn f) | 100 octave_value_typeinfo::binary_class_op_fcn f) |
100 { | 101 { |
101 return (instance_ok ()) | 102 return (instance_ok ()) |
102 ? instance->do_register_binary_class_op (op, f) : false; | 103 ? instance->do_register_binary_class_op (op, f) : false; |
103 } | 104 } |
104 | 105 |
105 bool | 106 bool |
106 octave_value_typeinfo::register_binary_op (octave_value::binary_op op, | 107 octave_value_typeinfo::register_binary_op (octave_value::binary_op op, |
107 int t1, int t2, | 108 int t1, int t2, |
108 octave_value_typeinfo::binary_op_fcn f) | 109 octave_value_typeinfo::binary_op_fcn f) |
109 { | 110 { |
110 return (instance_ok ()) | 111 return (instance_ok ()) |
111 ? instance->do_register_binary_op (op, t1, t2, f) : false; | 112 ? instance->do_register_binary_op (op, t1, t2, f) : false; |
112 } | 113 } |
113 | 114 |
114 bool | 115 bool |
115 octave_value_typeinfo::register_binary_class_op (octave_value::compound_binary_op op, | 116 octave_value_typeinfo::register_binary_class_op (octave_value::compound_binary_op op, |
116 octave_value_typeinfo::binary_class_op_fcn f) | 117 octave_value_typeinfo::binary_class_op_fcn f) |
117 { | 118 { |
118 return (instance_ok ()) | 119 return (instance_ok ()) |
119 ? instance->do_register_binary_class_op (op, f) : false; | 120 ? instance->do_register_binary_class_op (op, f) : false; |
120 } | 121 } |
121 | 122 |
122 bool | 123 bool |
123 octave_value_typeinfo::register_binary_op (octave_value::compound_binary_op op, | 124 octave_value_typeinfo::register_binary_op (octave_value::compound_binary_op op, |
124 int t1, int t2, | 125 int t1, int t2, |
125 octave_value_typeinfo::binary_op_fcn f) | 126 octave_value_typeinfo::binary_op_fcn f) |
126 { | 127 { |
127 return (instance_ok ()) | 128 return (instance_ok ()) |
128 ? instance->do_register_binary_op (op, t1, t2, f) : false; | 129 ? instance->do_register_binary_op (op, t1, t2, f) : false; |
129 } | 130 } |
130 | 131 |
131 bool | 132 bool |
132 octave_value_typeinfo::register_cat_op (int t1, int t2, octave_value_typeinfo::cat_op_fcn f) | 133 octave_value_typeinfo::register_cat_op (int t1, int t2, |
133 { | 134 octave_value_typeinfo::cat_op_fcn f) |
134 return (instance_ok ()) | 135 { |
135 ? instance->do_register_cat_op (t1, t2, f) : false; | 136 return (instance_ok ()) |
137 ? instance->do_register_cat_op (t1, t2, f) : false; | |
136 } | 138 } |
137 | 139 |
138 bool | 140 bool |
139 octave_value_typeinfo::register_assign_op (octave_value::assign_op op, | 141 octave_value_typeinfo::register_assign_op (octave_value::assign_op op, |
140 int t_lhs, int t_rhs, | 142 int t_lhs, int t_rhs, |
141 octave_value_typeinfo::assign_op_fcn f) | 143 octave_value_typeinfo::assign_op_fcn f) |
142 { | 144 { |
143 return (instance_ok ()) | 145 return (instance_ok ()) |
144 ? instance->do_register_assign_op (op, t_lhs, t_rhs, f) : -1; | 146 ? instance->do_register_assign_op (op, t_lhs, t_rhs, f) : -1; |
145 } | 147 } |
146 | 148 |
147 bool | 149 bool |
148 octave_value_typeinfo::register_assignany_op (octave_value::assign_op op, | 150 octave_value_typeinfo::register_assignany_op (octave_value::assign_op op, |
149 int t_lhs, octave_value_typeinfo::assignany_op_fcn f) | 151 int t_lhs, octave_value_typeinfo::assignany_op_fcn f) |
150 { | 152 { |
151 return (instance_ok ()) | 153 return (instance_ok ()) |
152 ? instance->do_register_assignany_op (op, t_lhs, f) : -1; | 154 ? instance->do_register_assignany_op (op, t_lhs, f) : -1; |
153 } | 155 } |
154 | 156 |
155 bool | 157 bool |
156 octave_value_typeinfo::register_pref_assign_conv (int t_lhs, int t_rhs, | 158 octave_value_typeinfo::register_pref_assign_conv (int t_lhs, int t_rhs, |
157 int t_result) | 159 int t_result) |
158 { | 160 { |
159 return (instance_ok ()) | 161 return (instance_ok ()) |
160 ? instance->do_register_pref_assign_conv (t_lhs, t_rhs, t_result) : false; | 162 ? instance->do_register_pref_assign_conv (t_lhs, t_rhs, t_result) |
163 : false; | |
161 } | 164 } |
162 | 165 |
163 bool | 166 bool |
164 octave_value_typeinfo::register_type_conv_op (int t, int t_result, | 167 octave_value_typeinfo::register_type_conv_op (int t, int t_result, |
165 octave_base_value::type_conv_fcn f) | 168 octave_base_value::type_conv_fcn f) |
166 { | 169 { |
167 return (instance_ok ()) | 170 return (instance_ok ()) |
168 ? instance->do_register_type_conv_op (t, t_result, f) : false; | 171 ? instance->do_register_type_conv_op (t, t_result, f) : false; |
169 } | 172 } |
170 | 173 |
171 bool | 174 bool |
172 octave_value_typeinfo::register_widening_op (int t, int t_result, | 175 octave_value_typeinfo::register_widening_op (int t, int t_result, |
173 octave_base_value::type_conv_fcn f) | 176 octave_base_value::type_conv_fcn f) |
174 { | 177 { |
175 return (instance_ok ()) | 178 return (instance_ok ()) |
176 ? instance->do_register_widening_op (t, t_result, f) : false; | 179 ? instance->do_register_widening_op (t, t_result, f) : false; |
177 } | 180 } |
178 | 181 |
179 // FIXME -- we should also store all class names and provide a | 182 // FIXME: we should also store all class names and provide a |
180 // way to list them (calling class with nargin == 0?). | 183 // way to list them (calling class with nargin == 0?). |
181 | 184 |
182 int | 185 int |
183 octave_value_typeinfo::do_register_type (const std::string& t_name, | 186 octave_value_typeinfo::do_register_type (const std::string& t_name, |
184 const std::string& /* c_name */, | 187 const std::string& /* c_name */, |
245 | 248 |
246 warning ("duplicate unary operator '%s' for class dispatch", | 249 warning ("duplicate unary operator '%s' for class dispatch", |
247 op_name.c_str ()); | 250 op_name.c_str ()); |
248 } | 251 } |
249 | 252 |
250 unary_class_ops.checkelem (static_cast<int> (op)) = reinterpret_cast<void *> (f); | 253 unary_class_ops.checkelem (static_cast<int> (op)) |
254 = reinterpret_cast<void *> (f); | |
251 | 255 |
252 return false; | 256 return false; |
253 } | 257 } |
254 | 258 |
255 bool | 259 bool |
256 octave_value_typeinfo::do_register_unary_op (octave_value::unary_op op, | 260 octave_value_typeinfo::do_register_unary_op (octave_value::unary_op op, |
257 int t, octave_value_typeinfo::unary_op_fcn f) | 261 int t, |
262 octave_value_typeinfo::unary_op_fcn f) | |
258 { | 263 { |
259 if (lookup_unary_op (op, t)) | 264 if (lookup_unary_op (op, t)) |
260 { | 265 { |
261 std::string op_name = octave_value::unary_op_as_string (op); | 266 std::string op_name = octave_value::unary_op_as_string (op); |
262 std::string type_name = types(t); | 267 std::string type_name = types(t); |
270 return false; | 275 return false; |
271 } | 276 } |
272 | 277 |
273 bool | 278 bool |
274 octave_value_typeinfo::do_register_non_const_unary_op | 279 octave_value_typeinfo::do_register_non_const_unary_op |
275 (octave_value::unary_op op, int t, octave_value_typeinfo::non_const_unary_op_fcn f) | 280 (octave_value::unary_op op, int t, |
281 octave_value_typeinfo::non_const_unary_op_fcn f) | |
276 { | 282 { |
277 if (lookup_non_const_unary_op (op, t)) | 283 if (lookup_non_const_unary_op (op, t)) |
278 { | 284 { |
279 std::string op_name = octave_value::unary_op_as_string (op); | 285 std::string op_name = octave_value::unary_op_as_string (op); |
280 std::string type_name = types(t); | 286 std::string type_name = types(t); |
281 | 287 |
282 warning ("duplicate unary operator '%s' for type '%s'", | 288 warning ("duplicate unary operator '%s' for type '%s'", |
283 op_name.c_str (), type_name.c_str ()); | 289 op_name.c_str (), type_name.c_str ()); |
284 } | 290 } |
285 | 291 |
286 non_const_unary_ops.checkelem (static_cast<int> (op), t) = reinterpret_cast<void *> (f); | 292 non_const_unary_ops.checkelem (static_cast<int> (op), t) |
293 = reinterpret_cast<void *> (f); | |
287 | 294 |
288 return false; | 295 return false; |
289 } | 296 } |
290 | 297 |
291 bool | 298 bool |
298 | 305 |
299 warning ("duplicate binary operator '%s' for class dispatch", | 306 warning ("duplicate binary operator '%s' for class dispatch", |
300 op_name.c_str ()); | 307 op_name.c_str ()); |
301 } | 308 } |
302 | 309 |
303 binary_class_ops.checkelem (static_cast<int> (op)) = reinterpret_cast<void *> (f); | 310 binary_class_ops.checkelem (static_cast<int> (op)) |
311 = reinterpret_cast<void *> (f); | |
304 | 312 |
305 return false; | 313 return false; |
306 } | 314 } |
307 | 315 |
308 bool | 316 bool |
318 | 326 |
319 warning ("duplicate binary operator '%s' for types '%s' and '%s'", | 327 warning ("duplicate binary operator '%s' for types '%s' and '%s'", |
320 op_name.c_str (), t1_name.c_str (), t1_name.c_str ()); | 328 op_name.c_str (), t1_name.c_str (), t1_name.c_str ()); |
321 } | 329 } |
322 | 330 |
323 binary_ops.checkelem (static_cast<int> (op), t1, t2) = reinterpret_cast<void *> (f); | 331 binary_ops.checkelem (static_cast<int> (op), t1, t2) |
332 = reinterpret_cast<void *> (f); | |
324 | 333 |
325 return false; | 334 return false; |
326 } | 335 } |
327 | 336 |
328 bool | 337 bool |
335 | 344 |
336 warning ("duplicate compound binary operator '%s' for class dispatch", | 345 warning ("duplicate compound binary operator '%s' for class dispatch", |
337 op_name.c_str ()); | 346 op_name.c_str ()); |
338 } | 347 } |
339 | 348 |
340 compound_binary_class_ops.checkelem (static_cast<int> (op)) = reinterpret_cast<void *> (f); | 349 compound_binary_class_ops.checkelem (static_cast<int> (op)) |
350 = reinterpret_cast<void *> (f); | |
341 | 351 |
342 return false; | 352 return false; |
343 } | 353 } |
344 | 354 |
345 bool | 355 bool |
355 | 365 |
356 warning ("duplicate compound binary operator '%s' for types '%s' and '%s'", | 366 warning ("duplicate compound binary operator '%s' for types '%s' and '%s'", |
357 op_name.c_str (), t1_name.c_str (), t1_name.c_str ()); | 367 op_name.c_str (), t1_name.c_str (), t1_name.c_str ()); |
358 } | 368 } |
359 | 369 |
360 compound_binary_ops.checkelem (static_cast<int> (op), t1, t2) = reinterpret_cast<void *> (f); | 370 compound_binary_ops.checkelem (static_cast<int> (op), t1, t2) |
361 | 371 = reinterpret_cast<void *> (f); |
362 return false; | 372 |
363 } | 373 return false; |
364 | 374 } |
365 bool | 375 |
366 octave_value_typeinfo::do_register_cat_op (int t1, int t2, octave_value_typeinfo::cat_op_fcn f) | 376 bool |
377 octave_value_typeinfo::do_register_cat_op (int t1, int t2, | |
378 octave_value_typeinfo::cat_op_fcn f) | |
367 { | 379 { |
368 if (lookup_cat_op (t1, t2)) | 380 if (lookup_cat_op (t1, t2)) |
369 { | 381 { |
370 std::string t1_name = types(t1); | 382 std::string t1_name = types(t1); |
371 std::string t2_name = types(t2); | 383 std::string t2_name = types(t2); |
392 | 404 |
393 warning ("duplicate assignment operator '%s' for types '%s' and '%s'", | 405 warning ("duplicate assignment operator '%s' for types '%s' and '%s'", |
394 op_name.c_str (), t_lhs_name.c_str (), t_rhs_name.c_str ()); | 406 op_name.c_str (), t_lhs_name.c_str (), t_rhs_name.c_str ()); |
395 } | 407 } |
396 | 408 |
397 assign_ops.checkelem (static_cast<int> (op), t_lhs, t_rhs) = reinterpret_cast<void *> (f); | 409 assign_ops.checkelem (static_cast<int> (op), t_lhs, t_rhs) |
410 = reinterpret_cast<void *> (f); | |
398 | 411 |
399 return false; | 412 return false; |
400 } | 413 } |
401 | 414 |
402 bool | 415 bool |
410 | 423 |
411 warning ("duplicate assignment operator '%s' for types '%s'", | 424 warning ("duplicate assignment operator '%s' for types '%s'", |
412 op_name.c_str (), t_lhs_name.c_str ()); | 425 op_name.c_str (), t_lhs_name.c_str ()); |
413 } | 426 } |
414 | 427 |
415 assignany_ops.checkelem (static_cast<int> (op), t_lhs) = reinterpret_cast<void *> (f); | 428 assignany_ops.checkelem (static_cast<int> (op), t_lhs) |
429 = reinterpret_cast<void *> (f); | |
416 | 430 |
417 return false; | 431 return false; |
418 } | 432 } |
419 | 433 |
420 bool | 434 bool |
594 | 608 |
595 return retval; | 609 return retval; |
596 } | 610 } |
597 | 611 |
598 DEFUN (typeinfo, args, , | 612 DEFUN (typeinfo, args, , |
599 "-*- texinfo -*-\n\ | 613 "-*- texinfo -*-\n\ |
600 @deftypefn {Built-in Function} {} typeinfo ()\n\ | 614 @deftypefn {Built-in Function} {} typeinfo ()\n\ |
601 @deftypefnx {Built-in Function} {} typeinfo (@var{expr})\n\ | 615 @deftypefnx {Built-in Function} {} typeinfo (@var{expr})\n\ |
602 \n\ | 616 \n\ |
603 Return the type of the expression @var{expr}, as a string. If\n\ | 617 Return the type of the expression @var{expr}, as a string. If\n\ |
604 @var{expr} is omitted, return an cell array of strings containing all the\n\ | 618 @var{expr} is omitted, return an cell array of strings containing all the\n\ |