octave: src/symtab.cc annotate

annotate src/symtab.cc @ 9601:a9b37bae1802

add a couple of missing copyright statements

author	Jaroslav Hajek <highegg@gmail.com>
date	Wed, 02 Sep 2009 09:21:36 +0200
parents	3d0d2bda3a0f
children	8d79f36ebdde

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

Mercurial > octave

annotate src/symtab.cc @ 9601:a9b37bae1802