octave: libinterp/corefcn/defun.cc annotate

annotate libinterp/corefcn/defun.cc @ 23553:14723784b9f2

don't use singleton for call_stack * call-stack.h, call-stack.cc (class call_stack): Don't use singleton pattern. Store reference to parent intepreter object in call stack. * pt-eval.h, pt-eval.cc (tree_evaluator::m_call_stack): New data member. (tree_evaluator::get_call_stack): New function. * interpreter-private.h, interpreter-private.cc (__get_call_stack__): New function. * interpreter.h, interpreter.cc (interpreter::get_call_stack): New function. Change all uses of call_stack to access call_stack object from the interpreter.

author	John W. Eaton <jwe@octave.org>
date	Wed, 07 Jun 2017 02:13:05 -0400
parents	084245f9bd03
children	5cb3a2bb5e1e

rev	line source
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	1 /*
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1996-2017 John W. Eaton
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	4
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	6
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22323 diff changeset	8 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22323 diff changeset	9 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22323 diff changeset	10 (at your option) any later version.
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22323 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22323 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22323 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22323 diff changeset	15 GNU General Public License for more details.
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	16
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6323 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6323 diff changeset	19 <http://www.gnu.org/licenses/>.
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	20
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	21 */
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	25 #endif
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	26
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5750 diff changeset	27 #include <sstream>
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3330 diff changeset	28 #include <iostream>
3014 38de16594cb4 [project @ 1997-06-02 20:28:09 by jwe] jwe parents: 3010 diff changeset	29 #include <string>
38de16594cb4 [project @ 1997-06-02 20:28:09 by jwe] jwe parents: 3010 diff changeset	30
22091 0f6fc2ec3b1a move call_stack class to a separate file John W. Eaton <jwe@octave.org> parents: 21750 diff changeset	31 #include "call-stack.h"
3606 89f958b5358f [project @ 2000-03-08 09:30:05 by jwe] jwe parents: 3523 diff changeset	32 #include "defun.h"
3325 2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	33 #include "dynamic-ld.h"
3014 38de16594cb4 [project @ 1997-06-02 20:28:09 by jwe] jwe parents: 3010 diff changeset	34 #include "error.h"
38de16594cb4 [project @ 1997-06-02 20:28:09 by jwe] jwe parents: 3010 diff changeset	35 #include "help.h"
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	36 #include "ov.h"
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	37 #include "ov-builtin.h"
3325 2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	38 #include "ov-dld-fcn.h"
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	39 #include "ov-fcn.h"
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	40 #include "ov-mex-fcn.h"
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	41 #include "ov-usr-fcn.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 19697 diff changeset	42 #include "ovl.h"
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	43 #include "oct-lvalue.h"
3014 38de16594cb4 [project @ 1997-06-02 20:28:09 by jwe] jwe parents: 3010 diff changeset	44 #include "pager.h"
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	45 #include "pt-eval.h"
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	46 #include "interpreter-private.h"
73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	47 #include "interpreter.h"
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	48 #include "symtab.h"
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	49 #include "variables.h"
8575 f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	50 #include "parse.h"
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	51
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	52 // Print the usage part of the doc string of FCN (user-defined or DEFUN).
8575 f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	53 void
f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	54 print_usage (void)
3014 38de16594cb4 [project @ 1997-06-02 20:28:09 by jwe] jwe parents: 3010 diff changeset	55 {
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	56 octave::call_stack& cs = octave::__get_call_stack__ ("print_usage");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	57
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	58 const octave_function *cur = cs.current ();
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	59
8575 f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	60 if (cur)
f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	61 print_usage (cur->name ());
3014 38de16594cb4 [project @ 1997-06-02 20:28:09 by jwe] jwe parents: 3010 diff changeset	62 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	63 error ("print_usage: invalid function");
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	64 }
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	65
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	66 void
8575 f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	67 print_usage (const std::string& name)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	68 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	69 octave::feval ("print_usage", octave_value (name), 0);
5800 e8be7fe586f9 [project @ 2006-05-10 06:50:45 by jwe] jwe parents: 5794 diff changeset	70 }
e8be7fe586f9 [project @ 2006-05-10 06:50:45 by jwe] jwe parents: 5794 diff changeset	71
3015 2e114e914b77 [project @ 1997-06-02 21:03:55 by jwe] jwe parents: 3014 diff changeset	72 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	73 check_version (const std::string& version, const std::string& fcn)
3015 2e114e914b77 [project @ 1997-06-02 21:03:55 by jwe] jwe parents: 3014 diff changeset	74 {
4448 042cdbb7f317 [project @ 2003-07-08 19:14:55 by jwe] jwe parents: 4445 diff changeset	75 if (version != OCTAVE_API_VERSION)
3986 7cb85d5c7aad [project @ 2002-07-11 15:37:02 by jwe] jwe parents: 3606 diff changeset	76 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	77 error ("API version %s found in .oct file function '%s'\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	78 " does not match the running Octave (API version %s)\n"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	79 " this can lead to incorrect results or other failures\n"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	80 " you can fix this problem by recompiling this .oct file",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	81 version.c_str (), fcn.c_str (), OCTAVE_API_VERSION);
3986 7cb85d5c7aad [project @ 2002-07-11 15:37:02 by jwe] jwe parents: 3606 diff changeset	82 }
3015 2e114e914b77 [project @ 1997-06-02 21:03:55 by jwe] jwe parents: 3014 diff changeset	83 }
2e114e914b77 [project @ 1997-06-02 21:03:55 by jwe] jwe parents: 3014 diff changeset	84
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	85 // Install variables and functions in the symbol tables.
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	86
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	87 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	88 install_builtin_function (octave_builtin::fcn f, const std::string& name,
15004 ea6997657614 which: provide source file name for built-in functions John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	89 const std::string& file, const std::string& doc,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	90 bool /* can_hide_function -- not yet implemented */)
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	91 {
15004 ea6997657614 which: provide source file name for built-in functions John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	92 octave_value fcn (new octave_builtin (f, name, file, doc));
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	93
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	94 symbol_table::install_built_in_function (name, fcn);
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	95 }
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	96
3258 4964d5391acc [project @ 1999-07-21 21:51:33 by jwe] jwe parents: 3145 diff changeset	97 void
23518 8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	98 install_builtin_function (octave_builtin::meth m, const std::string& name,
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	99 const std::string& file, const std::string& doc,
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	100 bool /* can_hide_function -- not yet implemented */)
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	101 {
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	102 octave_value fcn (new octave_builtin (m, name, file, doc));
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	103
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	104 symbol_table::install_built_in_function (name, fcn);
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	105 }
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	106
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	107 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	108 install_dld_function (octave_dld_function::fcn f, const std::string& name,
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	109 const octave::dynamic_library& shl, const std::string& doc,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	110 bool relative)
3325 2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	111 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	112 octave_dld_function *fcn = new octave_dld_function (f, shl, name, doc);
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	113
ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	114 if (relative)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	115 fcn->mark_relative ();
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	116
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	117 octave_value fval (fcn);
5397 b12c0f920da0 [project @ 2005-06-17 07:52:28 by jwe] jwe parents: 5307 diff changeset	118
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	119 symbol_table::install_built_in_function (name, fval);
3325 2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	120 }
2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	121
2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	122 void
23518 8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	123 install_dld_function (octave_dld_function::meth m, const std::string& name,
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	124 const octave::dynamic_library& shl, const std::string& doc,
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	125 bool relative)
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	126 {
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	127 octave_dld_function *fcn = new octave_dld_function (m, shl, name, doc);
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	128
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	129 if (relative)
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	130 fcn->mark_relative ();
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	131
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	132 octave_value fval (fcn);
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	133
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	134 symbol_table::install_built_in_function (name, fval);
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	135 }
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	136
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	137 void
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	138 install_mex_function (void *fptr, bool fmex, const std::string& name,
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	139 const octave::dynamic_library& shl, bool relative)
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	140 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	141 octave_mex_function *fcn = new octave_mex_function (fptr, fmex, shl, name);
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	142
ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	143 if (relative)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	144 fcn->mark_relative ();
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	145
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	146 octave_value fval (fcn);
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	147
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	148 symbol_table::install_built_in_function (name, fval);
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	149 }
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	150
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	151 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	152 alias_builtin (const std::string& alias, const std::string& name)
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	153 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	154 symbol_table::alias_built_in_function (alias, name);
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	155 }
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	156
22893 5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	157 void
5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	158 install_builtin_dispatch (const std::string& name, const std::string& klass)
5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	159 {
5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	160 symbol_table::install_built_in_dispatch (name, klass);
5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	161 }
5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	162
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	163 octave::dynamic_library
9960 5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	164 get_current_shlib (void)
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	165 {
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	166 octave::dynamic_library retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	167
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	168 octave::call_stack& cs = octave::__get_call_stack__ ("get_current_shlib");
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	169
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	170 octave_function *curr_fcn = cs.current ();
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	171
9960 5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	172 if (curr_fcn)
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	173 {
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	174 if (curr_fcn->is_dld_function ())
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	175 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	176 octave_dld_function *dld
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	177 = dynamic_cast<octave_dld_function *> (curr_fcn);
9960 5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	178 retval = dld->get_shlib ();
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	179 }
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	180 else if (curr_fcn->is_mex_function ())
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	181 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	182 octave_mex_function *mex
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	183 = dynamic_cast<octave_mex_function *> (curr_fcn);
9960 5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	184 retval = mex->get_shlib ();
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	185 }
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	186 }
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	187
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	188 return retval;
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	189 }
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	190
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	191 bool
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	192 defun_isargout (int nargout, int iout)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	193 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	194 octave::tree_evaluator& tw = octave::__get_evaluator__ ("defun_isargout");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	195
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	196 const std::list<octave_lvalue> *lvalue_list = tw.lvalue_list ();
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	197
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	198 if (iout >= std::max (nargout, 1))
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	199 return false;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	200 else if (lvalue_list)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	201 {
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	202 int k = 0;
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	203 for (const auto& lval : *lvalue_list)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	204 {
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	205 if (k == iout)
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	206 return ! lval.is_black_hole ();
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	207 k += lval.numel ();
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	208 if (k > iout)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	209 break;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	210 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	211
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	212 return true;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	213 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	214 else
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	215 return true;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	216 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	217
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	218 void
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	219 defun_isargout (int nargout, int nout, bool *isargout)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	220 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	221 octave::tree_evaluator& tw = octave::__get_evaluator__ ("defun_isargout");
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	222
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	223 const std::list<octave_lvalue> *lvalue_list = tw.lvalue_list ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	224
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	225 if (lvalue_list)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	226 {
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	227 int k = 0;
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	228 for (const auto& lval : *lvalue_list)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	229 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	230 if (lval.is_black_hole ())
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	231 isargout[k++] = false;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	232 else
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	233 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	234 int l = std::min (k + lval.numel (),
11287 d81b79c1bd5d fixes for --enable-64 John W. Eaton <jwe@octave.org> parents: 10887 diff changeset	235 static_cast<octave_idx_type> (nout));
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	236 while (k < l)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	237 isargout[k++] = true;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	238 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	239 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	240 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	241 else
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	242 for (int i = 0; i < nout; i++)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	243 isargout[i] = true;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	244
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	245 for (int i = std::max (nargout, 1); i < nout; i++)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	246 isargout[i] = false;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	247 }

Mercurial > octave

annotate libinterp/corefcn/defun.cc @ 23553:14723784b9f2