octave: src/symtab.cc annotate

annotate src/symtab.cc @ 9450:cf714e75c656

implement overloaded function handles

author	Jaroslav Hajek <highegg@gmail.com>
date	Thu, 23 Jul 2009 14:44:30 +0200
parents	c5f03874ea2a
children	d34baf412786

rev	line source
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1 /*
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	3 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8819 diff changeset	4 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 John W. Eaton
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	5
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	7
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	11 option) any later version.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	12
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	18 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: 7001 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	20 <http://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	21
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	23
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 220 diff changeset	24 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1045 diff changeset	25 #include <config.h>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	26 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	27
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	28 #include "oct-env.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	29 #include "oct-time.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	30 #include "file-ops.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	31 #include "file-stat.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	32
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	33 #include "defun.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	34 #include "dirfns.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	35 #include "input.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	36 #include "load-path.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	37 #include "symtab.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	38 #include "ov-fcn.h"
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	39 #include "ov-usr-fcn.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	40 #include "pager.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	41 #include "parse.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	42 #include "pt-arg-list.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	43 #include "toplev.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	44 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	45 #include "utils.h"
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	46 #include "debug.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	47
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	48 symbol_table *symbol_table::instance = 0;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	49
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	50 symbol_table::scope_id_cache *symbol_table::scope_id_cache::instance = 0;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	51
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	52 std::map<symbol_table::scope_id, symbol_table*> symbol_table::all_instances;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	53
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	54 std::map<std::string, octave_value> symbol_table::global_table;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	55
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	56 std::map<std::string, symbol_table::fcn_info> symbol_table::fcn_table;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	57
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	58 std::map<std::string, std::set<std::string> > symbol_table::class_precedence_table;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	59
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	60 const symbol_table::scope_id symbol_table::xglobal_scope = 0;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	61 const symbol_table::scope_id symbol_table::xtop_scope = 1;
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4234 diff changeset	62
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	63 symbol_table::scope_id symbol_table::xcurrent_scope = 1;
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	64
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	65 symbol_table::scope_id symbol_table::xparent_scope = -1;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	66
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	67 symbol_table::context_id symbol_table::xcurrent_context = 0;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	68
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	69 // Should Octave always check to see if function files have changed
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	70 // since they were last compiled?
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	71 static int Vignore_function_time_stamp = 1;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	72
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	73 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	74 symbol_table::symbol_record::symbol_record_rep::dump
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	75 (std::ostream& os, const std::string& prefix) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	76 {
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	77 octave_value val = varval (xcurrent_context);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	78
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	79 os << prefix << name;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	80
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	81 if (val.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	82 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	83 os << " ["
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	84 << (is_local () ? "l" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	85 << (is_automatic () ? "a" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	86 << (is_formal () ? "f" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	87 << (is_hidden () ? "h" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	88 << (is_inherited () ? "i" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	89 << (is_global () ? "g" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	90 << (is_persistent () ? "p" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	91 << "] ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	92 val.dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	93 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	94
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	95 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	96 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	97
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	98 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	99 symbol_table::symbol_record::find (const octave_value_list& args) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	100 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	101 octave_value retval;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	102
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	103 if (is_global ())
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	104 retval = symbol_table::global_varref (name ());
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	105 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	106 {
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	107 retval = varval ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	108
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	109 if (retval.is_undefined ())
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	110 {
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	111 // Use cached fcn_info pointer if possible.
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	112 if (rep->finfo)
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	113 retval = rep->finfo->find (args);
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	114 else
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	115 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	116 retval = symbol_table::find_function (name (), args);
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	117
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	118 if (retval.is_defined ())
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	119 rep->finfo = get_fcn_info (name ());
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	120 }
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	121 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	122 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	123
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	124 return retval;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	125 }
c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	126
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	127 // Check the load path to see if file that defined this is still
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	128 // visible. If the file is no longer visible, then erase the
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	129 // definition and move on. If the file is visible, then we also
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	130 // need to check to see whether the file has changed since the the
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	131 // function was loaded/parsed. However, this check should only
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	132 // happen once per prompt (for files found from relative path
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	133 // elements, we also check if the working directory has changed
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	134 // since the last time the function was loaded/parsed).
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	135 //
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	136 // FIXME -- perhaps this should be done for all loaded functions when
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	137 // the prompt is printed or the directory has changed, and then we
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	138 // would not check for it when finding symbol definitions.
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	139
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	140 static inline bool
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	141 load_out_of_date_fcn (const std::string& ff, const std::string& dir_name,
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	142 octave_value& function,
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	143 const std::string& dispatch_type = std::string ())
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	144 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	145 bool retval = false;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	146
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	147 octave_function *fcn = load_fcn_from_file (ff, dir_name, dispatch_type);
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	148
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	149 if (fcn)
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	150 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	151 retval = true;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	152
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	153 function = octave_value (fcn);
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	154 }
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	155 else
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	156 function = octave_value ();
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	157
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	158 return retval;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	159 }
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	160
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	161 static inline bool
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	162 out_of_date_check_internal (octave_function *fcn, octave_value& function,
7942 db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	163 const std::string& dispatch_type = std::string ())
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	164 {
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	165 bool retval = false;
2949 49b42be38aa1 [project @ 1997-05-09 13:54:29 by jwe] jwe parents: 2926 diff changeset	166
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	167 if (fcn)
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	168 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	169 // FIXME -- we need to handle nested functions properly here.
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	170
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	171 if (! fcn->is_nested_function ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	172 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	173 std::string ff = fcn->fcn_file_name ();
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	174
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	175 if (! ff.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	176 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	177 octave_time tc = fcn->time_checked ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	178
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	179 bool relative = fcn->is_relative ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	180
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	181 if (tc < Vlast_prompt_time
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	182 \|\| (relative && tc < Vlast_chdir_time))
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	183 {
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	184 bool clear_breakpoints = false;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	185 std::string nm = fcn->name ();
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	186
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	187 int nm_len = nm.length ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	188
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	189 std::string file;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	190 std::string dir_name;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	191
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	192 if (octave_env::absolute_pathname (nm)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	193 && ((nm_len > 4 && (nm.substr (nm_len-4) == ".oct"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	194 \|\| nm.substr (nm_len-4) == ".mex"))
9074 46a0e6e9e446 fix invalid subscript in symtab.cc Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	195 \|\| (nm_len > 2 && nm.substr (nm_len-2) == ".m")))
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	196 file = nm;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	197 else
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	198 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	199 // We don't want to make this an absolute name,
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	200 // because load_fcn_file looks at the name to
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	201 // decide whether it came from a relative lookup.
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	202
8082 163d20e4d39c symtab.cc (out_of_date_check_internal): check for method, then regular function John W. Eaton <jwe@octave.org> parents: 8021 diff changeset	203 if (! dispatch_type.empty ())
8155 344c9b6532a2 symtab.cc (out_of_date_check_internal): fix order of arguments in call to load_path::find_method John W. Eaton <jwe@octave.org> parents: 8146 diff changeset	204 file = load_path::find_method (dispatch_type, nm,
7942 db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	205 dir_name);
8082 163d20e4d39c symtab.cc (out_of_date_check_internal): check for method, then regular function John W. Eaton <jwe@octave.org> parents: 8021 diff changeset	206
163d20e4d39c symtab.cc (out_of_date_check_internal): check for method, then regular function John W. Eaton <jwe@octave.org> parents: 8021 diff changeset	207 if (file.empty ())
163d20e4d39c symtab.cc (out_of_date_check_internal): check for method, then regular function John W. Eaton <jwe@octave.org> parents: 8021 diff changeset	208 file = load_path::find_fcn (nm, dir_name);
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	209 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	210
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	211 if (file.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	212 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	213 // Can't see this function from current
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	214 // directory, so we should clear it.
195 13c6086c325c [project @ 1993-11-06 10:12:29 by jwe] jwe parents: 191 diff changeset	215
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	216 function = octave_value ();
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	217
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	218 clear_breakpoints = true;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	219 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	220 else if (same_file (file, ff))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	221 {
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	222 // Same file. If it is out of date, then reload it.
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	223
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	224 octave_time ottp = fcn->time_parsed ();
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	225 time_t tp = ottp.unix_time ();
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	226
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	227 fcn->mark_fcn_file_up_to_date (octave_time ());
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	228
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	229 if (! (Vignore_function_time_stamp == 2
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	230 \|\| (Vignore_function_time_stamp
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	231 && fcn->is_system_fcn_file ())))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	232 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	233 file_stat fs (ff);
572 94fd73d1a0bc [project @ 1994-07-28 05:35:47 by jwe] jwe parents: 530 diff changeset	234
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	235 if (fs)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	236 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	237 if (fs.is_newer (tp))
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	238 {
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	239 retval = load_out_of_date_fcn (ff, dir_name,
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	240 function,
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	241 dispatch_type);
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	242
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	243 clear_breakpoints = true;
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	244 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	245 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	246 else
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	247 {
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	248 function = octave_value ();
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	249
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	250 clear_breakpoints = true;
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	251 }
6829 6c85f7d37e61 [project @ 2007-08-24 20:23:21 by dbateman] dbateman parents: 6819 diff changeset	252 }
6c85f7d37e61 [project @ 2007-08-24 20:23:21 by dbateman] dbateman parents: 6819 diff changeset	253 }
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	254 else
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	255 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	256 // Not the same file, so load the new file in
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	257 // place of the old.
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	258
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	259 retval = load_out_of_date_fcn (file, dir_name, function,
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	260 dispatch_type);
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	261
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	262 clear_breakpoints = true;
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	263 }
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	264
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	265 // If the function has been replaced then clear any
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	266 // breakpoints associated with it
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	267 if (clear_breakpoints)
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	268 bp_table::remove_all_breakpoints_in_file (nm, true);
6829 6c85f7d37e61 [project @ 2007-08-24 20:23:21 by dbateman] dbateman parents: 6819 diff changeset	269 }
6c85f7d37e61 [project @ 2007-08-24 20:23:21 by dbateman] dbateman parents: 6819 diff changeset	270 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	271 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	272 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	273
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	274 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	275 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	276
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	277 static inline bool
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	278 out_of_date_check_internal (octave_value& function,
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	279 const std::string& dispatch_type = std::string ())
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	280 {
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	281 return out_of_date_check_internal (function.function_value (true),
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	282 function, dispatch_type);
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	283 }
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	284
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	285 bool
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	286 out_of_date_check (octave_value& function,
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	287 const std::string& dispatch_type)
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	288 {
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	289 return out_of_date_check_internal (function, dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	290 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	291
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	292 bool
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	293 out_of_date_check (octave_function* fcn,
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	294 const std::string& dispatch_type)
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	295 {
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	296 octave_value function;
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	297 return out_of_date_check_internal (fcn, function, dispatch_type);
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	298 }
eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	299
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	300 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	301 symbol_table::fcn_info::fcn_info_rep::load_private_function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	302 (const std::string& dir_name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	303 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	304 octave_value retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	305
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	306 std::string file_name = load_path::find_private_fcn (dir_name, name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	307
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	308 if (! file_name.empty ())
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	309 {
8781 f57c9fdb6836 stash directory name when loading private function John W. Eaton <jwe@octave.org> parents: 8691 diff changeset	310 octave_function *fcn = load_fcn_from_file (file_name, dir_name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	311
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	312 if (fcn)
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	313 {
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	314 std::string class_name;
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	315
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	316 size_t pos = dir_name.find_last_of (file_ops::dir_sep_chars ());
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	317
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	318 if (pos != std::string::npos)
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	319 {
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	320 std::string tmp = dir_name.substr (pos+1);
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	321
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	322 if (tmp[0] == '@')
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	323 class_name = tmp.substr (1);
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	324 }
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	325
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	326 fcn->mark_as_private_function (class_name);
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	327
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	328 retval = octave_value (fcn);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	329
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	330 private_functions[dir_name] = retval;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	331 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	332 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	333
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	334 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	335 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	336
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	337 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	338 symbol_table::fcn_info::fcn_info_rep::load_class_constructor (void)
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	339 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	340 octave_value retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	341
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	342 std::string dir_name;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	343
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	344 std::string file_name = load_path::find_method (name, name, dir_name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	345
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	346 if (! file_name.empty ())
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	347 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	348 octave_function *fcn = load_fcn_from_file (file_name, dir_name, name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	349
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	350 if (fcn)
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	351 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	352 retval = octave_value (fcn);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	353
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	354 class_constructors[name] = retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	355 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	356 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	357
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	358 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	359 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	360
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	361 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	362 symbol_table::fcn_info::fcn_info_rep::load_class_method
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	363 (const std::string& dispatch_type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	364 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	365 octave_value retval;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	366
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	367 if (name == dispatch_type)
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	368 retval = load_class_constructor ();
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	369 else
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	370 {
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	371 std::string dir_name;
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	372
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	373 std::string file_name = load_path::find_method (dispatch_type, name,
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	374 dir_name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	375
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	376 if (! file_name.empty ())
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	377 {
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	378 octave_function *fcn = load_fcn_from_file (file_name, dir_name,
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	379 dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	380
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	381 if (fcn)
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	382 {
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	383 retval = octave_value (fcn);
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	384
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	385 class_methods[dispatch_type] = retval;
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	386 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	387 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	388 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	389
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	390 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	391 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	392
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	393 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	394 symbol_table::fcn_info::fcn_info_rep::print_dispatch (std::ostream& os) const
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	395 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	396 if (dispatch_map.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	397 os << "dispatch: " << name << " is not overloaded" << std::endl;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	398 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	399 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	400 os << "Overloaded function " << name << ":\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	401
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	402 for (dispatch_map_const_iterator p = dispatch_map.begin ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	403 p != dispatch_map.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	404 os << " " << name << " (" << p->first << ", ...) -> "
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	405 << p->second << " (" << p->first << ", ...)\n";
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	406
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	407 os << std::endl;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	408 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	409 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	410
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	411 std::string
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	412 symbol_table::fcn_info::fcn_info_rep::help_for_dispatch (void) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	413 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	414 std::string retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	415
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	416 if (! dispatch_map.empty ())
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	417 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	418 retval = "Overloaded function:\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	419
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	420 for (dispatch_map_const_iterator p = dispatch_map.begin ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	421 p != dispatch_map.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	422 retval += " " + p->second + " (" + p->first + ", ...)\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	423 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	424
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	425 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	426 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	427
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	428 std::string
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	429 get_dispatch_type (const octave_value_list& args)
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	430 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	431 std::string dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	432
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	433 int n = args.length ();
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	434
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	435 if (n > 0)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	436 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	437 // Find first object, if any.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	438
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	439 int i;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	440
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	441 for (i = 0; i < n; i++)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	442 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	443 octave_value arg = args(i);
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	444
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	445 if (arg.is_object ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	446 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	447 dispatch_type = arg.class_name ();
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	448 break;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	449 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	450 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	451
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	452 for (int j = i+1; j < n; j++)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	453 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	454 octave_value arg = args(j);
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	455
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	456 if (arg.is_object ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	457 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	458 std::string cname = arg.class_name ();
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	459
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	460 // Only switch to type of ARG if it is marked superior
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	461 // to the current DISPATCH_TYPE.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	462 if (! symbol_table::is_superiorto (dispatch_type, cname)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	463 && symbol_table::is_superiorto (cname, dispatch_type))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	464 dispatch_type = cname;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	465 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	466 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	467 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	468
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	469 return dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	470 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	471
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	472 // Find the definition of NAME according to the following precedence
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	473 // list:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	474 //
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	475 // variable
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	476 // subfunction
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	477 // private function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	478 // class constructor
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	479 // class method
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	480 // legacy dispatch
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	481 // command-line function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	482 // autoload function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	483 // function on the path
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	484 // built-in function
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	485
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	486 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	487 symbol_table::fcn_info::fcn_info_rep::find (const octave_value_list& args)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	488 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	489 octave_value retval = xfind (args);
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	490
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	491 if (! retval.is_defined ())
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	492 {
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	493 // It is possible that the user created a file on the fly since
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	494 // the last prompt or chdir, so try updating the load path and
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	495 // searching again.
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	496
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	497 load_path::update ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	498
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	499 retval = xfind (args);
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	500 }
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	501
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	502 return retval;
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	503 }
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	504
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	505 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	506 symbol_table::fcn_info::fcn_info_rep::xfind (const octave_value_list& args)
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	507 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	508 // Subfunction. I think it only makes sense to check for
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	509 // subfunctions if we are currently executing a function defined
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	510 // from a .m file.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	511
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	512 scope_val_iterator r = subfunctions.find (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	513
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	514 octave_function *curr_fcn = 0;
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	515
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	516 if (r != subfunctions.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	517 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	518 // FIXME -- out-of-date check here.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	519
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	520 return r->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	521 }
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	522 else
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	523 {
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	524 curr_fcn = octave_call_stack::current ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	525
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	526 if (curr_fcn)
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	527 {
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	528 scope_id pscope = curr_fcn->parent_fcn_scope ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	529
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	530 if (pscope > 0)
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	531 {
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	532 r = subfunctions.find (pscope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	533
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	534 if (r != subfunctions.end ())
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	535 {
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	536 // FIXME -- out-of-date check here.
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	537
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	538 return r->second;
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	539 }
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	540 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	541 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	542 }
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	543
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	544 // Private function.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	545
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	546 if (! curr_fcn)
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	547 curr_fcn = octave_call_stack::current ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	548
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	549 if (curr_fcn)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	550 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	551 std::string dir_name = curr_fcn->dir_name ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	552
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	553 if (! dir_name.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	554 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	555 str_val_iterator q = private_functions.find (dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	556
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	557 if (q == private_functions.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	558 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	559 octave_value val = load_private_function (dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	560
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	561 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	562 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	563 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	564 else
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	565 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	566 octave_value& fval = q->second;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	567
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	568 if (fval.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	569 out_of_date_check_internal (fval);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	570
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	571 if (fval.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	572 return fval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	573 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	574 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	575 octave_value val = load_private_function (dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	576
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	577 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	578 return val;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	579 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	580 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	581 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	582 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	583
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	584 // Class constructors. The class name and function name are the same.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	585
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	586 str_val_iterator q = class_constructors.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	587
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	588 if (q == class_constructors.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	589 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	590 octave_value val = load_class_constructor ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	591
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	592 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	593 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	594 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	595 else
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	596 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	597 octave_value& fval = q->second;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	598
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	599 if (fval.is_defined ())
7942 db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	600 out_of_date_check_internal (fval, name);
867 b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe] jwe parents: 773 diff changeset	601
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	602 if (fval.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	603 return fval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	604 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	605 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	606 octave_value val = load_class_constructor ();
867 b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe] jwe parents: 773 diff changeset	607
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	608 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	609 return val;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	610 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	611 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	612
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	613 // Class methods.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	614
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	615 if (! args.empty ())
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	616 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	617 std::string dispatch_type = get_dispatch_type (args);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	618
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	619 if (dispatch_type.empty ())
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	620 dispatch_type = args(0).class_name ();
cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	621
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	622 octave_value fcn = find_method (dispatch_type);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	623
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	624 if (fcn.is_defined ())
c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	625 return fcn;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	626 }
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	627
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	628 // Legacy dispatch.
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	629
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	630 if (! args.empty () && ! dispatch_map.empty ())
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	631 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	632 std::string dispatch_type = args(0).type_name ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	633
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	634 std::string fname;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	635
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	636 dispatch_map_iterator p = dispatch_map.find (dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	637
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	638 if (p == dispatch_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	639 p = dispatch_map.find ("any");
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	640
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	641 if (p != dispatch_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	642 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	643 fname = p->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	644
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	645 octave_value fcn
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	646 = symbol_table::find_function (fname, args);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	647
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	648 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	649 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	650 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	651 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	652
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	653 // Command-line function.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	654
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	655 if (cmdline_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	656 return cmdline_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	657
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	658 // Autoload?
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	659
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	660 octave_value fcn = find_autoload ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	661
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	662 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	663 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	664
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	665 // Function on the path.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	666
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	667 fcn = find_user_function ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	668
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	669 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	670 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	671
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	672 // Built-in function (might be undefined).
3145 0d640dc625c7 [project @ 1998-02-05 08:44:59 by jwe] jwe parents: 3125 diff changeset	673
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	674 return built_in_function;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	675 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	676
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	677 // Find the definition of NAME according to the following precedence
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	678 // list:
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	679 //
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	680 // built-in function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	681 // function on the path
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	682 // autoload function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	683 // command-line function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	684 // private function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	685 // subfunction
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	686
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	687 // This function is used to implement the "builtin" function, which
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	688 // searches for "built-in" functions. In Matlab, "builtin" only
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	689 // returns functions that are actually built-in to the interpreter.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	690 // But since the list of built-in functions is different in Octave and
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	691 // Matlab, we also search up the precedence list until we find
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	692 // something that matches. Note that we are only searching by name,
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	693 // so class methods, constructors, and legacy dispatch functions are
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	694 // skipped.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	695
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	696 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	697 symbol_table::fcn_info::fcn_info_rep::builtin_find (void)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	698 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	699 octave_value retval = x_builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	700
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	701 if (! retval.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	702 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	703 // It is possible that the user created a file on the fly since
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	704 // the last prompt or chdir, so try updating the load path and
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	705 // searching again.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	706
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	707 load_path::update ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	708
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	709 retval = x_builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	710 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	711
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	712 return retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	713 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	714
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	715 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	716 symbol_table::fcn_info::fcn_info_rep::x_builtin_find (void)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	717 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	718 // Built-in function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	719 if (built_in_function.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	720 return built_in_function;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	721
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	722 // Function on the path.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	723
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	724 octave_value fcn = find_user_function ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	725
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	726 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	727 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	728
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	729 // Autoload?
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	730
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	731 fcn = find_autoload ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	732
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	733 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	734 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	735
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	736 // Command-line function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	737
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	738 if (cmdline_function.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	739 return cmdline_function;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	740
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	741 // Private function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	742
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	743 octave_function *curr_fcn = octave_call_stack::current ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	744
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	745 if (curr_fcn)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	746 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	747 std::string dir_name = curr_fcn->dir_name ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	748
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	749 if (! dir_name.empty ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	750 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	751 str_val_iterator q = private_functions.find (dir_name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	752
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	753 if (q == private_functions.end ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	754 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	755 octave_value val = load_private_function (dir_name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	756
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	757 if (val.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	758 return val;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	759 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	760 else
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	761 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	762 octave_value& fval = q->second;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	763
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	764 if (fval.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	765 out_of_date_check_internal (fval);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	766
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	767 if (fval.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	768 return fval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	769 else
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	770 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	771 octave_value val = load_private_function (dir_name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	772
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	773 if (val.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	774 return val;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	775 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	776 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	777 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	778 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	779
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	780 // Subfunction. I think it only makes sense to check for
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	781 // subfunctions if we are currently executing a function defined
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	782 // from a .m file.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	783
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	784 scope_val_iterator r = subfunctions.find (xcurrent_scope);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	785
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	786 if (r != subfunctions.end ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	787 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	788 // FIXME -- out-of-date check here.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	789
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	790 return r->second;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	791 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	792 else if (curr_fcn)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	793 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	794 scope_id pscope = curr_fcn->parent_fcn_scope ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	795
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	796 if (pscope > 0)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	797 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	798 r = subfunctions.find (pscope);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	799
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	800 if (r != subfunctions.end ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	801 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	802 // FIXME -- out-of-date check here.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	803
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	804 return r->second;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	805 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	806 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	807 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	808
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	809 return octave_value ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	810 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	811
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	812 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	813 symbol_table::fcn_info::fcn_info_rep::find_method (const std::string& dispatch_type)
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	814 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	815 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	816
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	817 str_val_iterator q = class_methods.find (dispatch_type);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	818
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	819 if (q == class_methods.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	820 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	821 octave_value val = load_class_method (dispatch_type);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	822
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	823 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	824 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	825 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	826 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	827 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	828 octave_value& fval = q->second;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	829
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	830 if (fval.is_defined ())
7942 db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	831 out_of_date_check_internal (fval, dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	832
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	833 if (fval.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	834 return fval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	835 else
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	836 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	837 octave_value val = load_class_method (dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	838
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	839 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	840 return val;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	841 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	842 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	843
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	844 return retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	845 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	846
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	847 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	848 symbol_table::fcn_info::fcn_info_rep::find_autoload (void)
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	849 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	850 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	851
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	852 // Autoloaded function.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	853
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	854 if (autoload_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	855 out_of_date_check_internal (autoload_function);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	856
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	857 if (! autoload_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	858 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	859 std::string file_name = lookup_autoload (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	860
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	861 if (! file_name.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	862 {
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7972 diff changeset	863 size_t pos = file_name.find_last_of (file_ops::dir_sep_chars ());
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	864
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	865 std::string dir_name = file_name.substr (0, pos);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	866
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	867 octave_function *fcn = load_fcn_from_file (file_name, dir_name,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	868 "", name, true);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	869
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	870 if (fcn)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	871 autoload_function = octave_value (fcn);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	872 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	873 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	874
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	875 return autoload_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	876 }
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	877
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	878 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	879 symbol_table::fcn_info::fcn_info_rep::find_user_function (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	880 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	881 // Function on the path.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	882
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	883 if (function_on_path.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	884 out_of_date_check_internal (function_on_path);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	885
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	886 if (! function_on_path.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	887 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	888 std::string dir_name;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	889
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	890 std::string file_name = load_path::find_fcn (name, dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	891
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	892 if (! file_name.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	893 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	894 octave_function *fcn = load_fcn_from_file (file_name, dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	895
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	896 if (fcn)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	897 function_on_path = octave_value (fcn);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	898 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	899 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	900
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	901 return function_on_path;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	902 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	903
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	904 // Insert INF_CLASS in the set of class names that are considered
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	905 // inferior to SUP_CLASS. Return FALSE if INF_CLASS is currently
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	906 // marked as superior to SUP_CLASS.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	907
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	908 bool
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	909 symbol_table::set_class_relationship (const std::string& sup_class,
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	910 const std::string& inf_class)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	911 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	912 class_precedence_table_const_iterator p
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	913 = class_precedence_table.find (inf_class);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	914
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	915 if (p != class_precedence_table.end ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	916 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	917 const std::set<std::string>& inferior_classes = p->second;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	918
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	919 std::set<std::string>::const_iterator q
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	920 = inferior_classes.find (sup_class);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	921
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	922 if (q != inferior_classes.end ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	923 return false;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	924 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	925
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	926 class_precedence_table[sup_class].insert (inf_class);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	927
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	928 return true;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	929 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	930
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	931 // Has class A been marked as superior to class B? Also returns
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	932 // TRUE if B has been marked as inferior to A, since we only keep
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	933 // one table, and convert inferiort information to a superiorto
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	934 // relationship. Two calls are required to determine whether there
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	935 // is no relationship between two classes:
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	936 //
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	937 // if (symbol_table::is_superiorto (a, b))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	938 // // A is superior to B, or B has been marked inferior to A.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	939 // else if (symbol_table::is_superiorto (b, a))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	940 // // B is superior to A, or A has been marked inferior to B.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	941 // else
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	942 // // No relation.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	943
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	944 bool
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	945 symbol_table::is_superiorto (const std::string& a, const std::string& b)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	946 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	947 bool retval = false;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	948
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	949 class_precedence_table_const_iterator p = class_precedence_table.find (a);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	950
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	951 if (p != class_precedence_table.end ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	952 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	953 const std::set<std::string>& inferior_classes = p->second;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	954 std::set<std::string>::const_iterator q = inferior_classes.find (b);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	955
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	956 if (q != inferior_classes.end ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	957 retval = true;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	958 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	959
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	960 return retval;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	961 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	962
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	963 static std::string
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	964 fcn_file_name (const octave_value& fcn)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	965 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	966 const octave_function *f = fcn.function_value ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	967
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	968 return f ? f->fcn_file_name () : std::string ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	969 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	970
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	971 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	972 symbol_table::fcn_info::fcn_info_rep::dump
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	973 (std::ostream& os, const std::string& prefix) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	974 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	975 os << prefix << name
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	976 << " ["
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	977 << (cmdline_function.is_defined () ? "c" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	978 << (built_in_function.is_defined () ? "b" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	979 << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	980
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	981 std::string tprefix = prefix + " ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	982
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	983 if (autoload_function.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	984 os << tprefix << "autoload: "
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	985 << fcn_file_name (autoload_function) << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	986
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	987 if (function_on_path.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	988 os << tprefix << "function from path: "
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	989 << fcn_file_name (function_on_path) << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	990
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	991 if (! subfunctions.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	992 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	993 for (scope_val_const_iterator p = subfunctions.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	994 p != subfunctions.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	995 os << tprefix << "subfunction: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	996 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	997 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	998
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	999 if (! private_functions.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1000 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1001 for (str_val_const_iterator p = private_functions.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1002 p != private_functions.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1003 os << tprefix << "private: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1004 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1005 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1006
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1007 if (! class_constructors.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1008 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1009 for (str_val_const_iterator p = class_constructors.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1010 p != class_constructors.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1011 os << tprefix << "constructor: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1012 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1013 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1014
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1015 if (! class_methods.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1016 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1017 for (str_val_const_iterator p = class_methods.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1018 p != class_methods.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1019 os << tprefix << "method: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1020 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1021 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1022
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1023 if (! dispatch_map.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1024 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1025 for (dispatch_map_const_iterator p = dispatch_map.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1026 p != dispatch_map.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1027 os << tprefix << "dispatch: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1028 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1029 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1030 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1031
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1032 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1033 symbol_table::fcn_info::find (const octave_value_list& args)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1034 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1035 return rep->find (args);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1036 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1037
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1038 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1039 symbol_table::find (const std::string& name,
c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1040 const octave_value_list& args,
c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1041 bool skip_variables)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1042 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	1043 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1044
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1045 return inst
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1046 ? inst->do_find (name, args, skip_variables)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1047 : octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1048 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1049
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1050 octave_value
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1051 symbol_table::builtin_find (const std::string& name)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1052 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1053 symbol_table *inst = get_instance (xcurrent_scope);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1054
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1055 return inst ? inst->do_builtin_find (name) : octave_value ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1056 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1057
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1058 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1059 symbol_table::find_function (const std::string& name,
c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1060 const octave_value_list& args)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1061 {
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1062 octave_value retval;
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1063
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1064 if (! name.empty () && name[0] == '@')
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1065 {
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1066 // Look for a class specific function.
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1067 std::string dispatch_type =
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1068 name.substr (1, name.find_first_of (file_ops::dir_sep_str ()) - 1);
64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1069
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1070 std::string method =
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1071 name.substr (name.find_last_of (file_ops::dir_sep_str ()) + 1,
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1072 std::string::npos);
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1073
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1074 retval = find_method (method, dispatch_type);
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1075 }
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1076 else
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1077 {
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1078 size_t pos = name.find_first_of (Vfilemarker);
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1079
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1080 if (pos == std::string::npos)
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1081 retval = find (name, args, true);
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1082 else
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1083 {
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1084 std::string fcn_scope = name.substr (0, pos);
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1085 scope_id stored_scope = xcurrent_scope;
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1086 xcurrent_scope = xtop_scope;
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1087 octave_value parent = find_function (name.substr(0, pos));
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1088
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1089 if (parent.is_defined ())
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1090 {
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1091 octave_function *parent_fcn = parent.function_value ();
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1092
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1093 if (parent_fcn)
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1094 {
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1095 xcurrent_scope = parent_fcn->scope ();
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1096
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1097 if (xcurrent_scope > 1)
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1098 retval = find_function (name.substr (pos + 1), args);
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1099 }
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1100 }
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1101
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1102 xcurrent_scope = stored_scope;
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1103 }
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1104 }
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1105
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1106 return retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1107 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1108
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1109 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1110 symbol_table::dump (std::ostream& os, scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1111 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1112 if (scope == xglobal_scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1113 dump_global (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1114 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1115 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1116 symbol_table *inst = get_instance (scope, false);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1117
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1118 if (inst)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1119 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1120 os << "*** dumping symbol table scope " << scope
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1121 << " (" << inst->table_name << ")\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1122
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1123 std::map<std::string, octave_value> sfuns
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1124 = symbol_table::subfunctions_defined_in_scope (scope);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1125
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1126 if (! sfuns.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1127 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1128 os << " subfunctions defined in this scope:\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1129
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1130 for (std::map<std::string, octave_value>::const_iterator p = sfuns.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1131 p != sfuns.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1132 os << " " << p->first << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1133
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1134 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1135 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1136
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1137 inst->do_dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1138 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1139 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1140 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1141
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1142 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1143 symbol_table::dump_global (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1144 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1145 if (! global_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1146 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1147 os << "*** dumping global symbol table\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1148
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1149 for (global_table_const_iterator p = global_table.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1150 p != global_table.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1151 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1152 std::string nm = p->first;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1153 octave_value val = p->second;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1154
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1155 os << " " << nm << " ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1156 val.dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1157 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1158 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1159 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1160 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1161
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1162 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1163 symbol_table::dump_functions (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1164 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1165 if (! fcn_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1166 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1167 os << "*** dumping globally visible functions from symbol table\n"
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1168 << " (c=commandline, b=built-in)\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1169
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1170 for (fcn_table_const_iterator p = fcn_table.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1171 p != fcn_table.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1172 p->second.dump (os, " ");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1173
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1174 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1175 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1176 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1177
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1178 void
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1179 symbol_table::stash_dir_name_for_subfunctions (scope_id scope,
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1180 const std::string& dir_name)
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1181 {
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1182 // FIXME -- is this the best way to do this? Maybe it would be
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1183 // better if we had a map from scope to list of subfunctions
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1184 // stored with the function. Do we?
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1185
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1186 for (fcn_table_const_iterator p = fcn_table.begin ();
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1187 p != fcn_table.end (); p++)
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1188 {
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1189 std::pair<std::string, octave_value> tmp
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1190 = p->second.subfunction_defined_in_scope (scope);
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1191
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1192 std::string nm = tmp.first;
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1193
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1194 if (! nm.empty ())
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1195 {
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1196 octave_value& fcn = tmp.second;
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1197
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1198 octave_user_function *f = fcn.user_function_value ();
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1199
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1200 if (f)
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1201 f->stash_dir_name (dir_name);
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1202 }
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1203 }
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1204 }
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1205
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1206 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1207 symbol_table::do_find (const std::string& name,
c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1208 const octave_value_list& args,
c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1209 bool skip_variables)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1210 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1211 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1212
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1213 // Variable.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1214
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1215 if (! skip_variables)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1216 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1217 table_iterator p = table.find (name);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1218
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1219 if (p != table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1220 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1221 symbol_record sr = p->second;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1222
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1223 // FIXME -- should we be using something other than varref here?
5005 62da6b854fdb [project @ 2004-09-17 01:57:41 by jwe] jwe parents: 4914 diff changeset	1224
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1225 if (sr.is_global ())
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	1226 return symbol_table::global_varref (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1227 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1228 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1229 octave_value& val = sr.varref ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1230
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1231 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1232 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1233 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1234 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1235 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1236
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1237 fcn_table_iterator p = fcn_table.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1238
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1239 if (p != fcn_table.end ())
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1240 return p->second.find (args);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1241 else
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1242 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1243 fcn_info finfo (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1244
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1245 octave_value fcn = finfo.find (args);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1246
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1247 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1248 fcn_table[name] = finfo;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1249
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1250 return fcn;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1251 }
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1252
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1253 return retval;
605 4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 584 diff changeset	1254 }
4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 584 diff changeset	1255
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1256 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1257 symbol_table::do_builtin_find (const std::string& name)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1258 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1259 octave_value retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1260
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1261 fcn_table_iterator p = fcn_table.find (name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1262
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1263 if (p != fcn_table.end ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1264 return p->second.builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1265 else
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1266 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1267 fcn_info finfo (name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1268
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1269 octave_value fcn = finfo.builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1270
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1271 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1272 fcn_table[name] = finfo;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1273
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1274 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1275 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1276
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1277 return retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1278 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1279
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1280 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1281 symbol_table::do_dump (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1282 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1283 if (! persistent_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1284 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1285 os << " persistent variables in this scope:\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1286
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1287 for (persistent_table_const_iterator p = persistent_table.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1288 p != persistent_table.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1289 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1290 std::string nm = p->first;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1291 octave_value val = p->second;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1292
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1293 os << " " << nm << " ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1294 val.dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1295 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1296 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1297
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1298 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1299 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1300
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1301 if (! table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1302 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1303 os << " other symbols in this scope (l=local; a=auto; f=formal\n"
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1304 << " h=hidden; i=inherited; g=global; p=persistent)\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1305
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1306 for (table_const_iterator p = table.begin (); p != table.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1307 p->second.dump (os, " ");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1308
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1309 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1310 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1311 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1312
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1313 DEFUN (ignore_function_time_stamp, args, nargout,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1314 "-- texinfo --\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1315 @deftypefn {Built-in Function} {@var{val} =} ignore_function_time_stamp ()\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1316 @deftypefnx {Built-in Function} {@var{old_val} =} ignore_function_time_stamp (@var{new_val})\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1317 Query or set the internal variable that controls whether Octave checks\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1318 the time stamp on files each time it looks up functions defined in\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1319 function files. If the internal variable is set to @code{\"system\"},\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1320 Octave will not automatically recompile function files in subdirectories of\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1321 @file{@var{octave-home}/lib/@var{version}} if they have changed since\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1322 they were last compiled, but will recompile other function files in the\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1323 search path if they change. If set to @code{\"all\"}, Octave will not\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1324 recompile any function files unless their definitions are removed with\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1325 @code{clear}. If set to \"none\", Octave will always check time stamps\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1326 on files to determine whether functions defined in function files\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1327 need to recompiled.\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1328 @end deftypefn")
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	1329 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1330 octave_value retval;
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	1331
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1332 if (nargout > 0)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1333 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1334 switch (Vignore_function_time_stamp)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1335 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1336 case 1:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1337 retval = "system";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1338 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1339
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1340 case 2:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1341 retval = "all";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1342 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1343
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1344 default:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1345 retval = "none";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1346 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1347 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1348 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1349
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1350 int nargin = args.length ();
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1351
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1352 if (nargin == 1)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1353 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1354 std::string sval = args(0).string_value ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1355
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1356 if (! error_state)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1357 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1358 if (sval == "all")
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1359 Vignore_function_time_stamp = 2;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1360 else if (sval == "system")
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1361 Vignore_function_time_stamp = 1;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1362 else if (sval == "none")
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1363 Vignore_function_time_stamp = 0;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1364 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1365 error ("ignore_function_time_stamp: expecting argument to be \"all\", \"system\", or \"none\"");
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1366 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1367 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1368 error ("ignore_function_time_stamp: expecting argument to be character string");
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1369 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1370 else if (nargin > 1)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1371 print_usage ();
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4234 diff changeset	1372
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1373 return retval;
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	1374 }
7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	1375
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1376 DEFUN (__current_scope__, , ,
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1377 "-- texinfo --\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1378 @deftypefn {Built-in Function} {[@var{scope}, @var{context}]} __dump_symtab_info__ ()\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1379 Undocumented internal function.\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1380 @end deftypefn")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1381 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1382 octave_value_list retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1383
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1384 retval(1) = symbol_table::current_context ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1385 retval(0) = symbol_table::current_scope ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1386
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1387 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1388 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1389
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1390 DEFUN (__dump_symtab_info__, args, ,
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1391 "-- texinfo --\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1392 @deftypefn {Built-in Function} {} __dump_symtab_info__ ()\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1393 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (@var{scope})\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1394 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"scopes\")\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1395 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"functions\")\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1396 Undocumented internal function.\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1397 @end deftypefn")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1398 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1399 octave_value retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1400
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1401 int nargin = args.length ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1402
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1403 if (nargin == 0)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1404 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1405 symbol_table::dump_functions (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1406
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1407 symbol_table::dump_global (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1408
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1409 std::list<symbol_table::scope_id> lst = symbol_table::scopes ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1410
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1411 for (std::list<symbol_table::scope_id>::const_iterator p = lst.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1412 p != lst.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1413 symbol_table::dump (octave_stdout, *p);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1414 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1415 else if (nargin == 1)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1416 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1417 octave_value arg = args(0);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1418
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1419 if (arg.is_string ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1420 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1421 std::string s_arg = arg.string_value ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1422
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1423 if (s_arg == "scopes")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1424 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1425 std::list<symbol_table::scope_id> lst = symbol_table::scopes ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1426
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1427 RowVector v (lst.size ());
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1428
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1429 octave_idx_type k = 0;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1430
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1431 for (std::list<symbol_table::scope_id>::const_iterator p = lst.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1432 p != lst.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1433 v.xelem (k++) = *p;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1434
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1435 retval = v;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1436 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1437 else if (s_arg == "functions")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1438 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1439 symbol_table::dump_functions (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1440 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1441 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1442 error ("__dump_symtab_info__: expecting \"functions\" or \"scopes\"");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1443 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1444 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1445 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1446 int s = arg.int_value ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1447
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1448 if (! error_state)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1449 symbol_table::dump (octave_stdout, s);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1450 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1451 error ("__dump_symtab_info__: expecting string or scope id");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1452 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1453 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1454 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1455 print_usage ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1456
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1457 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1458 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1459
7437 3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1460 #if 0
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1461
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1462 // FIXME -- should we have functions like this in Octave?
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1463
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1464 DEFUN (set_variable, args, , "set_variable (NAME, VALUE)")
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1465 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1466 octave_value retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1467
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1468 if (args.length () == 2)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1469 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1470 std::string name = args(0).string_value ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1471
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1472 if (! error_state)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1473 symbol_table::varref (name) = args(1);
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1474 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1475 error ("set_variable: expecting variable name as first argument");
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1476 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1477 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1478 print_usage ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1479
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1480 return retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1481 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1482
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1483 DEFUN (variable_value, args, , "VALUE = variable_value (NAME)")
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1484 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1485 octave_value retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1486
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1487 if (args.length () == 1)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1488 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1489 std::string name = args(0).string_value ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1490
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1491 if (! error_state)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1492 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1493 retval = symbol_table::varval (name);
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1494
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1495 if (retval.is_undefined ())
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1496 error ("variable_value: `%s' is not a variable in the current scope",
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1497 name.c_str ());
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1498 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1499 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1500 error ("variable_value: expecting variable name as first argument");
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1501 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1502 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1503 print_usage ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1504
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1505 return retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1506 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1507 #endif
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1508
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1509 /*
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1510 ;;; Local Variables: ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1511 ;;; mode: C++ ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1512 ;;; End: ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1513 */

Mercurial > octave

annotate src/symtab.cc @ 9450:cf714e75c656