Mercurial > octave-nkf
annotate libinterp/octave-value/ov-mex-fcn.cc @ 20587:f90c8372b7ba
eliminate many more simple uses of error_state
* Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc,
det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc,
gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc,
levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc,
lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc,
pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc,
strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc,
tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc,
__osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc,
symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.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-lazy-idx.cc, ov-mex-fcn.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, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc,
pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc,
pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Oct 2015 19:29:36 -0400 |
| parents | b70cc4bd8109 |
| children |
| rev | line source |
|---|---|
| 5864 | 1 /* |
| 2 | |
|
19731
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19632
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
| 5864 | 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. | |
| 5864 | 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/>. | |
| 5864 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "oct-shlib.h" | |
| 28 | |
| 29 #include <defaults.h> | |
| 30 #include "dynamic-ld.h" | |
| 31 #include "error.h" | |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7872
diff
changeset
|
32 #include "gripes.h" |
| 5864 | 33 #include "oct-obj.h" |
| 34 #include "ov-mex-fcn.h" | |
| 35 #include "ov.h" | |
|
12783
ad9263d965dc
First experimental profiler implementation with flat profile.
Daniel Kraft <d@domob.eu>
parents:
11523
diff
changeset
|
36 #include "profiler.h" |
| 5864 | 37 #include "toplev.h" |
| 38 #include "unwind-prot.h" | |
| 39 | |
| 40 | |
| 41 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_mex_function, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
42 "mex function", "mex function"); |
| 5864 | 43 |
| 44 octave_mex_function::octave_mex_function | |
| 45 (void *fptr, bool fmex, const octave_shlib& shl, | |
| 46 const std::string& nm) | |
| 6068 | 47 : octave_function (nm), mex_fcn_ptr (fptr), exit_fcn_ptr (0), |
| 48 have_fmex (fmex), sh_lib (shl) | |
| 5864 | 49 { |
| 50 mark_fcn_file_up_to_date (time_parsed ()); | |
| 51 | |
| 52 std::string file_name = fcn_file_name (); | |
| 53 | |
| 54 system_fcn_file | |
| 55 = (! file_name.empty () | |
| 56 && Voct_file_dir == file_name.substr (0, Voct_file_dir.length ())); | |
| 57 } | |
| 58 | |
| 59 octave_mex_function::~octave_mex_function (void) | |
| 60 { | |
| 6068 | 61 if (exit_fcn_ptr) |
| 62 (*exit_fcn_ptr) (); | |
| 63 | |
| 7872 | 64 octave_dynamic_loader::remove_mex (my_name, sh_lib); |
| 5864 | 65 } |
| 66 | |
| 67 std::string | |
| 68 octave_mex_function::fcn_file_name (void) const | |
| 69 { | |
| 70 return sh_lib.file_name (); | |
| 71 } | |
| 72 | |
| 73 octave_time | |
| 74 octave_mex_function::time_parsed (void) const | |
| 75 { | |
| 76 return sh_lib.time_loaded (); | |
| 77 } | |
| 78 | |
| 79 octave_value_list | |
| 80 octave_mex_function::subsref (const std::string& type, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
81 const std::list<octave_value_list>& idx, |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
82 int nargout) |
| 5864 | 83 { |
| 84 octave_value_list retval; | |
| 85 | |
| 86 switch (type[0]) | |
| 87 { | |
| 88 case '(': | |
| 89 { | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
90 int tmp_nargout = (type.length () > 1 && nargout == 0) ? 1 : nargout; |
| 5864 | 91 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
92 retval = do_multi_index_op (tmp_nargout, idx.front ()); |
| 5864 | 93 } |
| 94 break; | |
| 95 | |
| 96 case '{': | |
| 97 case '.': | |
| 98 { | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
99 std::string nm = type_name (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
100 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); |
| 5864 | 101 } |
| 102 break; | |
| 103 | |
| 104 default: | |
| 105 panic_impossible (); | |
| 106 } | |
| 107 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
108 // FIXME: perhaps there should be an |
| 5864 | 109 // octave_value_list::next_subsref member function? See also |
| 110 // octave_user_function::subsref. | |
| 111 // | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
112 // FIXME: Note that if a function call returns multiple |
| 5864 | 113 // values, and there is further indexing to perform, then we are |
| 114 // ignoring all but the first value. Is this really what we want to | |
| 115 // do? If it is not, then what should happen for stat("file").size, | |
| 116 // for exmaple? | |
| 117 | |
| 118 if (idx.size () > 1) | |
| 119 retval = retval(0).next_subsref (nargout, type, idx); | |
| 120 | |
| 121 return retval; | |
| 122 } | |
| 123 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
124 // FIXME: shouldn't this declaration be a header file somewhere? |
| 5864 | 125 extern octave_value_list |
| 6068 | 126 call_mex (bool have_fmex, void *f, const octave_value_list& args, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
127 int nargout, octave_mex_function *curr_mex_fcn); |
| 5864 | 128 |
| 129 octave_value_list | |
| 130 octave_mex_function::do_multi_index_op (int nargout, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
131 const octave_value_list& args) |
| 5864 | 132 { |
| 133 octave_value_list retval; | |
| 134 | |
| 135 if (args.has_magic_colon ()) | |
|
20463
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19731
diff
changeset
|
136 error ("invalid use of colon in function argument list"); |
| 5864 | 137 else |
| 138 { | |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9396
diff
changeset
|
139 unwind_protect frame; |
| 5864 | 140 |
| 141 octave_call_stack::push (this); | |
| 142 | |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9396
diff
changeset
|
143 frame.add_fcn (octave_call_stack::pop); |
| 5864 | 144 |
|
20569
b70cc4bd8109
begin removal of global error_state variable
John W. Eaton <jwe@octave.org>
parents:
20463
diff
changeset
|
145 BEGIN_PROFILER_BLOCK (octave_mex_function) |
|
19361
91cd85a75705
Reduce profiling overhead using inlining and templates.
Julien Bect <julien.bect@supelec.fr>
parents:
17787
diff
changeset
|
146 |
|
20569
b70cc4bd8109
begin removal of global error_state variable
John W. Eaton <jwe@octave.org>
parents:
20463
diff
changeset
|
147 retval = call_mex (have_fmex, mex_fcn_ptr, args, nargout, this); |
|
b70cc4bd8109
begin removal of global error_state variable
John W. Eaton <jwe@octave.org>
parents:
20463
diff
changeset
|
148 |
|
b70cc4bd8109
begin removal of global error_state variable
John W. Eaton <jwe@octave.org>
parents:
20463
diff
changeset
|
149 END_PROFILER_BLOCK |
| 5864 | 150 } |
| 151 | |
| 152 return retval; | |
| 153 } |