octave: libinterp/corefcn/defun.cc annotate

annotate libinterp/corefcn/defun.cc @ 23532:084245f9bd03

pass reference to evaluator to octave_function call methods * interpreter-private.h, interpreter-private.cc: (__get_evaluator__): New function. * interpreter.h, interpreter.cc (interpreter::m_evaluator): Now a reference instead of a pointer. Change all uses. (interpreter::get_evaluator): New function. (intrepreter::current_evaluator): Delete. Replace all uses with __get_evaluator__. * ov-fcn.h, ov-fcn.cc (octave_function::call): Pass reference to tree_evaluator. Change all functions in derived classes and all uses. (octave_function::subsref): Delete. * ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_script::subsref): Delete. * pt-eval.h, pt-eval.cc (tree_evaluator::m_interpreter): Now a reference instead of a pointer. Change all uses. * ov-classdef.h, ov-classdef.cc (execute_ov): Delete. Replaces uses with calls to feval. (octave_classdef_superclass_ref::subsref): Delete.

author	John W. Eaton <jwe@octave.org>
date	Thu, 25 May 2017 13:13:17 -0400
parents	8744d4ed8fb4
children	14723784b9f2

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 {
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22893 diff changeset	56 const octave_function *cur = octave::call_stack::current ();
8575 f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	57 if (cur)
f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	58 print_usage (cur->name ());
3014 38de16594cb4 [project @ 1997-06-02 20:28:09 by jwe] jwe parents: 3010 diff changeset	59 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	60 error ("print_usage: invalid function");
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	61 }
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	62
080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	63 void
8575 f134925a1cfa m-file implementation of help system Soren Hauberg <soren@hauberg.org> parents: 7923 diff changeset	64 print_usage (const std::string& name)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5814 diff changeset	65 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	66 octave::feval ("print_usage", octave_value (name), 0);
5800 e8be7fe586f9 [project @ 2006-05-10 06:50:45 by jwe] jwe parents: 5794 diff changeset	67 }
e8be7fe586f9 [project @ 2006-05-10 06:50:45 by jwe] jwe parents: 5794 diff changeset	68
3015 2e114e914b77 [project @ 1997-06-02 21:03:55 by jwe] jwe parents: 3014 diff changeset	69 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	70 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	71 {
4448 042cdbb7f317 [project @ 2003-07-08 19:14:55 by jwe] jwe parents: 4445 diff changeset	72 if (version != OCTAVE_API_VERSION)
3986 7cb85d5c7aad [project @ 2002-07-11 15:37:02 by jwe] jwe parents: 3606 diff changeset	73 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	74 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	75 " 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	76 " 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	77 " 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	78 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	79 }
3015 2e114e914b77 [project @ 1997-06-02 21:03:55 by jwe] jwe parents: 3014 diff changeset	80 }
2e114e914b77 [project @ 1997-06-02 21:03:55 by jwe] jwe parents: 3014 diff changeset	81
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	82 // Install variables and functions in the symbol tables.
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	83
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	84 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	85 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	86 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	87 bool /* can_hide_function -- not yet implemented */)
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	88 {
15004 ea6997657614 which: provide source file name for built-in functions John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	89 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	90
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	91 symbol_table::install_built_in_function (name, fcn);
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	92 }
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	93
3258 4964d5391acc [project @ 1999-07-21 21:51:33 by jwe] jwe parents: 3145 diff changeset	94 void
23518 8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	95 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	96 const std::string& file, const std::string& doc,
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	97 bool /* can_hide_function -- not yet implemented */)
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	98 {
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	99 octave_value fcn (new octave_builtin (m, name, file, doc));
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	100
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	101 symbol_table::install_built_in_function (name, fcn);
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	102 }
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 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	105 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	106 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	107 bool relative)
3325 2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	108 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	109 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	110
ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	111 if (relative)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	112 fcn->mark_relative ();
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	113
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	114 octave_value fval (fcn);
5397 b12c0f920da0 [project @ 2005-06-17 07:52:28 by jwe] jwe parents: 5307 diff changeset	115
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	116 symbol_table::install_built_in_function (name, fval);
3325 2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	117 }
2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	118
2efa28a91e7a [project @ 1999-10-29 21:39:20 by jwe] jwe parents: 3259 diff changeset	119 void
23518 8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	120 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	121 const octave::dynamic_library& shl, const std::string& doc,
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	122 bool relative)
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	123 {
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	124 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	125
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	126 if (relative)
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	127 fcn->mark_relative ();
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 octave_value fval (fcn);
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	130
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	131 symbol_table::install_built_in_function (name, fval);
8744d4ed8fb4 provide DEFMETHOD macros John W. Eaton <jwe@octave.org> parents: 23481 diff changeset	132 }
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 void
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	135 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	136 const octave::dynamic_library& shl, bool relative)
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	137 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	138 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	139
ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	140 if (relative)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	141 fcn->mark_relative ();
6323 ea65de49e18e [project @ 2007-02-17 02:51:02 by jwe] jwe parents: 5864 diff changeset	142
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	143 octave_value fval (fcn);
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	144
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	145 symbol_table::install_built_in_function (name, fval);
5864 e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	146 }
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	147
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe] jwe parents: 5823 diff changeset	148 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	149 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	150 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	151 symbol_table::alias_built_in_function (alias, name);
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	152 }
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: diff changeset	153
22893 5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	154 void
5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	155 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	156 {
5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	157 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	158 }
5ff6716cf157 allow dispatch types to be declared for built-in functions John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	159
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	160 octave::dynamic_library
9960 5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	161 get_current_shlib (void)
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 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 retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	164
23052 f97e22a9012a move octave_call_stack inside octave namespace John W. Eaton <jwe@octave.org> parents: 22893 diff changeset	165 octave_function *curr_fcn = octave::call_stack::current ();
9960 5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	166 if (curr_fcn)
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	167 {
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	168 if (curr_fcn->is_dld_function ())
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	169 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	170 octave_dld_function *dld
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	171 = 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	172 retval = dld->get_shlib ();
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 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	175 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	176 octave_mex_function *mex
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	177 = 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	178 retval = mex->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 }
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	181
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	182 return retval;
5f3c10ecb150 implement get_current_shlib and octave_auto_shlib Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	183 }
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	184
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	185 bool
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	186 defun_isargout (int nargout, int iout)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	187 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	188 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	189
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	190 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	191
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	192 if (iout >= std::max (nargout, 1))
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	193 return false;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	194 else if (lvalue_list)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	195 {
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	196 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	197 for (const auto& lval : *lvalue_list)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	198 {
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	199 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	200 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	201 k += lval.numel ();
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	202 if (k > iout)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	203 break;
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
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	206 return true;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	207 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	208 else
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	209 return true;
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
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	212 void
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	213 defun_isargout (int nargout, int nout, bool *isargout)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	214 {
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	215 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	216
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23518 diff changeset	217 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	218
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	219 if (lvalue_list)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	220 {
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	221 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	222 for (const auto& lval : *lvalue_list)
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	223 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	224 if (lval.is_black_hole ())
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	225 isargout[k++] = false;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	226 else
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	227 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	228 int l = std::min (k + lval.numel (),
11287 d81b79c1bd5d fixes for --enable-64 John W. Eaton <jwe@octave.org> parents: 10887 diff changeset	229 static_cast<octave_idx_type> (nout));
10887 f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	230 while (k < l)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	231 isargout[k++] = true;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	232 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	233 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	234 }
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	235 else
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	236 for (int i = 0; i < nout; i++)
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	237 isargout[i] = true;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	238
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	239 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	240 isargout[i] = false;
f10d0bc8f9cc make isargout available to DEFUNs Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	241 }

Mercurial > octave

annotate libinterp/corefcn/defun.cc @ 23532:084245f9bd03