octave: src/symtab.cc annotate

annotate src/symtab.cc @ 8082:163d20e4d39c

symtab.cc (out_of_date_check_internal): check for method, then regular function

author	John W. Eaton <jwe@octave.org>
date	Wed, 03 Sep 2008 11:20:25 -0400
parents	85184151822e
children	eb2beef9a9ff

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,
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	4 2002, 2003, 2004, 2005, 2006, 2007 John W. Eaton
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	5
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	7
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	11 option) any later version.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	12
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	20 <http://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	21
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	23
240 a99f28f5e351 [project @ 1993-11-30 20:24:36 by jwe] jwe parents: 220 diff changeset	24 #ifdef HAVE_CONFIG_H
1192 b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe] jwe parents: 1045 diff changeset	25 #include <config.h>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	26 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	27
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	28 #include "oct-env.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	29 #include "oct-time.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	30 #include "file-ops.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	31 #include "file-stat.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	32
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	33 #include "defun.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	34 #include "dirfns.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	35 #include "input.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	36 #include "load-path.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	37 #include "symtab.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	38 #include "ov-fcn.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	39 #include "pager.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	40 #include "parse.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	41 #include "pt-arg-list.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	42 #include "toplev.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	43 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	44 #include "utils.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	45
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	46 symbol_table *symbol_table::instance = 0;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	47
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	48 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	49
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	50 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	51
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	52 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	53
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	54 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	55
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	56 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	57
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	58 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	59 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	60
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	61 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	62
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	63 symbol_table::scope_id symbol_table::xparent_scope = -1;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	64
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	65 std::deque<symbol_table::scope_id> symbol_table::scope_stack;
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4234 diff changeset	66
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	67 symbol_table::context_id symbol_table::xcurrent_context = 0;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	68
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	69 // Should Octave always check to see if function files have changed
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	70 // since they were last compiled?
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	71 static int Vignore_function_time_stamp = 1;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	72
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	73 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	74 symbol_table::symbol_record::symbol_record_rep::dump
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	75 (std::ostream& os, const std::string& prefix) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	76 {
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	77 octave_value val = varval (xcurrent_context);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	78
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	79 os << prefix << name;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	80
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	81 if (val.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	82 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	83 os << " ["
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	84 << (is_local () ? "l" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	85 << (is_automatic () ? "a" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	86 << (is_formal () ? "f" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	87 << (is_hidden () ? "h" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	88 << (is_inherited () ? "i" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	89 << (is_global () ? "g" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	90 << (is_persistent () ? "p" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	91 << "] ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	92 val.dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	93 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	94
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	95 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	96 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	97
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	98 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	99 symbol_table::symbol_record::find (tree_argument_list *args,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	100 const string_vector& arg_names,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	101 octave_value_list& evaluated_args,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	102 bool& args_evaluated) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	103 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	104 octave_value retval;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	105
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	106 if (is_global ())
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	107 return symbol_table::global_varref (name ());
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	108 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	109 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	110 octave_value val = varval ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	111
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	112 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	113 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	114 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	115
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	116 return symbol_table::find_function (name (), args, arg_names,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	117 evaluated_args, args_evaluated);
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	118 }
c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	119
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	120 // 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	121 // 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	122 // 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	123 // 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	124 // function was loaded/parsed. However, this check should only
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	125 // 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	126 // 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	127 // since the last time the function was loaded/parsed).
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	128 //
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	129 // 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	130 // 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	131 // 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	132
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	133 static inline bool
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	134 load_out_of_date_fcn (const std::string& ff, const std::string& dir_name,
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	135 octave_value& function)
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	136 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	137 bool retval = false;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	138
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	139 octave_function *fcn = load_fcn_from_file (ff, dir_name);
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	140
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	141 if (fcn)
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	142 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	143 retval = true;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	144
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	145 function = octave_value (fcn);
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	146 }
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	147 else
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	148 function = octave_value ();
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 return retval;
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
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	153 static inline bool
7942 db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	154 out_of_date_check_internal (octave_value& function,
db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	155 const std::string& dispatch_type = std::string ())
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	156 {
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	157 bool retval = false;
2949 49b42be38aa1 [project @ 1997-05-09 13:54:29 by jwe] jwe parents: 2926 diff changeset	158
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	159 octave_function *fcn = function.function_value (true);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	160
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	161 if (fcn)
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	162 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	163 // 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	164
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	165 if (! fcn->is_nested_function ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	166 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	167 std::string ff = fcn->fcn_file_name ();
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	168
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	169 if (! ff.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	170 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	171 octave_time tc = fcn->time_checked ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	172
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	173 bool relative = fcn->is_relative ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	174
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	175 if (tc < Vlast_prompt_time
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	176 \|\| (relative && tc < Vlast_chdir_time))
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	177 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	178 std::string nm = fcn->name ();
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	179
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	180 int nm_len = nm.length ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	181
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	182 std::string file;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	183 std::string dir_name;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	184
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	185 if (octave_env::absolute_pathname (nm)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	186 && ((nm_len > 4 && (nm.substr (nm_len-4) == ".oct"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	187 \|\| nm.substr (nm_len-4) == ".mex"))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	188 \|\| (nm_len > 2 && nm.substr (nm_len-4) == ".m")))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	189 file = nm;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	190 else
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	191 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	192 // We don't want to make this an absolute name,
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	193 // because load_fcn_file looks at the name to
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	194 // decide whether it came from a relative lookup.
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	195
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	196 if (! dispatch_type.empty ())
7942 db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	197 file = load_path::find_method (nm, dispatch_type,
db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	198 dir_name);
8082 163d20e4d39c symtab.cc (out_of_date_check_internal): check for method, then regular function John W. Eaton <jwe@octave.org> parents: 8021 diff changeset	199
163d20e4d39c symtab.cc (out_of_date_check_internal): check for method, then regular function John W. Eaton <jwe@octave.org> parents: 8021 diff changeset	200 if (file.empty ())
163d20e4d39c symtab.cc (out_of_date_check_internal): check for method, then regular function John W. Eaton <jwe@octave.org> parents: 8021 diff changeset	201 file = load_path::find_fcn (nm, dir_name);
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	202 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	203
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	204 if (file.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	205 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	206 // Can't see this function from current
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	207 // directory, so we should clear it.
195 13c6086c325c [project @ 1993-11-06 10:12:29 by jwe] jwe parents: 191 diff changeset	208
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	209 function = octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	210 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	211 else if (same_file (file, ff))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	212 {
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	213 // 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	214
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	215 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	216 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	217
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	218 fcn->mark_fcn_file_up_to_date (octave_time ());
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	219
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	220 if (! (Vignore_function_time_stamp == 2
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	221 \|\| (Vignore_function_time_stamp
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	222 && fcn->is_system_fcn_file ())))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	223 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	224 file_stat fs (ff);
572 94fd73d1a0bc [project @ 1994-07-28 05:35:47 by jwe] jwe parents: 530 diff changeset	225
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	226 if (fs)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	227 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	228 if (fs.is_newer (tp))
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	229 retval = load_out_of_date_fcn (ff, dir_name,
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	230 function);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	231 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	232 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	233 function = octave_value ();
6829 6c85f7d37e61 [project @ 2007-08-24 20:23:21 by dbateman] dbateman parents: 6819 diff changeset	234 }
6c85f7d37e61 [project @ 2007-08-24 20:23:21 by dbateman] dbateman parents: 6819 diff changeset	235 }
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	236 else
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	237 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	238 // 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	239 // place of the old.
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 retval = load_out_of_date_fcn (file, dir_name, function);
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	242 }
6829 6c85f7d37e61 [project @ 2007-08-24 20:23:21 by dbateman] dbateman parents: 6819 diff changeset	243 }
6c85f7d37e61 [project @ 2007-08-24 20:23:21 by dbateman] dbateman parents: 6819 diff changeset	244 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	245 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	246 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	247
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	248 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	249 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	250
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	251 bool
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	252 out_of_date_check (octave_value& function)
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	253 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	254 return out_of_date_check_internal (function);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	255 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	256
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	257 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	258 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	259 (const std::string& dir_name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	260 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	261 octave_value retval;
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 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	264
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	265 if (! file_name.empty ())
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	266 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	267 octave_function *fcn = load_fcn_from_file (file_name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	268
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	269 if (fcn)
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	270 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	271 retval = octave_value (fcn);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	272
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	273 private_functions[dir_name] = retval;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	274 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	275 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	276
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	277 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	278 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	279
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	280 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	281 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	282 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	283 octave_value retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	284
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	285 std::string dir_name;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	286
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	287 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	288
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	289 if (! file_name.empty ())
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	290 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	291 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	292
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	293 if (fcn)
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	294 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	295 retval = octave_value (fcn);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	296
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	297 class_constructors[name] = retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	298 }
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
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	301 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	302 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	303
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	304 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	305 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	306 (const std::string& dispatch_type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	307 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	308 octave_value retval;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	309
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	310 std::string dir_name;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	311
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	312 std::string file_name = load_path::find_method (dispatch_type, name, dir_name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	313
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	314 if (! file_name.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	315 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	316 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	317 dispatch_type);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	318
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	319 if (fcn)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	320 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	321 retval = octave_value (fcn);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	322
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	323 class_methods[dispatch_type] = retval;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	324 }
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 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	328 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	329
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	330 void
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	331 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	332 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	333 if (dispatch_map.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	334 os << "dispatch: " << name << " is not overloaded" << std::endl;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	335 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	336 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	337 os << "Overloaded function " << name << ":\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	338
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	339 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	340 p != dispatch_map.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	341 os << " " << name << " (" << p->first << ", ...) -> "
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	342 << p->second << " (" << p->first << ", ...)\n";
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	343
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	344 os << std::endl;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	345 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	346 }
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 std::string
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	349 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	350 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	351 std::string retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	352
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	353 if (! dispatch_map.empty ())
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	354 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	355 retval = "Overloaded function:\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	356
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	357 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	358 p != dispatch_map.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	359 retval += " " + p->second + " (" + p->first + ", ...)\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	360 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	361
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	362 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	363 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	364
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	365 static std::string
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	366 get_dispatch_type (const octave_value_list& evaluated_args)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	367 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	368 std::string dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	369
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	370 int n = evaluated_args.length ();
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	371
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	372 if (n > 0)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	373 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	374 // Find first object, if any.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	375
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	376 int i;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	377
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	378 for (i = 0; i < n; i++)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	379 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	380 octave_value arg = evaluated_args(i);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	381
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	382 if (arg.is_object ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	383 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	384 dispatch_type = arg.class_name ();
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	385 break;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	386 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	387 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	388
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	389 for (int j = i+1; j < n; j++)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	390 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	391 octave_value arg = evaluated_args(j);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	392
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	393 if (arg.is_object ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	394 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	395 std::string cname = arg.class_name ();
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	396
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	397 // 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	398 // to the current DISPATCH_TYPE.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	399 if (! symbol_table::is_superiorto (dispatch_type, cname)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	400 && symbol_table::is_superiorto (cname, dispatch_type))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	401 dispatch_type = cname;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	402 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	403 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	404
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	405 if (dispatch_type.empty ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	406 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	407 // No object found, so use class of first argument.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	408
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	409 dispatch_type = evaluated_args(0).class_name ();
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	410 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	411 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	412
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	413 return dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	414 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	415
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	416 // 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	417 // list:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	418 //
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	419 // variable
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	420 // subfunction
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	421 // private function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	422 // class constructor
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	423 // class method
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	424 // legacy dispatch
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	425 // command-line function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	426 // autoload function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	427 // function on the path
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	428 // built-in function
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	429
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	430 // Notes:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	431 //
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	432 // FIXME -- we need to evaluate the argument list to determine the
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	433 // dispatch type. The method used here works (pass in the args, pass
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	434 // out the evaluated args and a flag saying whether the evaluation was
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	435 // needed), but it seems a bit inelegant. We do need to save the
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	436 // evaluated args in some way to avoid evaluating them multiple times.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	437 // Maybe evaluated args could be attached to the tree_argument_list
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	438 // object? Then the argument list could be evaluated outside of this
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	439 // function and we could elimnate the arg_names, evaluated_args, and
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	440 // args_evaluated arguments. We would still want to avoid computing
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	441 // the dispatch type unless it is needed, so the args should be passed
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	442 // rather than the dispatch type. But the arguments will need to be
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	443 // evaluated no matter what, so evaluating them beforehand should be
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	444 // OK. If the evaluated arguments are attached to args, then we would
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	445 // need to determine the appropriate place(s) to clear them (for
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	446 // example, before returning from tree_index_expression::rvalue).
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	447
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	448 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	449 symbol_table::fcn_info::fcn_info_rep::find
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	450 (tree_argument_list *args, const string_vector& arg_names,
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	451 octave_value_list& evaluated_args, bool& args_evaluated)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	452 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	453 static bool deja_vu = false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	454
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	455 // Subfunction. I think it only makes sense to check for
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	456 // subfunctions if we are currently executing a function defined
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	457 // from a .m file.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	458
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	459 scope_val_iterator r = subfunctions.find (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	460
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	461 octave_function *curr_fcn = 0;
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	462
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	463 if (r != subfunctions.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	464 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	465 // FIXME -- out-of-date check here.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	466
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	467 return r->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	468 }
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	469 else
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	470 {
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	471 curr_fcn = octave_call_stack::current ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	472
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	473 if (curr_fcn)
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	474 {
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	475 scope_id pscope = curr_fcn->parent_fcn_scope ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	476
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	477 if (pscope > 0)
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	478 {
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	479 r = subfunctions.find (pscope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	480
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	481 if (r != subfunctions.end ())
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	482 {
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	483 // FIXME -- out-of-date check here.
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	484
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	485 return r->second;
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	486 }
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	487 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	488 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	489 }
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	490
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	491 // Private function.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	492
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	493 if (! curr_fcn)
0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	494 curr_fcn = octave_call_stack::current ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	495
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	496 if (curr_fcn)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	497 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	498 std::string dir_name = curr_fcn->dir_name ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	499
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	500 if (! dir_name.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	501 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	502 str_val_iterator q = private_functions.find (dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	503
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	504 if (q == private_functions.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	505 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	506 octave_value val = load_private_function (dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	507
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	508 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	509 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	510 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	511 else
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	512 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	513 octave_value& fval = q->second;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	514
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	515 if (fval.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	516 out_of_date_check_internal (fval);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	517
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	518 if (fval.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	519 return fval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	520 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	521 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	522 octave_value val = load_private_function (dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	523
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	524 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	525 return val;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	526 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	527 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	528 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	529 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	530
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	531 // 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	532
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	533 str_val_iterator q = class_constructors.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	534
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	535 if (q == class_constructors.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	536 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	537 octave_value val = load_class_constructor ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	538
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	539 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	540 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	541 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	542 else
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	543 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	544 octave_value& fval = q->second;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	545
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	546 if (fval.is_defined ())
7942 db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	547 out_of_date_check_internal (fval, name);
867 b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe] jwe parents: 773 diff changeset	548
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	549 if (fval.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	550 return fval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	551 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	552 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	553 octave_value val = load_class_constructor ();
867 b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe] jwe parents: 773 diff changeset	554
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	555 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	556 return val;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	557 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	558 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	559
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	560 // Class methods.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	561
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	562 if (args_evaluated \|\| (args && args->length () > 0))
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	563 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	564 if (! args_evaluated)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	565 evaluated_args = args->convert_to_const_vector ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	566
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	567 if (! error_state)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	568 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	569 int n = evaluated_args.length ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	570
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	571 if (n > 0 && ! args_evaluated)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	572 evaluated_args.stash_name_tags (arg_names);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	573
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	574 args_evaluated = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	575
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	576 if (n > 0)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	577 {
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	578 std::string dispatch_type = get_dispatch_type (evaluated_args);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	579
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	580 octave_value fcn = find_method (dispatch_type);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	581
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	582 if (fcn.is_defined ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	583 return fcn;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	584 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	585 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	586 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	587 return octave_value ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	588 }
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	589
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	590 // Legacy dispatch. We just check args_evaluated here because the
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	591 // actual evaluation will have happened already when searching for
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	592 // class methods.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	593
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	594 if (args_evaluated && ! dispatch_map.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	595 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	596 std::string dispatch_type = evaluated_args(0).type_name ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	597
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	598 std::string fname;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	599
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	600 dispatch_map_iterator p = dispatch_map.find (dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	601
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	602 if (p == dispatch_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	603 p = dispatch_map.find ("any");
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	604
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	605 if (p != dispatch_map.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	606 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	607 fname = p->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	608
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	609 octave_value fcn
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	610 = symbol_table::find_function (fname, evaluated_args);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	611
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	612 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	613 return fcn;
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 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	616
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	617 // Command-line function.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	618
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	619 if (cmdline_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	620 return cmdline_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	621
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	622 // Autoload?
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 octave_value fcn = find_autoload ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	625
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	626 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	627 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	628
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	629 // Function on the path.
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 fcn = find_user_function ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	632
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	633 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	634 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	635
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	636 // Built-in function.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	637
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	638 if (built_in_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	639 return built_in_function;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	640
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	641 // At this point, we failed to find anything. It is possible that
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	642 // the user created a file on the fly since the last prompt or
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	643 // chdir, so try updating the load path and searching again.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	644
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	645 octave_value retval;
3145 0d640dc625c7 [project @ 1998-02-05 08:44:59 by jwe] jwe parents: 3125 diff changeset	646
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	647 if (! deja_vu)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	648 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	649 load_path::update ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	650
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	651 deja_vu = true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	652
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	653 retval = find (args, arg_names, evaluated_args, args_evaluated);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	654 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	655
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	656 deja_vu = false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	657
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	658 return retval;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	659 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	660
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	661 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	662 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	663 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	664 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	665
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	666 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	667
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	668 if (q == class_methods.end ())
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 val = load_class_method (dispatch_type);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	671
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	672 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	673 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	674 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	675 else
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 octave_value& fval = q->second;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	678
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	679 if (fval.is_defined ())
7942 db6478d9c669 out_of_date_check_internal: make it work for class methods John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	680 out_of_date_check_internal (fval, dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	681
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	682 if (fval.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	683 return fval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	684 else
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	685 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	686 octave_value val = load_class_method (dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	687
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	688 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	689 return val;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	690 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	691 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	692
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	693 return retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	694 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	695
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	696 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	697 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	698 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	699 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	700
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	701 // Autoloaded function.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	702
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	703 if (autoload_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	704 out_of_date_check_internal (autoload_function);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	705
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	706 if (! autoload_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	707 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	708 std::string file_name = lookup_autoload (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	709
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	710 if (! file_name.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	711 {
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7972 diff changeset	712 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	713
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	714 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	715
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	716 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	717 "", name, true);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	718
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	719 if (fcn)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	720 autoload_function = octave_value (fcn);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	721 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	722 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	723
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	724 return autoload_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	725 }
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	726
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	727 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	728 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	729 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	730 // Function on the path.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	731
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	732 if (function_on_path.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	733 out_of_date_check_internal (function_on_path);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	734
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	735 if (! function_on_path.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	736 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	737 std::string dir_name;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	738
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	739 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	740
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	741 if (! file_name.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	742 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	743 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	744
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	745 if (fcn)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	746 function_on_path = octave_value (fcn);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	747 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	748 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	749
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	750 return function_on_path;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	751 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	752
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	753 // 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	754 // 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	755 // marked as superior to SUP_CLASS.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	756
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	757 bool
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	758 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	759 const std::string& inf_class)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	760 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	761 class_precedence_table_const_iterator p
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	762 = class_precedence_table.find (inf_class);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	763
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	764 if (p != class_precedence_table.end ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	765 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	766 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	767
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	768 std::set<std::string>::const_iterator q
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	769 = inferior_classes.find (sup_class);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	770
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	771 if (q != inferior_classes.end ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	772 return false;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	773 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	774
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	775 class_precedence_table[sup_class].insert (inf_class);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	776
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	777 return true;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	778 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	779
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	780 // 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	781 // 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	782 // 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	783 // 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	784 // is no relationship between two classes:
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	785 //
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	786 // if (symbol_table::is_superiorto (a, b))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	787 // // 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	788 // else if (symbol_table::is_superiorto (b, a))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	789 // // 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	790 // else
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	791 // // No relation.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	792
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	793 bool
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	794 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	795 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	796 bool retval = false;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	797
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	798 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	799
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	800 if (p != class_precedence_table.end ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	801 {
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	802 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	803 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	804
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	805 if (q != inferior_classes.end ())
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	806 retval = true;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	807 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	808
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	809 return retval;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	810 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	811
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	812 static std::string
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	813 fcn_file_name (const octave_value& fcn)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	814 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	815 const octave_function *f = fcn.function_value ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	816
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	817 return f ? f->fcn_file_name () : std::string ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	818 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	819
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	820 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	821 symbol_table::fcn_info::fcn_info_rep::dump
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	822 (std::ostream& os, const std::string& prefix) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	823 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	824 os << prefix << name
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	825 << " ["
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	826 << (cmdline_function.is_defined () ? "c" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	827 << (built_in_function.is_defined () ? "b" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	828 << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	829
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	830 std::string tprefix = prefix + " ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	831
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	832 if (autoload_function.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	833 os << tprefix << "autoload: "
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	834 << fcn_file_name (autoload_function) << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	835
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	836 if (function_on_path.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	837 os << tprefix << "function from path: "
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	838 << fcn_file_name (function_on_path) << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	839
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	840 if (! subfunctions.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	841 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	842 for (scope_val_const_iterator p = subfunctions.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	843 p != subfunctions.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	844 os << tprefix << "subfunction: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	845 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	846 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	847
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	848 if (! private_functions.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	849 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	850 for (str_val_const_iterator p = private_functions.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	851 p != private_functions.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	852 os << tprefix << "private: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	853 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	854 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	855
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	856 if (! class_constructors.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	857 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	858 for (str_val_const_iterator p = class_constructors.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	859 p != class_constructors.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	860 os << tprefix << "constructor: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	861 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	862 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	863
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	864 if (! class_methods.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	865 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	866 for (str_val_const_iterator p = class_methods.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	867 p != class_methods.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	868 os << tprefix << "method: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	869 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	870 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	871
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	872 if (! dispatch_map.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	873 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	874 for (dispatch_map_const_iterator p = dispatch_map.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	875 p != dispatch_map.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	876 os << tprefix << "dispatch: " << fcn_file_name (p->second)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	877 << " [" << p->first << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	878 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	879 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	880
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	881 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	882 symbol_table::fcn_info::find (tree_argument_list *args,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	883 const string_vector& arg_names,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	884 octave_value_list& evaluated_args,
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	885 bool& args_evaluated)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	886 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	887 return rep->find (args, arg_names, evaluated_args, args_evaluated);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	888 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	889
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	890 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	891 symbol_table::find (const std::string& name, tree_argument_list *args,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	892 const string_vector& arg_names,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	893 octave_value_list& evaluated_args, bool& args_evaluated,
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	894 bool skip_variables)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	895 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	896 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	897
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	898 return inst
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	899 ? inst->do_find (name, args, arg_names, evaluated_args,
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	900 args_evaluated, skip_variables)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	901 : octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	902 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	903
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	904 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	905 symbol_table::find_function (const std::string& name, tree_argument_list *args,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	906 const string_vector& arg_names,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	907 octave_value_list& evaluated_args,
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	908 bool& args_evaluated)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	909 {
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	910 octave_value retval;
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	911 size_t pos = name.find_first_of (Vfilemarker);
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	912
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	913 if (pos == std::string::npos)
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	914 retval = find (name, args, arg_names, evaluated_args, args_evaluated, true);
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	915 else
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	916 {
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	917 std::string fcn_scope = name.substr(0, pos);
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	918 scope_id stored_scope = xcurrent_scope;
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	919 xcurrent_scope = xtop_scope;
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	920 octave_value parent = find_function (name.substr(0, pos));
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	921 if (parent.is_defined ())
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	922 {
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	923 octave_function *parent_fcn = parent.function_value ();
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	924 if (parent_fcn)
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	925 {
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	926 xcurrent_scope = parent_fcn->scope ();
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	927 if (xcurrent_scope > 1)
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	928 retval = find_function (name.substr (pos + 1), args, arg_names,
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	929 evaluated_args, args_evaluated);
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	930 }
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	931 }
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	932 xcurrent_scope = stored_scope;
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	933 }
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	934
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	935 return retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	936 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	937
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	938 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	939 symbol_table::dump (std::ostream& os, scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	940 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	941 if (scope == xglobal_scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	942 dump_global (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	943 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	944 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	945 symbol_table *inst = get_instance (scope, false);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	946
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	947 if (inst)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	948 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	949 os << "*** dumping symbol table scope " << scope
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	950 << " (" << inst->table_name << ")\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	951
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	952 std::map<std::string, octave_value> sfuns
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	953 = symbol_table::subfunctions_defined_in_scope (scope);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	954
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	955 if (! sfuns.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	956 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	957 os << " subfunctions defined in this scope:\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	958
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	959 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	960 p != sfuns.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	961 os << " " << p->first << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	962
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	963 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	964 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	965
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	966
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	967 inst->do_dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	968 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	969 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	970 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	971
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	972 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	973 symbol_table::dump_global (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	974 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	975 if (! global_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	976 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	977 os << "*** dumping global symbol table\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	978
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	979 for (global_table_const_iterator p = global_table.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	980 p != global_table.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	981 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	982 std::string nm = p->first;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	983 octave_value val = p->second;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	984
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	985 os << " " << nm << " ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	986 val.dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	987 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	988 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	989 }
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
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	992 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	993 symbol_table::dump_functions (std::ostream& os)
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 if (! fcn_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	996 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	997 os << "*** dumping globally visible functions from symbol table\n"
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	998 << " (c=commandline, b=built-in)\n\n";
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 for (fcn_table_const_iterator p = fcn_table.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1001 p != fcn_table.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1002 p->second.dump (os, " ");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1003
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1004 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1005 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1006 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1007
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1008 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1009 symbol_table::do_find (const std::string& name, tree_argument_list *args,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1010 const string_vector& arg_names,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1011 octave_value_list& evaluated_args,
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	1012 bool& args_evaluated, bool skip_variables)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1013 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1014 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1015
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1016 // Variable.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1017
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1018 if (! skip_variables)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1019 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1020 table_iterator p = table.find (name);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1021
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1022 if (p != table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1023 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1024 symbol_record sr = p->second;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1025
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1026 // 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	1027
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1028 if (sr.is_global ())
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	1029 return symbol_table::global_varref (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1030 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1031 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1032 octave_value& val = sr.varref ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1033
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1034 if (val.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1035 return val;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1036 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1037 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1038 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1039
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1040 fcn_table_iterator p = fcn_table.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1041
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1042 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1043 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1044 evaluated_args = octave_value_list ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1045 args_evaluated = false;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1046
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	1047 return p->second.find (args, arg_names, evaluated_args, args_evaluated);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1048 }
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1049 else
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1050 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1051 fcn_info finfo (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1052
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1053 octave_value fcn = finfo.find (args, arg_names, evaluated_args,
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	1054 args_evaluated);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1055
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1056 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1057 fcn_table[name] = finfo;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1058
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1059 return fcn;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1060 }
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1061
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1062 return retval;
605 4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 584 diff changeset	1063 }
4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 584 diff changeset	1064
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1065 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1066 symbol_table::do_dump (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1067 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1068 if (! persistent_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1069 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1070 os << " persistent variables in this scope:\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1071
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1072 for (persistent_table_const_iterator p = persistent_table.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1073 p != persistent_table.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1074 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1075 std::string nm = p->first;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1076 octave_value val = p->second;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1077
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1078 os << " " << nm << " ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1079 val.dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1080 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1081 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1082
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1083 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1084 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1085
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1086 if (! table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1087 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1088 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	1089 << " 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	1090
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1091 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	1092 p->second.dump (os, " ");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1093
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1094 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1095 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1096 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1097
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1098 DEFUN (ignore_function_time_stamp, args, nargout,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1099 "-- texinfo --\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1100 @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	1101 @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	1102 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	1103 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	1104 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	1105 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	1106 @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	1107 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	1108 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	1109 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	1110 @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	1111 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	1112 need to recompiled.\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1113 @end deftypefn")
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	1114 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1115 octave_value retval;
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	1116
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1117 if (nargout > 0)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1118 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1119 switch (Vignore_function_time_stamp)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1120 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1121 case 1:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1122 retval = "system";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1123 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1124
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1125 case 2:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1126 retval = "all";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1127 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1128
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1129 default:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1130 retval = "none";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1131 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1132 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1133 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1134
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1135 int nargin = args.length ();
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1136
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1137 if (nargin == 1)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1138 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1139 std::string sval = args(0).string_value ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1140
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1141 if (! error_state)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1142 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1143 if (sval == "all")
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1144 Vignore_function_time_stamp = 2;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1145 else if (sval == "system")
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1146 Vignore_function_time_stamp = 1;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1147 else if (sval == "none")
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1148 Vignore_function_time_stamp = 0;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1149 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1150 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	1151 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1152 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1153 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	1154 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1155 else if (nargin > 1)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1156 print_usage ();
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4234 diff changeset	1157
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1158 return retval;
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	1159 }
7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	1160
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1161 DEFUN (__current_scope__, , ,
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1162 "-- texinfo --\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1163 @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	1164 Undocumented internal function.\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1165 @end deftypefn")
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 octave_value_list retval;
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 retval(1) = symbol_table::current_context ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1170 retval(0) = symbol_table::current_scope ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1171
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1172 return retval;
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
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1175 DEFUN (__dump_symtab_info__, args, ,
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1176 "-- texinfo --\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1177 @deftypefn {Built-in Function} {} __dump_symtab_info__ ()\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1178 @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	1179 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"scopes\")\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1180 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"functions\")\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1181 Undocumented internal function.\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1182 @end deftypefn")
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 octave_value retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1185
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1186 int nargin = args.length ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1187
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1188 if (nargin == 0)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1189 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1190 symbol_table::dump_functions (octave_stdout);
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 symbol_table::dump_global (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1193
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1194 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	1195
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1196 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	1197 p != lst.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1198 symbol_table::dump (octave_stdout, *p);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1199 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1200 else if (nargin == 1)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1201 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1202 octave_value arg = args(0);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1203
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1204 if (arg.is_string ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1205 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1206 std::string s_arg = arg.string_value ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1207
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1208 if (s_arg == "scopes")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1209 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1210 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	1211
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1212 RowVector v (lst.size ());
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1213
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1214 octave_idx_type k = 0;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1215
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1216 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	1217 p != lst.end (); p++)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1218 v.xelem (k++) = *p;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1219
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1220 retval = v;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1221 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1222 else if (s_arg == "functions")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1223 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1224 symbol_table::dump_functions (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1225 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1226 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1227 error ("__dump_symtab_info__: expecting \"functions\" or \"scopes\"");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1228 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1229 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1230 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1231 int s = arg.int_value ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1232
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1233 if (! error_state)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1234 symbol_table::dump (octave_stdout, s);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1235 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1236 error ("__dump_symtab_info__: expecting string or scope id");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1237 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1238 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1239 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1240 print_usage ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1241
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1242 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1243 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1244
7437 3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1245 #if 0
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1246
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1247 // FIXME -- should we have functions like this in Octave?
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1248
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1249 DEFUN (set_variable, args, , "set_variable (NAME, VALUE)")
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1250 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1251 octave_value retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1252
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1253 if (args.length () == 2)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1254 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1255 std::string name = args(0).string_value ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1256
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1257 if (! error_state)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1258 symbol_table::varref (name) = args(1);
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1259 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1260 error ("set_variable: expecting variable name as first argument");
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1261 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1262 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1263 print_usage ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1264
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1265 return retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1266 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1267
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1268 DEFUN (variable_value, args, , "VALUE = variable_value (NAME)")
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1269 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1270 octave_value retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1271
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1272 if (args.length () == 1)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1273 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1274 std::string name = args(0).string_value ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1275
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1276 if (! error_state)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1277 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1278 retval = symbol_table::varval (name);
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1279
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1280 if (retval.is_undefined ())
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1281 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	1282 name.c_str ());
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1283 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1284 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1285 error ("variable_value: expecting variable name as first argument");
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1286 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1287 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1288 print_usage ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1289
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1290 return retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1291 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1292 #endif
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1293
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1294 /*
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1295 ;;; Local Variables: ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1296 ;;; mode: C++ ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1297 ;;; End: ***
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1298 */

Mercurial > octave

annotate src/symtab.cc @ 8082:163d20e4d39c