octave: libinterp/interpfcn/symtab.cc annotate

annotate libinterp/interpfcn/symtab.cc @ 16442:302157614308

deprecate symbol_table::varref functions * ov-usr-fcn.h (octave_user_function::argn_varref, octave_user_function::nargin_varref, octave_user_function::nargout_varref, octave_user_function::varargin_varref): Delete unused variables. * symtab.h (symbol_table::symbol_record::symbol_record_ref::assign, symbol_table::symbol_record::symbol_record_ref::do_non_const_unary_op, symbol_table::symbol_record::do_non_const_unary_op, (symbol_table::symbol_record::is_undefined, symbol_table::symbol_record::assign, symbol_table::assign, symbol_table::force_assign, symbol_table::global_assign, symbol_table::persistent_assign, symbol_table::top_level_assign, symbol_table::do_assign, symbol_table::do_persistent_assign): New functions. (symbol_table::symbol_record::symbol_record_ref::varref): Avoid calls to deprecated functions. (symbol_table::varref, symbol_table::force_varref, symbol_table::global_varref, symbol_table::persistent_varref, symbol_table::top_level_varref, symbol_table::do_varref, symbol_table::do_persistent_varref): Deprecate. (symbol_table::symbol_reference::is_black_hole): New function. * oct-lvalue.h, oct-lvalue.cc: Store symbol_reference instead of pointer to octave_value object. (octave_lvalue::value): Now const. (octave_lvalue::object): Delete. * pt-id.cc (tree_identifier::lvalue): Construct octave_lvalue from sym, not sym->varref. * ls-mat5.cc, oct-lvalue.cc, oct-lvalue.h, pt-jit.cc, error.cc, load-save.cc, symtab.cc, symtab.h, variables.cc, ov-fcn-handle.cc, ov-usr-fcn.cc, ov-usr-fcn.h, oct-parse.in.yy, pt-eval.cc, pt-id.h, pt-idx.cc, mex.cc: Change all uses of varref functions to use assign instead. Use varval instead of varref where appropriate. * load-save.cc (install_loaded_variable): Don't manipulate symbol_record directly.

author	John W. Eaton <jwe@octave.org>
date	Sat, 06 Apr 2013 11:51:23 -0400
parents	94e95309710c
children	0f143f68078d

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
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13983 diff changeset	3 Copyright (C) 1993-2012 John W. Eaton
9601 a9b37bae1802 add a couple of missing copyright statements Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	4 Copyright (C) 2009 VZLU Prague, a.s.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 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
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	28 #include "file-ops.h"
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	29 #include "file-stat.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	30 #include "oct-env.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	31 #include "oct-time.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	32 #include "singleton-cleanup.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	33
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	34 #include "debug.h"
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	35 #include "defun.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	36 #include "dirfns.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	37 #include "input.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	38 #include "load-path.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	39 #include "ov-fcn.h"
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	40 #include "ov-usr-fcn.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	41 #include "pager.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	42 #include "parse.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	43 #include "pt-arg-list.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	44 #include "symtab.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	45 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	46 #include "utils.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	47
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	48 symbol_table *symbol_table::instance = 0;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	49
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	50 symbol_table::scope_id_cache *symbol_table::scope_id_cache::instance = 0;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	51
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	52 std::map<symbol_table::scope_id, symbol_table*> symbol_table::all_instances;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	53
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	54 std::map<std::string, octave_value> symbol_table::global_table;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	55
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	56 std::map<std::string, symbol_table::fcn_info> symbol_table::fcn_table;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	57
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	58 std::map<std::string, std::set<std::string> > symbol_table::class_precedence_table;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	59
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	60 std::map<std::string, std::list<std::string> > symbol_table::parent_map;
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	61
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	62 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	63 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	64
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	65 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	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
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	74 symbol_table::scope_id_cache::create_instance (void)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	75 {
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	76 instance = new scope_id_cache ();
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	77
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	78 singleton_cleanup_list::add (cleanup_instance);
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	79 }
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	80
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	81 symbol_table::context_id
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	82 symbol_table::symbol_record::symbol_record_rep::active_context (void) const
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	83 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	84 octave_user_function *fcn = curr_fcn;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	85
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	86 // FIXME -- If active_context () == -1, then it does not make much
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	87 // sense to use this symbol_record. This means an attempt at accessing
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	88 // a variable from a function that has not been called yet is
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	89 // happening. This should be cleared up when an implementing closures.
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	90
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	91 return fcn && fcn->active_context () != static_cast<context_id> (-1)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	92 ? fcn->active_context () : xcurrent_context;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	93 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	94
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	95 void
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	96 symbol_table::symbol_record::symbol_record_rep::dump
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	97 (std::ostream& os, const std::string& prefix) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	98 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	99 octave_value val = varval ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	100
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	101 os << prefix << name;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	102
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	103 if (val.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	104 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	105 os << " ["
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	106 << (is_local () ? "l" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	107 << (is_automatic () ? "a" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	108 << (is_formal () ? "f" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	109 << (is_hidden () ? "h" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	110 << (is_inherited () ? "i" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	111 << (is_global () ? "g" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	112 << (is_persistent () ? "p" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	113 << "] ";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	114 val.dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	115 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	116
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	117 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	118 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	119
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	120 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	121 symbol_table::symbol_record::find (const octave_value_list& args) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	122 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	123 octave_value retval;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	124
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	125 if (is_global ())
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	126 retval = symbol_table::global_varval (name ());
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	127 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	128 {
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	129 retval = varval ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	130
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	131 if (retval.is_undefined ())
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	132 {
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	133 // Use cached fcn_info pointer if possible.
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	134 if (rep->finfo)
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	135 retval = rep->finfo->find (args);
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	136 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	137 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	138 retval = symbol_table::find_function (name (), args);
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	139
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	140 if (retval.is_defined ())
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	141 rep->finfo = get_fcn_info (name ());
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	142 }
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	143 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	144 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	145
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	146 return retval;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	147 }
c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	148
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	149 // 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	150 // 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	151 // 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	152 // 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	153 // function was loaded/parsed. However, this check should only
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	154 // 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	155 // 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	156 // since the last time the function was loaded/parsed).
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	157 //
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	158 // 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	159 // 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	160 // 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	161
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	162 static inline bool
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	163 load_out_of_date_fcn (const std::string& ff, const std::string& dir_name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	164 octave_value& function,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	165 const std::string& dispatch_type = std::string ())
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	166 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	167 bool retval = false;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	168
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9144 diff changeset	169 octave_function *fcn = load_fcn_from_file (ff, dir_name, dispatch_type);
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	170
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	171 if (fcn)
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	172 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	173 retval = true;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	174
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	175 function = octave_value (fcn);
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	176 }
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	177 else
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	178 function = octave_value ();
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	179
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	180 return retval;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	181 }
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	182
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	183 bool
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	184 out_of_date_check (octave_value& function,
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	185 const std::string& dispatch_type,
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	186 bool check_relative)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	187 {
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	188 bool retval = false;
2949 49b42be38aa1 [project @ 1997-05-09 13:54:29 by jwe] jwe parents: 2926 diff changeset	189
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	190 octave_function *fcn = function.function_value (true);
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	191
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	192 if (fcn)
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	193 {
11461 2b8531a6a3c9 Change mentions of "nested function" to the less misleading "subfunction" David Grundberg <individ@acc.umu.se> parents: 11445 diff changeset	194 // FIXME -- we need to handle subfunctions properly here.
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	195
11461 2b8531a6a3c9 Change mentions of "nested function" to the less misleading "subfunction" David Grundberg <individ@acc.umu.se> parents: 11445 diff changeset	196 if (! fcn->is_subfunction ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	197 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	198 std::string ff = fcn->fcn_file_name ();
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	199
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	200 if (! ff.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	201 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	202 octave_time tc = fcn->time_checked ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	203
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	204 bool relative = check_relative && fcn->is_relative ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	205
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	206 if (tc < Vlast_prompt_time
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	207 \|\| (relative && tc < Vlast_chdir_time))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	208 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	209 bool clear_breakpoints = false;
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	210 std::string nm = fcn->name ();
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	211
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	212 bool is_same_file = false;
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	213
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	214 std::string file;
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	215 std::string dir_name;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	216
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	217 if (check_relative)
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	218 {
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	219 int nm_len = nm.length ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	220
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	221 if (octave_env::absolute_pathname (nm)
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	222 && ((nm_len > 4 && (nm.substr (nm_len-4) == ".oct"
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	223 \|\| nm.substr (nm_len-4) == ".mex"))
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	224 \|\| (nm_len > 2 && nm.substr (nm_len-2) == ".m")))
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	225 file = nm;
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	226 else
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	227 {
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	228 // We don't want to make this an absolute name,
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	229 // because load_fcn_file looks at the name to
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	230 // decide whether it came from a relative lookup.
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	231
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	232 if (! dispatch_type.empty ())
11238 1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	233 {
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	234 file = load_path::find_method (dispatch_type, nm,
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	235 dir_name);
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	236
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	237 if (file.empty ())
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	238 {
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	239 const std::list<std::string>& plist
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	240 = symbol_table::parent_classes (dispatch_type);
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	241 std::list<std::string>::const_iterator it
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	242 = plist.begin ();
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	243
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	244 while (it != plist.end ())
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	245 {
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	246 file = load_path::find_method (*it, nm, dir_name);
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	247 if (! file.empty ())
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	248 break;
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	249
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	250 it++;
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	251 }
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	252 }
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	253 }
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	254
9959 633f9d837982 include autoloads in out-of-date checks Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	255 // Maybe it's an autoload?
633f9d837982 include autoloads in out-of-date checks Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	256 if (file.empty ())
633f9d837982 include autoloads in out-of-date checks Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	257 file = lookup_autoload (nm);
633f9d837982 include autoloads in out-of-date checks Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	258
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	259 if (file.empty ())
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	260 file = load_path::find_fcn (nm, dir_name);
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	261 }
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	262
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	263 if (! file.empty ())
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	264 is_same_file = same_file (file, ff);
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	265 }
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	266 else
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	267 {
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	268 is_same_file = true;
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	269 file = ff;
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	270 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	271
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	272 if (file.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	273 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	274 // Can't see this function from current
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	275 // directory, so we should clear it.
195 13c6086c325c [project @ 1993-11-06 10:12:29 by jwe] jwe parents: 191 diff changeset	276
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	277 function = octave_value ();
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	278
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	279 clear_breakpoints = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	280 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	281 else if (is_same_file)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	282 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	283 // Same file. If it is out of date, then reload it.
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	284
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	285 octave_time ottp = fcn->time_parsed ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	286 time_t tp = ottp.unix_time ();
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	287
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	288 fcn->mark_fcn_file_up_to_date (octave_time ());
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	289
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	290 if (! (Vignore_function_time_stamp == 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	291 \|\| (Vignore_function_time_stamp
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	292 && fcn->is_system_fcn_file ())))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	293 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	294 file_stat fs (ff);
572 94fd73d1a0bc [project @ 1994-07-28 05:35:47 by jwe] jwe parents: 530 diff changeset	295
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	296 if (fs)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	297 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	298 if (fs.is_newer (tp))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	299 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	300 retval = load_out_of_date_fcn (ff, dir_name,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	301 function,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	302 dispatch_type);
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	303
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	304 clear_breakpoints = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	305 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	306 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	307 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	308 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	309 function = octave_value ();
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	310
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	311 clear_breakpoints = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	312 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	313 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	314 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	315 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	316 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	317 // Not the same file, so load the new file in
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	318 // place of the old.
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	319
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	320 retval = load_out_of_date_fcn (file, dir_name, function,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	321 dispatch_type);
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	322
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	323 clear_breakpoints = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	324 }
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	325
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	326 // If the function has been replaced then clear any
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	327 // breakpoints associated with it
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	328 if (clear_breakpoints)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	329 bp_table::remove_all_breakpoints_in_file (nm, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	330 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	331 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	332 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	333 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	334
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	335 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	336 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	337
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	338 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	339 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	340 (const std::string& dir_name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	341 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	342 octave_value retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	343
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	344 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	345
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	346 if (! file_name.empty ())
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	347 {
8781 f57c9fdb6836 stash directory name when loading private function John W. Eaton <jwe@octave.org> parents: 8691 diff changeset	348 octave_function *fcn = load_fcn_from_file (file_name, dir_name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	349
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	350 if (fcn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	351 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	352 std::string class_name;
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	353
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	354 size_t pos = dir_name.find_last_of (file_ops::dir_sep_chars ());
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	355
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	356 if (pos != std::string::npos)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	357 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	358 std::string tmp = dir_name.substr (pos+1);
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	359
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	360 if (tmp[0] == '@')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	361 class_name = tmp.substr (1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	362 }
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	363
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	364 fcn->mark_as_private_function (class_name);
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	365
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	366 retval = octave_value (fcn);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	367
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	368 private_functions[dir_name] = retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	369 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	370 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	371
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	372 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	373 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	374
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	375 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	376 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	377 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	378 octave_value retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	379
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	380 std::string dir_name;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	381
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	382 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	383
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	384 if (! file_name.empty ())
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	385 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	386 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	387
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	388 if (fcn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	389 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	390 retval = octave_value (fcn);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	391
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	392 class_constructors[name] = retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	393 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	394 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	395
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	396 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	397 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	398
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	399 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	400 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	401 (const std::string& dispatch_type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	402 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	403 octave_value retval;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	404
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	405 if (name == dispatch_type)
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	406 retval = load_class_constructor ();
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	407 else
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	408 {
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	409 std::string dir_name;
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	410
293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	411 std::string file_name = load_path::find_method (dispatch_type, name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	412 dir_name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	413
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	414 if (! file_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	415 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	416 octave_function *fcn = load_fcn_from_file (file_name, dir_name,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	417 dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	418
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	419 if (fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	420 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	421 retval = octave_value (fcn);
8162 293c4b5fe33d symtab.cc (symbol_table::fcn_info::fcn_info_rep::load_class_method): Call load_class_constructor if name and dispatch_type are the same. John W. Eaton <jwe@octave.org> parents: 8161 diff changeset	422
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	423 class_methods[dispatch_type] = retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	424 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	425 }
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	426
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	427 if (retval.is_undefined ())
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	428 {
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	429 // Search parent classes
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	430
11238 1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	431 const std::list<std::string>& plist = parent_classes (dispatch_type);
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	432
11238 1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	433 std::list<std::string>::const_iterator it = plist.begin ();
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	434
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	435 while (it != plist.end ())
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	436 {
11238 1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	437 retval = find_method (*it);
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	438
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	439 if (retval.is_defined ())
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	440 {
11238 1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	441 class_methods[dispatch_type] = retval;
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	442 break;
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	443 }
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	444
11238 1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	445 it++;
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	446 }
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	447 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	448 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	449
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	450 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	451 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	452
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	453 void
11445 40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	454 symbol_table::fcn_info::fcn_info_rep:: mark_subfunction_in_scope_as_private
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	455 (scope_id scope, const std::string& class_name)
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	456 {
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	457 scope_val_iterator p = subfunctions.find (scope);
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	458
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	459 if (p != subfunctions.end ())
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	460 {
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	461 octave_function *fcn = p->second.function_value ();
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	462
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	463 if (fcn)
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	464 fcn->mark_as_private_function (class_name);
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	465 }
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	466 }
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	467
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	468 void
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	469 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	470 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	471 if (dispatch_map.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	472 os << "dispatch: " << name << " is not overloaded" << std::endl;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	473 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	474 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	475 os << "Overloaded function " << name << ":\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	476
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	477 for (dispatch_map_const_iterator p = dispatch_map.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	478 p != dispatch_map.end (); p++)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	479 os << " " << name << " (" << p->first << ", ...) -> "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	480 << p->second << " (" << p->first << ", ...)\n";
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	481
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	482 os << std::endl;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	483 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	484 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	485
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	486 std::string
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	487 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	488 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	489 std::string retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	490
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	491 if (! dispatch_map.empty ())
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	492 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	493 retval = "Overloaded function:\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	494
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	495 for (dispatch_map_const_iterator p = dispatch_map.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	496 p != dispatch_map.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	497 retval += " " + p->second + " (" + p->first + ", ...)\n\n";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	498 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	499
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	500 return retval;
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
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	503 // :-) JWE, can you parse this? Returns a 2D array with second dimension equal
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	504 // to btyp_num_types (static constant). Only the leftmost dimension can be
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	505 // variable in C/C++. Typedefs are boring.
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	506
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	507 static builtin_type_t (*build_sup_table (void))[btyp_num_types]
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	508 {
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	509 static builtin_type_t sup_table[btyp_num_types][btyp_num_types];
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	510 for (int i = 0; i < btyp_num_types; i++)
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	511 for (int j = 0; j < btyp_num_types; j++)
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	512 {
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	513 builtin_type_t ityp = static_cast<builtin_type_t> (i);
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	514 builtin_type_t jtyp = static_cast<builtin_type_t> (j);
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	515 // FIXME: Is this really right?
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	516 bool use_j =
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	517 (jtyp == btyp_func_handle \|\| ityp == btyp_bool
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	518 \|\| (btyp_isarray (ityp)
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	519 && (! btyp_isarray (jtyp)
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	520 \|\| (btyp_isinteger (jtyp) && ! btyp_isinteger (ityp))
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	521 \|\| ((ityp == btyp_double \|\| ityp == btyp_complex \|\| ityp == btyp_char)
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	522 && (jtyp == btyp_float \|\| jtyp == btyp_float_complex)))));
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	523
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	524 sup_table[i][j] = use_j ? jtyp : ityp;
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	525 }
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	526
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	527 return sup_table;
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	528 }
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	529
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	530 std::string
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	531 get_dispatch_type (const octave_value_list& args,
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	532 builtin_type_t& builtin_type)
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	533 {
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	534 static builtin_type_t (*sup_table)[btyp_num_types] = build_sup_table ();
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	535 std::string dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	536
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	537 int n = args.length ();
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	538
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	539 if (n > 0)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	540 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	541 int i = 0;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	542 builtin_type = args(0).builtin_type ();
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	543 if (builtin_type != btyp_unknown)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	544 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	545 for (i = 1; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	546 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	547 builtin_type_t bti = args(i).builtin_type ();
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	548 if (bti != btyp_unknown)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	549 builtin_type = sup_table[builtin_type][bti];
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	550 else
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	551 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	552 builtin_type = btyp_unknown;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	553 break;
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	554 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	555 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	556 }
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	557
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	558 if (builtin_type == btyp_unknown)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	559 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	560 // There's a non-builtin class in the argument list.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	561 dispatch_type = args(i).class_name ();
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	562
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	563 for (int j = i+1; j < n; j++)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	564 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	565 octave_value arg = args(j);
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	566
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	567 if (arg.builtin_type () == btyp_unknown)
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	568 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	569 std::string cname = arg.class_name ();
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	570
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	571 // Only switch to type of ARG if it is marked superior
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	572 // to the current DISPATCH_TYPE.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	573 if (! symbol_table::is_superiorto (dispatch_type, cname)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	574 && symbol_table::is_superiorto (cname, dispatch_type))
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	575 dispatch_type = cname;
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	576 }
7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	577 }
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	578 }
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	579 else
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	580 dispatch_type = btyp_class_name[builtin_type];
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	581 }
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	582 else
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	583 builtin_type = btyp_unknown;
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	584
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	585 return dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	586 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	587
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	588 std::string
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	589 get_dispatch_type (const octave_value_list& args)
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	590 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	591 builtin_type_t builtin_type;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	592 return get_dispatch_type (args, builtin_type);
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	593 }
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	594
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	595 // 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	596 // list:
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 // variable
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	599 // subfunction
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	600 // private function
13147 6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	601 // class method
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	602 // class constructor
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	603 // legacy dispatch
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	604 // command-line function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	605 // autoload function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	606 // function on the path
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	607 // built-in function
13147 6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	608 //
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	609 // Matlab documentation states that constructors have higher precedence
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	610 // than methods, but that does not seem to be the case.
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	611
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	612 octave_value
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	613 symbol_table::fcn_info::fcn_info_rep::find (const octave_value_list& args,
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	614 bool local_funcs)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	615 {
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	616 octave_value retval = xfind (args, local_funcs);
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	617
11319 f8e97e9a9301 avoid reparsing files after errors John W. Eaton <jwe@octave.org> parents: 11263 diff changeset	618 if (! (error_state \|\| retval.is_defined ()))
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	619 {
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	620 // It is possible that the user created a file on the fly since
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	621 // the last prompt or chdir, so try updating the load path and
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	622 // searching again.
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	623
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	624 load_path::update ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	625
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	626 retval = xfind (args, local_funcs);
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	627 }
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	628
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	629 return retval;
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	630 }
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	631
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	632 octave_value
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	633 symbol_table::fcn_info::fcn_info_rep::xfind (const octave_value_list& args,
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	634 bool local_funcs)
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	635 {
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	636 if (local_funcs)
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	637 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	638 // Subfunction. I think it only makes sense to check for
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	639 // subfunctions if we are currently executing a function defined
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	640 // from a .m file.
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	641
9639 8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	642 octave_user_function *curr_fcn = symbol_table::get_curr_fcn ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	643
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	644 for (scope_id scope = xcurrent_scope; scope >= 0;)
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	645 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	646 scope_val_iterator r = subfunctions.find (scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	647 if (r != subfunctions.end ())
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	648 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	649 // FIXME -- out-of-date check here.
11263 c78247b664fc allow private functions to find private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	650
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	651 return r->second;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	652 }
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	653
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	654 octave_user_function *scope_curr_fcn = get_curr_fcn (scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	655 if (scope_curr_fcn)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	656 scope = scope_curr_fcn->parent_fcn_scope ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	657 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	658 scope = -1;
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	659 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	660
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	661 // Private function.
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	662
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	663 if (curr_fcn)
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	664 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	665 std::string dir_name = curr_fcn->dir_name ();
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	666
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	667 if (! dir_name.empty ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	668 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	669 str_val_iterator q = private_functions.find (dir_name);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	670
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	671 if (q == private_functions.end ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	672 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	673 octave_value val = load_private_function (dir_name);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	674
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	675 if (val.is_defined ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	676 return val;
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	677 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	678 else
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	679 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	680 octave_value& fval = q->second;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	681
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	682 if (fval.is_defined ())
13916 0ec8413d4bbc avoid reloading private functions when checking to see whether they are out of date John W. Eaton <jwe@octave.org> parents: 13147 diff changeset	683 out_of_date_check (fval, "", false);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	684
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	685 if (fval.is_defined ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	686 return fval;
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	687 else
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	688 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	689 octave_value val = load_private_function (dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	690
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	691 if (val.is_defined ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	692 return val;
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	693 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	694 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	695 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	696 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	697 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	698
13147 6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	699 // Class methods.
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	700
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	701 if (! args.empty ())
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	702 {
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	703 std::string dispatch_type = get_dispatch_type (args);
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	704
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	705 octave_value fcn = find_method (dispatch_type);
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	706
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	707 if (fcn.is_defined ())
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	708 return fcn;
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	709 }
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	710
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	711 // 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	712
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	713 str_val_iterator q = class_constructors.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	714
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	715 if (q == class_constructors.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	716 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	717 octave_value val = load_class_constructor ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	718
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	719 if (val.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	720 return val;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	721 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	722 else
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	723 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	724 octave_value& fval = q->second;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	725
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	726 if (fval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	727 out_of_date_check (fval, name);
867 b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe] jwe parents: 773 diff changeset	728
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	729 if (fval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	730 return fval;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	731 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	732 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	733 octave_value val = load_class_constructor ();
867 b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe] jwe parents: 773 diff changeset	734
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	735 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	736 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	737 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	738 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	739
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	740 // Legacy dispatch.
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	741
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	742 if (! args.empty () && ! dispatch_map.empty ())
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	743 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	744 std::string dispatch_type = args(0).type_name ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	745
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	746 std::string fname;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	747
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	748 dispatch_map_iterator p = dispatch_map.find (dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	749
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	750 if (p == dispatch_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	751 p = dispatch_map.find ("any");
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	752
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	753 if (p != dispatch_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	754 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	755 fname = p->second;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	756
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	757 octave_value fcn
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	758 = symbol_table::find_function (fname, args);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	759
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	760 if (fcn.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	761 return fcn;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	762 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	763 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	764
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	765 // Command-line function.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	766
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	767 if (cmdline_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	768 return cmdline_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	769
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	770 // Autoload?
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	771
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	772 octave_value fcn = find_autoload ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	773
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	774 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	775 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	776
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	777 // Function on the path.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	778
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	779 fcn = find_user_function ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	780
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	781 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	782 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	783
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	784 // Built-in function (might be undefined).
3145 0d640dc625c7 [project @ 1998-02-05 08:44:59 by jwe] jwe parents: 3125 diff changeset	785
8691 7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	786 return built_in_function;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	787 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	788
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	789 // Find the definition of NAME according to the following precedence
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	790 // list:
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	791 //
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	792 // built-in function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	793 // function on the path
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	794 // autoload function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	795 // command-line function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	796 // private function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	797 // subfunction
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	798
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	799 // This function is used to implement the "builtin" function, which
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	800 // searches for "built-in" functions. In Matlab, "builtin" only
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	801 // returns functions that are actually built-in to the interpreter.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	802 // But since the list of built-in functions is different in Octave and
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	803 // Matlab, we also search up the precedence list until we find
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	804 // something that matches. Note that we are only searching by name,
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	805 // so class methods, constructors, and legacy dispatch functions are
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	806 // skipped.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	807
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	808 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	809 symbol_table::fcn_info::fcn_info_rep::builtin_find (void)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	810 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	811 octave_value retval = x_builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	812
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	813 if (! retval.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	814 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	815 // It is possible that the user created a file on the fly since
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	816 // the last prompt or chdir, so try updating the load path and
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	817 // searching again.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	818
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	819 load_path::update ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	820
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	821 retval = x_builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	822 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	823
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	824 return retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	825 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	826
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	827 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	828 symbol_table::fcn_info::fcn_info_rep::x_builtin_find (void)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	829 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	830 // Built-in function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	831 if (built_in_function.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	832 return built_in_function;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	833
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	834 // Function on the path.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	835
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	836 octave_value fcn = find_user_function ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	837
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	838 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	839 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	840
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	841 // Autoload?
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	842
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	843 fcn = find_autoload ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	844
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	845 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	846 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	847
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	848 // Command-line function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	849
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	850 if (cmdline_function.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	851 return cmdline_function;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	852
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	853 // Private function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	854
9639 8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9601 diff changeset	855 octave_user_function *curr_fcn = symbol_table::get_curr_fcn ();
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	856
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	857 if (curr_fcn)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	858 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	859 std::string dir_name = curr_fcn->dir_name ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	860
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	861 if (! dir_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	862 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	863 str_val_iterator q = private_functions.find (dir_name);
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	864
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	865 if (q == private_functions.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	866 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	867 octave_value val = load_private_function (dir_name);
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	868
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	869 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	870 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	871 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	872 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	873 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	874 octave_value& fval = q->second;
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	875
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	876 if (fval.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	877 out_of_date_check (fval);
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	878
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	879 if (fval.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	880 return fval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	881 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	882 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	883 octave_value val = load_private_function (dir_name);
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	884
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	885 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	886 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	887 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	888 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	889 }
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	890 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	891
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	892 // Subfunction. I think it only makes sense to check for
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	893 // subfunctions if we are currently executing a function defined
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	894 // from a .m file.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	895
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	896 for (scope_id scope = xcurrent_scope; scope >= 0;)
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	897 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	898 scope_val_iterator r = subfunctions.find (scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	899 if (r != subfunctions.end ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	900 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	901 // FIXME -- out-of-date check here.
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	902
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	903 return r->second;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	904 }
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	905
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	906 octave_user_function *scope_curr_fcn = get_curr_fcn (scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	907 if (scope_curr_fcn)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	908 scope = scope_curr_fcn->parent_fcn_scope ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	909 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	910 scope = -1;
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	911 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	912
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	913 return octave_value ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	914 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	915
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	916 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	917 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	918 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	919 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	920
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	921 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	922
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	923 if (q == class_methods.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	924 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	925 octave_value val = load_class_method (dispatch_type);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	926
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	927 if (val.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	928 return val;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	929 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	930 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	931 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	932 octave_value& fval = q->second;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	933
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	934 if (fval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	935 out_of_date_check (fval, dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	936
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	937 if (fval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	938 return fval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	939 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	940 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	941 octave_value val = load_class_method (dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	942
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	943 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	944 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	945 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	946 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	947
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	948 return retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	949 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	950
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	951 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	952 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	953 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	954 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	955
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	956 // Autoloaded function.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	957
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	958 if (autoload_function.is_defined ())
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	959 out_of_date_check (autoload_function);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	960
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	961 if (! autoload_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	962 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	963 std::string file_name = lookup_autoload (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	964
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	965 if (! file_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	966 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	967 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	968
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	969 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	970
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	971 octave_function *fcn = load_fcn_from_file (file_name, dir_name,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	972 "", name, true);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	973
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	974 if (fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	975 autoload_function = octave_value (fcn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	976 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	977 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	978
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	979 return autoload_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	980 }
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	981
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	982 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	983 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	984 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	985 // Function on the path.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	986
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	987 if (function_on_path.is_defined ())
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	988 out_of_date_check (function_on_path);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	989
11321 43fa0522734d fix think-o in changeset baeeb6bc6afe John W. Eaton <jwe@octave.org> parents: 11320 diff changeset	990 if (! (error_state \|\| function_on_path.is_defined ()))
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	991 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	992 std::string dir_name;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	993
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	994 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	995
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	996 if (! file_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	997 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	998 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	999
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1000 if (fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1001 function_on_path = octave_value (fcn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1002 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1003 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1004
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1005 return function_on_path;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1006 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1007
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1008 // 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	1009 // 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	1010 // marked as superior to SUP_CLASS.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1011
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1012 bool
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1013 symbol_table::set_class_relationship (const std::string& sup_class,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1014 const std::string& inf_class)
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1015 {
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1016 if (is_superiorto (inf_class, sup_class))
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1017 return false;
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1018
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1019 // If sup_class doesn't have an entry in the precedence table,
94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1020 // this will automatically create it, and associate to it a
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1021 // singleton set {inf_class} of inferior classes.
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1022 class_precedence_table[sup_class].insert (inf_class);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1023
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1024 return true;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1025 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1026
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1027 // 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	1028 // TRUE if B has been marked as inferior to A, since we only keep
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1029 // one table, and convert inferiorto information to a superiorto
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1030 // 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	1031 // is no relationship between two classes:
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1032 //
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1033 // if (symbol_table::is_superiorto (a, b))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1034 // // 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	1035 // else if (symbol_table::is_superiorto (b, a))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1036 // // 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	1037 // else
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1038 // // No relation.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1039
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1040 bool
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1041 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	1042 {
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1043 class_precedence_table_const_iterator p = class_precedence_table.find (a);
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1044 // If a has no entry in the precedence table, return false
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1045 if (p == class_precedence_table.end ())
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1046 return false;
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1047
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1048 const std::set<std::string>& inferior_classes = p->second;
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1049 std::set<std::string>::const_iterator q = inferior_classes.find (b);
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1050 return (q != inferior_classes.end ());
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1051 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1052
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1053 static std::string
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1054 fcn_file_name (const octave_value& fcn)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1055 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1056 const octave_function *f = fcn.function_value ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1057
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1058 return f ? f->fcn_file_name () : std::string ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1059 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1060
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1061 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1062 symbol_table::fcn_info::fcn_info_rep::dump
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1063 (std::ostream& os, const std::string& prefix) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1064 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1065 os << prefix << name
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1066 << " ["
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1067 << (cmdline_function.is_defined () ? "c" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1068 << (built_in_function.is_defined () ? "b" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1069 << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1070
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1071 std::string tprefix = prefix + " ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1072
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1073 if (autoload_function.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1074 os << tprefix << "autoload: "
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1075 << fcn_file_name (autoload_function) << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1076
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1077 if (function_on_path.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1078 os << tprefix << "function from path: "
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1079 << fcn_file_name (function_on_path) << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1080
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1081 if (! subfunctions.empty ())
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 for (scope_val_const_iterator p = subfunctions.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1084 p != subfunctions.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1085 os << tprefix << "subfunction: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1086 << " [" << p->first << "]\n";
7761 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
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1089 if (! private_functions.empty ())
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 (str_val_const_iterator p = private_functions.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1092 p != private_functions.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1093 os << tprefix << "private: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1094 << " [" << p->first << "]\n";
7761 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 if (! class_constructors.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1098 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1099 for (str_val_const_iterator p = class_constructors.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1100 p != class_constructors.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1101 os << tprefix << "constructor: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1102 << " [" << p->first << "]\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1103 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1104
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1105 if (! class_methods.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1106 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1107 for (str_val_const_iterator p = class_methods.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1108 p != class_methods.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1109 os << tprefix << "method: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1110 << " [" << p->first << "]\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1111 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1112
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1113 if (! dispatch_map.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1114 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1115 for (dispatch_map_const_iterator p = dispatch_map.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1116 p != dispatch_map.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1117 os << tprefix << "dispatch: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1118 << " [" << p->first << "]\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1119 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1120 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1121
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1122 void
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1123 symbol_table::install_nestfunction (const std::string& name,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1124 const octave_value& fcn,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1125 scope_id parent_scope)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1126 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1127 install_subfunction (name, fcn, parent_scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1128
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1129 // Stash the nest_parent for resolving variables after parsing is done.
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	1130 octave_function *fv = fcn.function_value ();
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1131
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	1132 symbol_table *fcn_table_loc = get_instance (fv->scope ());
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1133
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1134 symbol_table *parent_table = get_instance (parent_scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1135
14604 de72463862c4 Silence warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14544 diff changeset	1136 parent_table->add_nest_child (*fcn_table_loc);
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1137 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1138
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1139 octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1140 symbol_table::find (const std::string& name,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1141 const octave_value_list& args,
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1142 bool skip_variables,
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1143 bool local_funcs)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1144 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	1145 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1146
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1147 return inst
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1148 ? inst->do_find (name, args, skip_variables, local_funcs)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1149 : octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1150 }
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 octave_value
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1153 symbol_table::builtin_find (const std::string& name)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1154 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1155 symbol_table *inst = get_instance (xcurrent_scope);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1156
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1157 return inst ? inst->do_builtin_find (name) : octave_value ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1158 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1159
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1160 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1161 symbol_table::find_function (const std::string& name,
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1162 const octave_value_list& args,
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1163 bool local_funcs)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1164 {
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1165 octave_value retval;
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1166
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1167 if (! name.empty () && name[0] == '@')
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1168 {
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1169 // Look for a class specific function.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1170 std::string dispatch_type =
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1171 name.substr (1, name.find_first_of (file_ops::dir_sep_str ()) - 1);
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1172
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1173 std::string method =
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1174 name.substr (name.find_last_of (file_ops::dir_sep_str ()) + 1,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1175 std::string::npos);
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1176
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1177 retval = find_method (method, dispatch_type);
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1178 }
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1179 else
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1180 {
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1181 size_t pos = name.find_first_of (Vfilemarker);
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1182
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1183 if (pos == std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1184 retval = find (name, args, true, local_funcs);
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1185 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1186 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1187 std::string fcn_scope = name.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1188 scope_id stored_scope = xcurrent_scope;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1189 xcurrent_scope = xtop_scope;
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1190 octave_value parent = find_function (name.substr (0, pos),
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1191 octave_value_list (), false);
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1192
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1193 if (parent.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1194 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1195 octave_function *parent_fcn = parent.function_value ();
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1196
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1197 if (parent_fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1198 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1199 xcurrent_scope = parent_fcn->scope ();
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1200
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1201 if (xcurrent_scope > 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1202 retval = find_function (name.substr (pos + 1), args);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1203 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1204 }
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1205
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1206 xcurrent_scope = stored_scope;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1207 }
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1208 }
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1209
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1210 return retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1211 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1212
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1213 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1214 symbol_table::dump (std::ostream& os, scope_id scope)
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 if (scope == xglobal_scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1217 dump_global (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1218 else
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 symbol_table *inst = get_instance (scope, false);
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 if (inst)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1223 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1224 os << "*** dumping symbol table scope " << scope
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1225 << " (" << inst->table_name << ")\n\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1226
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1227 std::map<std::string, octave_value> sfuns
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1228 = symbol_table::subfunctions_defined_in_scope (scope);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1229
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1230 if (! sfuns.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1231 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1232 os << " subfunctions defined in this scope:\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1233
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1234 for (std::map<std::string, octave_value>::const_iterator p = sfuns.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1235 p != sfuns.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1236 os << " " << p->first << "\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1237
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1238 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1239 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1240
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1241 inst->do_dump (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1242 }
7761 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 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1245
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1246 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1247 symbol_table::dump_global (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1248 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1249 if (! global_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1250 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1251 os << "*** dumping global symbol table\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1252
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1253 for (global_table_const_iterator p = global_table.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1254 p != global_table.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1255 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1256 std::string nm = p->first;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1257 octave_value val = p->second;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1258
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1259 os << " " << nm << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1260 val.dump (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1261 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1262 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1263 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1264 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1265
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1266 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1267 symbol_table::dump_functions (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1268 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1269 if (! fcn_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1270 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1271 os << "*** dumping globally visible functions from symbol table\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1272 << " (c=commandline, b=built-in)\n\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1273
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1274 for (fcn_table_const_iterator p = fcn_table.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1275 p != fcn_table.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1276 p->second.dump (os, " ");
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1277
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1278 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1279 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1280 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1281
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1282 void
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1283 symbol_table::stash_dir_name_for_subfunctions (scope_id scope,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1284 const std::string& dir_name)
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1285 {
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1286 // FIXME -- is this the best way to do this? Maybe it would be
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1287 // better if we had a map from scope to list of subfunctions
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1288 // stored with the function. Do we?
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1289
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1290 for (fcn_table_const_iterator p = fcn_table.begin ();
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1291 p != fcn_table.end (); p++)
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1292 {
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1293 std::pair<std::string, octave_value> tmp
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1294 = p->second.subfunction_defined_in_scope (scope);
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1295
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1296 std::string nm = tmp.first;
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1297
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1298 if (! nm.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1299 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1300 octave_value& fcn = tmp.second;
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1301
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1302 octave_user_function *f = fcn.user_function_value ();
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1303
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1304 if (f)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1305 f->stash_dir_name (dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1306 }
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1307 }
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1308 }
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1309
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1310 octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1311 symbol_table::do_find (const std::string& name,
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1312 const octave_value_list& args,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1313 bool skip_variables,
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1314 bool local_funcs)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1315 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1316 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1317
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1318 // Variable.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1319
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1320 if (! skip_variables)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1321 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1322 table_iterator p = table.find (name);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1323
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1324 if (p != table.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1325 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1326 symbol_record sr = p->second;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1327
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1328 if (sr.is_global ())
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1329 return symbol_table::global_varval (name);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1330 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1331 {
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1332 octave_value val = sr.varval ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1333
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1334 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1335 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1336 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1337 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1338 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1339
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1340 fcn_table_iterator p = fcn_table.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1341
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1342 if (p != fcn_table.end ())
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1343 return p->second.find (args, local_funcs);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1344 else
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1345 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1346 fcn_info finfo (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1347
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1348 octave_value fcn = finfo.find (args, local_funcs);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1349
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1350 if (fcn.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1351 fcn_table[name] = finfo;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1352
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1353 return fcn;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1354 }
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1355
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1356 return retval;
605 4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 584 diff changeset	1357 }
4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 584 diff changeset	1358
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1359 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1360 symbol_table::do_builtin_find (const std::string& name)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1361 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1362 octave_value retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1363
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1364 fcn_table_iterator p = fcn_table.find (name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1365
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1366 if (p != fcn_table.end ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1367 return p->second.builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1368 else
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1369 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1370 fcn_info finfo (name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1371
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1372 octave_value fcn = finfo.builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1373
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1374 if (fcn.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1375 fcn_table[name] = finfo;
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1376
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1377 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1378 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1379
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1380 return retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1381 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1382
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1383 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1384 symbol_table::do_dump (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1385 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1386 if (! persistent_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1387 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1388 os << " persistent variables in this scope:\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1389
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1390 for (persistent_table_const_iterator p = persistent_table.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1391 p != persistent_table.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1392 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1393 std::string nm = p->first;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1394 octave_value val = p->second;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1395
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1396 os << " " << nm << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1397 val.dump (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1398 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1399 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1400
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1401 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1402 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1403
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1404 if (! table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1405 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1406 os << " other symbols in this scope (l=local; a=auto; f=formal\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1407 << " h=hidden; i=inherited; g=global; p=persistent)\n\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1408
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1409 for (table_const_iterator p = table.begin (); p != table.end (); p++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1410 p->second.dump (os, " ");
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1411
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1412 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1413 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1414 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1415
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1416 void symbol_table::cleanup (void)
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1417 {
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1418 // Clear variables in top scope.
9992 a5a05b2ebb9d avoid duplicate function cleaning in symbol_table::cleanup Jaroslav Hajek <highegg@gmail.com> parents: 9981 diff changeset	1419 all_instances[xtop_scope]->clear_variables ();
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1420
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1421 // Clear function table. This is a hard clear, ignoring mlocked functions.
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1422 fcn_table.clear ();
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1423
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1424 // Clear variables in global scope.
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1425 // FIXME: are there any?
9992 a5a05b2ebb9d avoid duplicate function cleaning in symbol_table::cleanup Jaroslav Hajek <highegg@gmail.com> parents: 9981 diff changeset	1426 all_instances[xglobal_scope]->clear_variables ();
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1427
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1428 // Clear global variables.
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1429 global_table.clear ();
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1430
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1431 // Delete all possibly remaining scopes.
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1432 for (all_instances_iterator iter = all_instances.begin ();
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1433 iter != all_instances.end (); iter++)
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1434 {
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1435 scope_id scope = iter->first;
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1436 if (scope != xglobal_scope && scope != xtop_scope)
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1437 scope_id_cache::free (scope);
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1438
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1439 // First zero the table entry to avoid possible duplicate delete.
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1440 symbol_table *inst = iter->second;
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1441 iter->second = 0;
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1442
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1443 // Now delete the scope. Note that there may be side effects, such as
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1444 // deleting other scopes.
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1445 delete inst;
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1446 }
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1447 }
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1448
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1449 void
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1450 symbol_table::do_update_nest (void)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1451 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1452 if (nest_parent \|\| nest_children.size ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1453 curr_fcn->mark_as_nested_function ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1454
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1455 if (nest_parent)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1456 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1457 // fix bad symbol_records
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1458 for (table_iterator ti = table.begin (); ti != table.end (); ++ti)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1459 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1460 symbol_record &ours = ti->second;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1461 symbol_record parents;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1462 if (! ours.is_formal ()
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1463 && nest_parent->look_nonlocal (ti->first, parents))
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1464 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1465 if (ours.is_global () \|\| ours.is_persistent ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1466 ::error ("global and persistent may only be used in the topmost level in which a nested variable is used");
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1467
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1468 if (! ours.is_formal ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1469 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1470 ours.invalidate ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1471 ti->second = parents;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1472 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1473 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1474 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1475 ours.set_curr_fcn (curr_fcn);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1476 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1477 }
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14604 diff changeset	1478 else if (nest_children.size ())
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1479 {
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1480 static_workspace = true;
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1481 for (table_iterator ti = table.begin (); ti != table.end (); ++ti)
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1482 ti->second.set_curr_fcn (curr_fcn);
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1483 }
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1484
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1485 for (std::vector<symbol_table*>::iterator iter = nest_children.begin ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1486 iter != nest_children.end (); ++iter)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1487 (*iter)->do_update_nest ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1488 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1489
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1490 DEFUN (ignore_function_time_stamp, args, nargout,
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1491 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10321 diff changeset	1492 @deftypefn {Built-in Function} {@var{val} =} ignore_function_time_stamp ()\n\
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1493 @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	1494 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	1495 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	1496 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	1497 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	1498 @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	1499 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	1500 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	1501 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	1502 @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	1503 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	1504 need to recompiled.\n\
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1505 @end deftypefn")
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	1506 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1507 octave_value retval;
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	1508
13081 bc6c58d29757 symtab.cc: Fix compile error accidentally introduced. Rik <octave@nomad.inbox5.com> parents: 13078 diff changeset	1509 int nargin = args.length ();
bc6c58d29757 symtab.cc: Fix compile error accidentally introduced. Rik <octave@nomad.inbox5.com> parents: 13078 diff changeset	1510
13078 1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1511 if (nargout > 0 \|\| nargin == 0)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1512 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1513 switch (Vignore_function_time_stamp)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1514 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1515 case 1:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1516 retval = "system";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1517 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1518
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1519 case 2:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1520 retval = "all";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1521 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1522
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1523 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1524 retval = "none";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1525 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1526 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1527 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1528
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1529 if (nargin == 1)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1530 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1531 std::string sval = args(0).string_value ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1532
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1533 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1534 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1535 if (sval == "all")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1536 Vignore_function_time_stamp = 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1537 else if (sval == "system")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1538 Vignore_function_time_stamp = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1539 else if (sval == "none")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1540 Vignore_function_time_stamp = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1541 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1542 error ("ignore_function_time_stamp: expecting argument to be \"all\", \"system\", or \"none\"");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1543 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1544 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1545 error ("ignore_function_time_stamp: expecting argument to be character string");
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1546 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1547 else if (nargin > 1)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1548 print_usage ();
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4234 diff changeset	1549
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1550 return retval;
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	1551 }
7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	1552
13078 1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1553 /*
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1554 %!shared old_state
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1555 %! old_state = ignore_function_time_stamp ();
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1556 %!test
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 13081 diff changeset	1557 %! state = ignore_function_time_stamp ("all");
13078 1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1558 %! assert (state, old_state);
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1559 %! assert (ignore_function_time_stamp (), "all");
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 13081 diff changeset	1560 %! state = ignore_function_time_stamp ("system");
13078 1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1561 %! assert (state, "all");
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1562 %! assert (ignore_function_time_stamp (), "system");
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1563 %! ignore_function_time_stamp (old_state);
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1564
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1565 ## Test input validation
13078 1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1566 %!error (ignore_function_time_stamp ("all", "all"))
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1567 %!error (ignore_function_time_stamp ("UNKNOWN_VALUE"))
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1568 %!error (ignore_function_time_stamp (42))
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1569 */
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1570
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1571 DEFUN (__current_scope__, , ,
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1572 "-- texinfo --\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1573 @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	1574 Undocumented internal function.\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1575 @end deftypefn")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1576 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1577 octave_value_list retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1578
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1579 retval(1) = symbol_table::current_context ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1580 retval(0) = symbol_table::current_scope ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1581
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1582 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1583 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1584
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1585 DEFUN (__dump_symtab_info__, args, ,
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1586 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10321 diff changeset	1587 @deftypefn {Built-in Function} {} __dump_symtab_info__ ()\n\
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1588 @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	1589 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"scopes\")\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1590 @deftypefnx {Built-in Function} {} __dump_symtab_info__ (\"functions\")\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1591 Undocumented internal function.\n\
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1592 @end deftypefn")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1593 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1594 octave_value retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1595
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1596 int nargin = args.length ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1597
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1598 if (nargin == 0)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1599 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1600 symbol_table::dump_functions (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1601
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1602 symbol_table::dump_global (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1603
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1604 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	1605
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1606 for (std::list<symbol_table::scope_id>::const_iterator p = lst.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1607 p != lst.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1608 symbol_table::dump (octave_stdout, *p);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1609 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1610 else if (nargin == 1)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1611 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1612 octave_value arg = args(0);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1613
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1614 if (arg.is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1615 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1616 std::string s_arg = arg.string_value ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1617
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1618 if (s_arg == "scopes")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1619 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1620 std::list<symbol_table::scope_id> lst = symbol_table::scopes ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1621
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1622 RowVector v (lst.size ());
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1623
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1624 octave_idx_type k = 0;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1625
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1626 for (std::list<symbol_table::scope_id>::const_iterator p = lst.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1627 p != lst.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1628 v.xelem (k++) = *p;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1629
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1630 retval = v;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1631 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1632 else if (s_arg == "functions")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1633 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1634 symbol_table::dump_functions (octave_stdout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1635 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1636 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1637 error ("__dump_symtab_info__: expecting \"functions\" or \"scopes\"");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1638 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1639 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1640 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1641 int s = arg.int_value ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1642
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1643 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1644 symbol_table::dump (octave_stdout, s);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1645 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1646 error ("__dump_symtab_info__: expecting string or scope id");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1647 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1648 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1649 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1650 print_usage ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1651
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1652 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1653 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1654
7437 3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1655 #if 0
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1656
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1657 // FIXME -- should we have functions like this in Octave?
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1658
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1659 DEFUN (set_variable, args, , "set_variable (NAME, VALUE)")
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1660 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1661 octave_value retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1662
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1663 if (args.length () == 2)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1664 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1665 std::string name = args(0).string_value ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1666
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1667 if (! error_state)
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1668 symbol_table::assign (name, args(1));
7437 3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1669 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1670 error ("set_variable: expecting variable name as first argument");
7437 3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1671 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1672 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1673 print_usage ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1674
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1675 return retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1676 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1677
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1678 DEFUN (variable_value, args, , "VALUE = variable_value (NAME)")
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1679 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1680 octave_value retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1681
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1682 if (args.length () == 1)
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1683 {
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1684 std::string name = args(0).string_value ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1685
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1686 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1687 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1688 retval = symbol_table::varval (name);
7437 3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1689
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1690 if (retval.is_undefined ())
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1691 error ("variable_value: '%s' is not a variable in the current scope",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1692 name.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1693 }
7437 3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1694 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1695 error ("variable_value: expecting variable name as first argument");
7437 3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1696 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1697 else
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1698 print_usage ();
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1699
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1700 return retval;
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1701 }
3e450caf93f2 [project @ 2008-02-01 08:19:05 by jwe] jwe parents: 7336 diff changeset	1702 #endif
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1703
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1704
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1705 /*
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1706 bug #34497: 'clear -f' does not work for command line functions
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1707
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1708 This test relies on bar being a core function that is implemented in an m-file.
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1709 If the first assert fails, this is no longer the case and the tests need to be
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1710 updated to use some other function.
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1711
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1712 %!assert (! strcmp (which ("bar"), ""));
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1713
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1714 %!function x = bar ()
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1715 %! x = 5;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1716 %!endfunction
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1717 %!test
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1718 %! assert (bar == 5);
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1719 %! assert (strcmp (which ("bar"), ""));
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1720 %! clear -f bar;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1721 %! assert (! strcmp (which ("bar"), ""));
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1722
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1723 %!function x = bar ()
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1724 %! x = 5;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1725 %!endfunction
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1726 %!test
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1727 %! assert (bar == 5);
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1728 %! assert (strcmp (which ("bar"), ""));
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1729 %! clear bar;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1730 %! assert (! strcmp (which ("bar"), ""));
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1731 */

Mercurial > octave

annotate libinterp/interpfcn/symtab.cc @ 16442:302157614308