octave: libinterp/corefcn/symtab.cc annotate

annotate libinterp/corefcn/symtab.cc @ 23137:334119c390b3

move bp_table class to separate file * libinterp/parse-tree/bp-table.h: Rename from libinterp/corefcn/debug.h. Change all uses. * libinterp/parse-tree/bp-table.cc: New file, extracted from debug.h. * bp-table.h, bp-table.cc (bp_table::parse_dbfunction_params): Now static member function instead of friend of bp_table class. Change all uses. * libinterp/corefcn/module.mk, libinterp/parse-tree/module.mk: Update.

author	John W. Eaton <jwe@octave.org>
date	Thu, 02 Feb 2017 16:16:26 -0500
parents	5a91168a30be
children	092078913d54

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
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22173 diff changeset	3 Copyright (C) 1993-2016 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
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	9 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	10 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	11 (at your option) any later version.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	16 GNU General Public License for more details.
1 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
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21264 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
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	28 #include <sstream>
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	29
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	30 #include "file-ops.h"
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	31 #include "file-stat.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	32 #include "oct-env.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	33 #include "oct-time.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	34 #include "singleton-cleanup.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	35
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23127 diff changeset	36 #include "bp-table.h"
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	37 #include "defun.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	38 #include "dirfns.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	39 #include "input.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	40 #include "load-path.h"
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	41 #include "ov-classdef.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	42 #include "ov-fcn.h"
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	43 #include "ov-usr-fcn.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	44 #include "pager.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	45 #include "parse.h"
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	46 #include "pt-pr-code.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	47 #include "symtab.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	48 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	49 #include "utils.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	50
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	51 octave_value symbol_table::dummy_octave_value;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	52
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	53 symbol_table *symbol_table::instance = 0;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	54
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	55 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	56
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	57 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	58
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	59 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	60
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	61 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	62
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	63 std::map<std::string, std::set<std::string> >
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	64 symbol_table::class_precedence_table;
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	65
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	66 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	67
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	68 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	69 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	70
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	71 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	72
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	73 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	74
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	75 // 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	76 // since they were last compiled?
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	77 static int Vignore_function_time_stamp = 1;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	78
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	79 void
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	80 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	81 {
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	82 instance = new scope_id_cache ();
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	83
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	84 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	85 }
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	86
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	87 symbol_table::context_id
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	88 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	89 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	90 octave_user_function *fcn = curr_fcn;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	91
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	92 // FIXME: If active_context () == -1, then it does not make much
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21736 diff changeset	93 // sense to use this symbol_record. This means an attempt at accessing
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	94 // a variable from a function that has not been called yet is
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21736 diff changeset	95 // happening. This should be cleared up when an implementing closures.
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	96
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	97 return fcn && fcn->active_context () != static_cast<context_id> (-1)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	98 ? fcn->active_context () : xcurrent_context;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	99 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	100
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	101 void
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	102 symbol_table::symbol_record::symbol_record_rep::dump
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	103 (std::ostream& os, const std::string& prefix) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	104 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	105 octave_value val = varval ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	106
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	107 os << prefix << name;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	108
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	109 if (val.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	110 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	111 os << " ["
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	112 << (is_local () ? "l" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	113 << (is_automatic () ? "a" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	114 << (is_formal () ? "f" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	115 << (is_hidden () ? "h" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	116 << (is_inherited () ? "i" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	117 << (is_global () ? "g" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	118 << (is_persistent () ? "p" : "")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	119 << "] ";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	120 val.dump (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	121 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	122
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	123 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	124 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	125
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	126 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	127 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	128 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	129 octave_value retval;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	130
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	131 if (is_global ())
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	132 retval = symbol_table::global_varval (name ());
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	133 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	134 {
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	135 retval = varval ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	136
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	137 if (retval.is_undefined ())
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	138 {
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	139 // 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	140 if (rep->finfo)
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	141 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	142 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	143 {
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	144 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	145
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	146 if (retval.is_defined ())
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	147 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	148 }
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	149 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	150 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	151
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9151 diff changeset	152 return retval;
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	153 }
c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	154
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	155 symbol_table::symbol_record symbol_table::dummy_symbol_record;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	156
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	157 static void
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	158 split_name_with_package (const std::string& name, std::string& fname,
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	159 std::string& pname)
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	160 {
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	161 size_t pos = name.rfind ('.');
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	162
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	163 fname.clear ();
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	164 pname.clear ();
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	165
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	166 if (pos != std::string::npos)
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	167 {
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	168 fname = name.substr (pos + 1);
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	169 pname = name.substr (0, pos);
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	170 }
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	171 else
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	172 fname = name;
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	173 }
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	174
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	175 // 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	176 // 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	177 // definition and move on. If the file is visible, then we also
22173 8de49f15e182 doc: Fix "doubled words" typos (\b(\w+)\s+\1\b) Andreas Weber <andy.weber.aw@gmail.com> parents: 21992 diff changeset	178 // need to check to see whether the file has changed since the
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	179 // function was loaded/parsed. However, this check should only
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	180 // 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	181 // 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	182 // since the last time the function was loaded/parsed).
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	183 //
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	184 // FIXME: perhaps this should be done for all loaded functions when
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	185 // 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	186 // 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	187
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	188 static inline bool
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	189 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	190 octave_value& function,
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20946 diff changeset	191 const std::string& dispatch_type = "",
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20946 diff changeset	192 const std::string& package_name = "")
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	193 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	194 bool retval = false;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	195
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	196 octave_function *fcn
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	197 = octave::load_fcn_from_file (ff, dir_name, dispatch_type,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	198 package_name);
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	199
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	200 if (fcn)
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	201 {
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	202 retval = true;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	203
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	204 function = octave_value (fcn);
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	205 }
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	206 else
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	207 function = octave_value ();
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	208
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	209 return retval;
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	210 }
0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	211
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	212 bool
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	213 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	214 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	215 bool check_relative)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	216 {
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	217 bool retval = false;
2949 49b42be38aa1 [project @ 1997-05-09 13:54:29 by jwe] jwe parents: 2926 diff changeset	218
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	219 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	220
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	221 if (fcn)
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	222 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	223 // FIXME: we need to handle subfunctions properly here.
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	224
11461 2b8531a6a3c9 Change mentions of "nested function" to the less misleading "subfunction" David Grundberg <individ@acc.umu.se> parents: 11445 diff changeset	225 if (! fcn->is_subfunction ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	226 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	227 std::string ff = fcn->fcn_file_name ();
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	228
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	229 if (! ff.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	230 {
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	231 octave::sys::time tc = fcn->time_checked ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	232
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	233 bool relative = check_relative && fcn->is_relative ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	234
18300 515187b51411 Fix bug #40666 on Windows platforms with low resolution timers. Rik <rik@octave.org> parents: 18019 diff changeset	235 if (tc <= Vlast_prompt_time
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	236 \|\| (relative && tc < Vlast_chdir_time))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	237 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	238 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	239 std::string nm = fcn->name ();
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	240 std::string pack = fcn->package_name ();
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	241 std::string canonical_nm = fcn->canonical_name ();
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	242
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	243 bool is_same_file = false;
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	244
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	245 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	246 std::string dir_name;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	247
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	248 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	249 {
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	250 int nm_len = nm.length ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	251
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	252 if (octave::sys::env::absolute_pathname (nm)
19864 17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	253 && ((nm_len > 4
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	254 && (nm.substr (nm_len-4) == ".oct"
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	255 \|\| nm.substr (nm_len-4) == ".mex"))
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	256 \|\| (nm_len > 2
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	257 && nm.substr (nm_len-2) == ".m")))
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	258 file = nm;
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	259 else
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	260 {
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	261 // 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	262 // 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	263 // 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	264
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	265 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	266 {
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	267 file = load_path::find_method (dispatch_type, nm,
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	268 dir_name, pack);
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	269
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	270 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	271 {
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	272 std::string s_name;
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	273 std::string s_pack;
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	274
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	275 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	276 = 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	277 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	278 = 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	279
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	280 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	281 {
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	282 split_name_with_package (*it, s_name,
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	283 s_pack);
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	284
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	285 file = load_path::find_method (*it, nm,
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	286 dir_name,
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	287 s_pack);
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	288 if (! file.empty ())
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	289 {
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	290 pack = s_pack;
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	291 break;
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	292 }
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	293
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	294 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	295 }
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	296 }
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10840 diff changeset	297 }
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	298
9959 633f9d837982 include autoloads in out-of-date checks Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	299 // Maybe it's an autoload?
633f9d837982 include autoloads in out-of-date checks Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	300 if (file.empty ())
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	301 file = octave::lookup_autoload (nm);
9959 633f9d837982 include autoloads in out-of-date checks Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	302
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	303 if (file.empty ())
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	304 file = load_path::find_fcn (nm, dir_name, pack);
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	305 }
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	306
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	307 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	308 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	309 }
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	310 else
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	311 {
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	312 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	313 file = ff;
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	314 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	315
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	316 if (file.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	317 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	318 // Can't see this function from current
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	319 // directory, so we should clear it.
195 13c6086c325c [project @ 1993-11-06 10:12:29 by jwe] jwe parents: 191 diff changeset	320
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	321 function = octave_value ();
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	325 else if (is_same_file)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	326 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	327 // 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	328
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	329 octave::sys::time ottp = fcn->time_parsed ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	330 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	331
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	332 fcn->mark_fcn_file_up_to_date (octave::sys::time ());
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	333
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	334 if (! (Vignore_function_time_stamp == 2
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	335 \|\| (Vignore_function_time_stamp
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	336 && fcn->is_system_fcn_file ())))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	337 {
21736 0504351a45e6 use namespace for file_stat classes John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	338 octave::sys::file_stat fs (ff);
572 94fd73d1a0bc [project @ 1994-07-28 05:35:47 by jwe] jwe parents: 530 diff changeset	339
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	340 if (fs)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	341 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	342 if (fs.is_newer (tp))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	343 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	344 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	345 function,
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	346 dispatch_type,
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	347 pack);
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	348
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	349 clear_breakpoints = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	350 }
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 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	353 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	354 function = octave_value ();
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	355
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	356 clear_breakpoints = true;
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	359 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	360 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	361 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	362 // 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	363 // place of the old.
7745 0ff0fc033f28 better handling of functions found by relative lookup John W. Eaton <jwe@octave.org> parents: 7437 diff changeset	364
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	365 retval = load_out_of_date_fcn (file, dir_name, function,
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	366 dispatch_type, pack);
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	367
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	368 clear_breakpoints = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	369 }
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8082 diff changeset	370
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	371 // 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	372 // breakpoints associated with it
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	373 if (clear_breakpoints)
18304 b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	374 bp_table::remove_all_breakpoints_in_file (canonical_nm,
b0e8cc676396 Fix out-of-date status check for package functions. Michael Goffioul <michael.goffioul@gmail.com> parents: 18300 diff changeset	375 true);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	376 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	377 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	378 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	379 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	380
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	381 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	382 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	383
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	384 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	385 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	386 (const std::string& dir_name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	387 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	388 octave_value retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	389
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	390 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	391
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	392 if (! file_name.empty ())
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	393 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	394 octave_function *fcn = octave::load_fcn_from_file (file_name, dir_name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	395
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	396 if (fcn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	397 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	398 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	399
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	400 size_t pos = dir_name.find_last_of (octave::sys::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	401
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	402 if (pos != std::string::npos)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	403 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	404 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	405
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	406 if (tmp[0] == '@')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	407 class_name = tmp.substr (1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	408 }
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8781 diff changeset	409
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	410 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	411
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	412 retval = octave_value (fcn);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	413
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	414 private_functions[dir_name] = retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	415 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	416 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	417
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	418 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	419 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	420
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	421 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	422 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	423 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	424 octave_value retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	425
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	426 std::string dir_name;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	427
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	428 std::string file_name = load_path::find_method (name, name, dir_name,
edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	429 package_name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	430
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	431 if (! file_name.empty ())
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	432 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	433 octave_function *fcn
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	434 = octave::load_fcn_from_file (file_name, dir_name, name,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	435 package_name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	436
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	437 if (fcn)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	438 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	439 retval = octave_value (fcn);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	440
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	441 class_constructors[name] = retval;
21097 87b3348d8d76 Fix clearing breakpoints in @class files with dbstatus (bug #41190). Lachlan Andrew <lachlanbis@gmail.com> parents: 21017 diff changeset	442 class_methods[name] = retval;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	443 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	444 }
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	445 else
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	446 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	447 // Classdef constructors can be defined anywhere in the path, not
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21736 diff changeset	448 // necessarily in @-folders. Look for a normal function and load it.
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	449 // If the loaded function is a classdef constructor, store it as such
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	450 // and restore function_on_path to its previous value.
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	451
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	452 octave_value old_function_on_path = function_on_path;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	453
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	454 octave_value maybe_cdef_ctor = find_user_function ();
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	455
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	456 if (maybe_cdef_ctor.is_defined ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	457 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	458 octave_function *fcn = maybe_cdef_ctor.function_value (true);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	459
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	460 if (fcn && fcn->is_classdef_constructor ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	461 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	462 retval = maybe_cdef_ctor;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	463
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	464 class_constructors[name] = retval;
21097 87b3348d8d76 Fix clearing breakpoints in @class files with dbstatus (bug #41190). Lachlan Andrew <lachlanbis@gmail.com> parents: 21017 diff changeset	465 class_methods[name] = retval;
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	466
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	467 function_on_path = old_function_on_path;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	468 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	469 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	470 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	471
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	472 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	473 }
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 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	476 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	477 (const std::string& dispatch_type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	478 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	479 octave_value retval;
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	480
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	481 if (full_name () == dispatch_type)
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	482 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	483 else
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	484 {
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	485 octave_function *cm = cdef_manager::find_method_symbol (name,
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	486 dispatch_type);
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	487
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	488 if (cm)
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	489 retval = octave_value (cm);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	490
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	491 if (! retval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	492 {
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	493 std::string dir_name;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	494
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	495 std::string file_name = load_path::find_method (dispatch_type, name,
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	496 dir_name);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	497
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	498 if (! file_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	499 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	500 octave_function *fcn
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	501 = octave::load_fcn_from_file (file_name, dir_name,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	502 dispatch_type);
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	503
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	504 if (fcn)
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	505 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	506 retval = octave_value (fcn);
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	507
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	508 class_methods[dispatch_type] = retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	509 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	510 }
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	511
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	512 if (retval.is_undefined ())
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	513 {
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	514 // Search parent classes
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	515
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	516 const std::list<std::string>& plist =
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	517 parent_classes (dispatch_type);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	518
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	519 std::list<std::string>::const_iterator it = plist.begin ();
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	520
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	521 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	522 {
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	523 retval = find_method (*it);
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	524
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	525 if (retval.is_defined ())
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	526 {
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	527 class_methods[dispatch_type] = retval;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	528 break;
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	529 }
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	530
10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	531 it++;
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	532 }
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	533 }
22897 4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	534
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	535 if (retval.is_undefined ())
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	536 {
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	537 // Search for built-in functions that are declared to
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	538 // handle specific types.
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	539
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	540 if (built_in_function.is_defined ())
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	541 {
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	542 octave_function *fcn = built_in_function.function_value ();
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	543
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	544 if (fcn && fcn->handles_dispatch_class (dispatch_type))
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	545 {
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	546 retval = built_in_function;
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	547
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	548 class_methods[dispatch_type] = retval;
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	549 }
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	550 }
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	551 }
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	552 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	553 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	554
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	555 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	556 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3944 diff changeset	557
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	558 void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	559 symbol_table::fcn_info::fcn_info_rep::mark_subfunction_in_scope_as_private
11445 40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	560 (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	561 {
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	562 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	563
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	564 if (p != subfunctions.end ())
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	565 {
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	566 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	567
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	568 if (fcn)
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	569 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	570 }
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	571 }
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11321 diff changeset	572
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	573 // :-) JWE, can you parse this? Returns a 2D array with second dimension equal
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21736 diff changeset	574 // to btyp_num_types (static constant). Only the leftmost dimension can be
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21736 diff changeset	575 // variable in C/C++. Typedefs are boring.
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	576
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	577 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	578 {
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	579 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	580 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	581 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	582 {
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	583 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	584 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	585 // FIXME: Is this really right?
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	586 bool use_j =
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	587 (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	588 \|\| (btyp_isarray (ityp)
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	589 && (! btyp_isarray (jtyp)
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	590 \|\| (btyp_isinteger (jtyp) && ! btyp_isinteger (ityp))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	591 \|\| ((ityp == btyp_double \|\| ityp == btyp_complex
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	592 \|\| ityp == btyp_char)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	593 && (jtyp == btyp_float
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	594 \|\| jtyp == btyp_float_complex)))));
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	595
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	596 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	597 }
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	598
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	599 return sup_table;
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	600 }
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	601
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9445 diff changeset	602 std::string
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	603 get_dispatch_type (const octave_value_list& args,
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	604 builtin_type_t& builtin_type)
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	605 {
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	606 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	607 std::string dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	608
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	609 int n = args.length ();
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	610
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	611 if (n > 0)
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	612 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	613 int i = 0;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	614 builtin_type = args(0).builtin_type ();
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	615 if (builtin_type != btyp_unknown)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	616 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	617 for (i = 1; i < n; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	618 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	619 builtin_type_t bti = args(i).builtin_type ();
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	620 if (bti != btyp_unknown)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	621 builtin_type = sup_table[builtin_type][bti];
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	622 else
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	623 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	624 builtin_type = btyp_unknown;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	625 break;
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	626 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	627 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	628 }
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	629
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	630 if (builtin_type == btyp_unknown)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	631 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	632 // There's a non-builtin class in the argument list.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	633 dispatch_type = args(i).class_name ();
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	634
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	635 for (int j = i+1; j < n; j++)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	636 {
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	637 octave_value arg = args(j);
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	638
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	639 if (arg.builtin_type () == btyp_unknown)
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	640 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	641 std::string cname = arg.class_name ();
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	642
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	643 // 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	644 // to the current DISPATCH_TYPE.
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	645 if (! symbol_table::is_superiorto (dispatch_type, cname)
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	646 && symbol_table::is_superiorto (cname, dispatch_type))
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	647 dispatch_type = cname;
10306 7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	648 }
7b5e8527441e partially revert 2ceae0b40515, implement a better fallback Jaroslav Hajek <highegg@gmail.com> parents: 10304 diff changeset	649 }
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	650 }
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	651 else
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	652 dispatch_type = btyp_class_name[builtin_type];
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	653 }
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	654 else
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	655 builtin_type = btyp_unknown;
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	656
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	657 return dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	658 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	659
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	660 std::string
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	661 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	662 {
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	663 builtin_type_t builtin_type;
97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	664 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	665 }
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 9992 diff changeset	666
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	667 // 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	668 // list:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	669 //
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	670 // variable
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	671 // subfunction
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	672 // private function
13147 6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	673 // class method
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	674 // class constructor
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	675 // command-line function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	676 // autoload function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	677 // function on the path
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	678 // built-in function
13147 6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	679 //
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	680 // Matlab documentation states that constructors have higher precedence
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	681 // 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	682
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	683 octave_value
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	684 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	685 bool local_funcs)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	686 {
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	687 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	688
20678 4b00afb5e9c3 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	689 if (retval.is_undefined ())
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	690 {
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	691 // 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	692 // 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	693 // 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	694
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	695 load_path::update ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	696
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	697 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	698 }
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	699
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	700 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	701 }
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	702
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call John W. Eaton <jwe@octave.org> parents: 8580 diff changeset	703 octave_value
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	704 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	705 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	706 {
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	707 if (local_funcs)
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	708 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	709 // 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	710 // 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	711 // from a .m file.
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	712
21339 6228796397bc * symtab.cc: Avoid shadowed variable warnings. John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	713 octave_user_function *current_fcn = symbol_table::get_curr_fcn ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	714
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	715 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	716 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	717 scope_val_iterator r = subfunctions.find (scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	718 if (r != subfunctions.end ())
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	719 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	720 // 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	721
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	722 return r->second;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	723 }
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	724
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	725 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	726 if (scope_curr_fcn)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	727 scope = scope_curr_fcn->parent_fcn_scope ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	728 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	729 scope = -1;
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	730 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	731
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	732 // Private function.
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	733
21339 6228796397bc * symtab.cc: Avoid shadowed variable warnings. John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	734 if (current_fcn)
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	735 {
21339 6228796397bc * symtab.cc: Avoid shadowed variable warnings. John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	736 std::string dir_name = current_fcn->dir_name ();
7968 0d607e8dbbfa eliminate curr_parent_function; fix subfunction lookup John W. Eaton <jwe@octave.org> parents: 7942 diff changeset	737
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	738 if (! dir_name.empty ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	739 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	740 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	741
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	742 if (q == private_functions.end ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	743 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	744 octave_value val = load_private_function (dir_name);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	745
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	746 if (val.is_defined ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	747 return val;
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	748 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	749 else
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	750 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	751 octave_value& fval = q->second;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	752
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	753 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	754 out_of_date_check (fval, "", false);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	755
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	756 if (fval.is_defined ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	757 return fval;
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	758 else
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	759 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	760 octave_value val = load_private_function (dir_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	761
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	762 if (val.is_defined ())
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	763 return val;
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	764 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	765 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	766 }
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	767 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	768 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	769
13147 6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	770 // Class methods.
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	771
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	772 if (! args.empty ())
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	773 {
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	774 std::string dispatch_type = get_dispatch_type (args);
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	775
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	776 octave_value fcn = find_method (dispatch_type);
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	777
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	778 if (fcn.is_defined ())
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	779 return fcn;
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	780 }
6c952376482d look for methods before constructors John W. Eaton <jwe@octave.org> parents: 13141 diff changeset	781
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	782 // 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	783
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	784 str_val_iterator q = class_constructors.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	785
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	786 if (q == class_constructors.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	787 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	788 octave_value val = load_class_constructor ();
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	789
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	790 if (val.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	791 return val;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	792 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	793 else
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	794 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	795 octave_value& fval = q->second;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	796
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	797 if (fval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	798 out_of_date_check (fval, name);
867 b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe] jwe parents: 773 diff changeset	799
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	800 if (fval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	801 return fval;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	802 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	803 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	804 octave_value val = load_class_constructor ();
867 b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe] jwe parents: 773 diff changeset	805
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	806 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	807 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	808 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	809 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	810
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	811 // Command-line function.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	812
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	813 if (cmdline_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	814 return cmdline_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	815
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	816 // Autoload?
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	817
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	818 octave_value fcn = find_autoload ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	819
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	820 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	821 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	822
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	823 // Function on the path.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	824
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	825 fcn = find_user_function ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	826
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	827 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	828 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	829
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	830 // Package
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	831
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	832 fcn = find_package ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	833
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	834 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	835 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	836
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	837 // Built-in function (might be undefined).
3145 0d640dc625c7 [project @ 1998-02-05 08:44:59 by jwe] jwe parents: 3125 diff changeset	838
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	839 return built_in_function;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	840 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	841
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	842 // 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	843 // list:
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 // built-in function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	846 // function on the path
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	847 // autoload function
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 // private function
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	850 // subfunction
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	851
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	852 // 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	853 // searches for "built-in" functions. In Matlab, "builtin" only
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	854 // 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	855 // 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	856 // 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	857 // something that matches. Note that we are only searching by name,
22653 e7a9dfb8bf16 remove obsolete function __dispatch__ John W. Eaton <jwe@octave.org> parents: 22489 diff changeset	858 // so class methods and constructors are skipped.
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	859
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	860 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	861 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	862 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	863 octave_value retval = x_builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	864
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	865 if (! retval.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	866 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	867 // 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	868 // 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	869 // searching again.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	870
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	871 load_path::update ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	872
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	873 retval = x_builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	874 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	875
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	876 return retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	877 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	878
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	879 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	880 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	881 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	882 // Built-in function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	883 if (built_in_function.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	884 return built_in_function;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	885
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	886 // Function on the path.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	887
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	888 octave_value fcn = find_user_function ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	889
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	890 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	891 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	892
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	893 // Autoload?
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	894
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	895 fcn = find_autoload ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	896
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	897 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	898 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	899
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	900 // Command-line function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	901
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	902 if (cmdline_function.is_defined ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	903 return cmdline_function;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	904
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	905 // Private function.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	906
21339 6228796397bc * symtab.cc: Avoid shadowed variable warnings. John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	907 octave_user_function *current_fcn = symbol_table::get_curr_fcn ();
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	908
21339 6228796397bc * symtab.cc: Avoid shadowed variable warnings. John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	909 if (current_fcn)
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	910 {
21339 6228796397bc * symtab.cc: Avoid shadowed variable warnings. John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	911 std::string dir_name = current_fcn->dir_name ();
9444 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 if (! dir_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	914 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	915 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	916
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	917 if (q == private_functions.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	918 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	919 octave_value val = load_private_function (dir_name);
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	920
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	921 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	922 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	923 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	924 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	925 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	926 octave_value& fval = q->second;
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	927
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	928 if (fval.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	929 out_of_date_check (fval);
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	930
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	931 if (fval.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	932 return fval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	933 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	934 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	935 octave_value val = load_private_function (dir_name);
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	936
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	937 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	938 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	939 }
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 }
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	942 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	943
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	944 // 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	945 // subfunctions if we are currently executing a function defined
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	946 // from a .m file.
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	947
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	948 for (scope_id scope = xcurrent_scope; scope >= 0;)
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	949 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	950 scope_val_iterator r = subfunctions.find (scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	951 if (r != subfunctions.end ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	952 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	953 // FIXME: out-of-date check here.
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	954
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	955 return r->second;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	956 }
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	957
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	958 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	959 if (scope_curr_fcn)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	960 scope = scope_curr_fcn->parent_fcn_scope ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	961 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	962 scope = -1;
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	963 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	964
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	965 return octave_value ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	966 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	967
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	968 octave_value
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	969 symbol_table::fcn_info::fcn_info_rep::find_method
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	970 (const std::string& dispatch_type)
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	971 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	972 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	973
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	974 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	975
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	976 if (q == class_methods.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	977 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	978 octave_value val = load_class_method (dispatch_type);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	979
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	980 if (val.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	981 return val;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	982 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	983 else
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 octave_value& fval = q->second;
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 (fval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	988 out_of_date_check (fval, dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	989
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	990 if (fval.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	991 return fval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	992 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	993 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	994 octave_value val = load_class_method (dispatch_type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	995
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	996 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	997 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	998 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	999 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1000
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1001 return retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1002 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1003
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1004 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1005 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	1006 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1007 // Autoloaded function.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1008
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1009 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	1010 out_of_date_check (autoload_function);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1011
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1012 if (! autoload_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1013 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	1014 std::string file_name = octave::lookup_autoload (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1015
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1016 if (! file_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1017 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	1018 size_t pos = file_name.find_last_of (octave::sys::file_ops::dir_sep_chars ());
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1019
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1020 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	1021
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	1022 octave_function *fcn
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	1023 = octave::load_fcn_from_file (file_name, dir_name, "", "",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	1024 name, true);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1025
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1026 if (fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1027 autoload_function = octave_value (fcn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1028 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1029 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1030
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1031 return autoload_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1032 }
4914 1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe] jwe parents: 4913 diff changeset	1033
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1034 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1035 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	1036 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1037 // Function on the path.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1038
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1039 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	1040 out_of_date_check (function_on_path);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1041
20678 4b00afb5e9c3 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	1042 if (function_on_path.is_undefined ())
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1043 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1044 std::string dir_name;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1045
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	1046 std::string file_name = load_path::find_fcn (name, dir_name,
edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	1047 package_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1048
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1049 if (! file_name.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1050 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	1051 octave_function *fcn
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	1052 = octave::load_fcn_from_file (file_name, dir_name, "",
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	1053 package_name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1054
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1055 if (fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1056 function_on_path = octave_value (fcn);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1057 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1058 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1059
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1060 return function_on_path;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1061 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1062
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1063 octave_value
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	1064 symbol_table::fcn_info::fcn_info_rep::find_package (void)
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1065 {
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1066 // FIXME: implement correct way to check out of date package
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1067 //if (package.is_defined ())
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1068 // out_of_date_check (package);
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1069
20678 4b00afb5e9c3 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20582 diff changeset	1070 if (package.is_undefined ())
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1071 {
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	1072 octave_function * fcn =
edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	1073 cdef_manager::find_package_symbol (full_name ());
16676 7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1074
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1075 if (fcn)
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1076 package = octave_value (fcn);
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1077 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1078
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1079 return package;
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1080 }
7368654f302f Initial support for (classdef) packages. Michael Goffioul <michael.goffioul@gmail.com> parents: 16644 diff changeset	1081
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1082 // 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	1083 // inferior to SUP_CLASS. Return FALSE if INF_CLASS is currently
21562 6c2fd62db1f7 maint: Eliminate accidental double spaces in code. Rik <rik@octave.org> parents: 21339 diff changeset	1084 // marked as superior to SUP_CLASS.
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1085
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1086 bool
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1087 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	1088 const std::string& inf_class)
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1089 {
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1090 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	1091 return false;
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1092
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1093 // 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	1094 // 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	1095 // singleton set {inf_class} of inferior classes.
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1096 class_precedence_table[sup_class].insert (inf_class);
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1097
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1098 return true;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1099 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1100
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1101 // 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	1102 // 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	1103 // 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	1104 // 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	1105 // is no relationship between two classes:
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1106 //
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1107 // if (symbol_table::is_superiorto (a, b))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1108 // // 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	1109 // else if (symbol_table::is_superiorto (b, a))
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1110 // // 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	1111 // else
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1112 // // No relation.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1113
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1114 bool
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1115 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	1116 {
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1117 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	1118 // 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	1119 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	1120 return false;
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1121
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15467 diff changeset	1122 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	1123 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	1124 return (q != inferior_classes.end ());
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1125 }
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7968 diff changeset	1126
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1127 static std::string
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1128 fcn_file_name (const octave_value& fcn)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1129 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1130 const octave_function *f = fcn.function_value ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1131
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20946 diff changeset	1132 return f ? f->fcn_file_name () : "";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1133 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1134
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1135 void
22897 4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1136 symbol_table::fcn_info::fcn_info_rep::install_built_in_dispatch (const std::string& klass)
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1137 {
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1138 if (built_in_function.is_defined ())
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1139 {
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1140 octave_function *fcn = built_in_function.function_value ();
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1141
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1142 if (fcn)
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1143 {
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1144 if (fcn->handles_dispatch_class (klass))
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1145 warning ("install_built_in_dispatch: '%s' already defined for class '%s'",
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1146 name.c_str (), klass.c_str ());
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1147 else
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1148 fcn->push_dispatch_class (klass);
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1149 }
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1150 }
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1151 else
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1152 error ("install_built_in_dispatch: '%s' is not a built-in function",
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1153 name.c_str ());
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1154 }
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1155
4090c32fccf8 store set of dispatch classes in built-in function objects John W. Eaton <jwe@octave.org> parents: 22862 diff changeset	1156 void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1157 symbol_table::fcn_info::fcn_info_rep::dump (std::ostream& os,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1158 const std::string& prefix) const
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1159 {
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16682 diff changeset	1160 os << prefix << full_name ()
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1161 << " ["
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1162 << (cmdline_function.is_defined () ? "c" : "")
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1163 << (built_in_function.is_defined () ? "b" : "")
16682 2c8dc18fa9c6 Mark "package" function symbols when dumping symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16676 diff changeset	1164 << (package.is_defined () ? "p" : "")
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1165 << "]\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1166
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1167 std::string tprefix = prefix + " ";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1168
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1169 if (autoload_function.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1170 os << tprefix << "autoload: "
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1171 << fcn_file_name (autoload_function) << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1172
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1173 if (function_on_path.is_defined ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1174 os << tprefix << "function from path: "
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1175 << fcn_file_name (function_on_path) << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1176
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1177 if (! subfunctions.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1178 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1179 for (const auto& scope_val : subfunctions)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1180 os << tprefix << "subfunction: " << fcn_file_name (scope_val.second)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1181 << " [" << scope_val.first << "]\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1182 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1183
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1184 if (! private_functions.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1185 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1186 for (const auto& str_val : private_functions)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1187 os << tprefix << "private: " << fcn_file_name (str_val.second)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1188 << " [" << str_val.first << "]\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1189 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1190
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1191 if (! class_constructors.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1192 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1193 for (const auto& str_val : class_constructors)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1194 os << tprefix << "constructor: " << fcn_file_name (str_val.second)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1195 << " [" << str_val.first << "]\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1196 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1197
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1198 if (! class_methods.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1199 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1200 for (const auto& str_val : class_methods)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1201 os << tprefix << "method: " << fcn_file_name (str_val.second)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1202 << " [" << str_val.first << "]\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1203 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1204 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1205
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1206 void
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1207 symbol_table::install_nestfunction (const std::string& name,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1208 const octave_value& fcn,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1209 scope_id parent_scope)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1210 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1211 install_subfunction (name, fcn, parent_scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1212
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1213 // 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	1214 octave_function *fv = fcn.function_value ();
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1215
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	1216 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	1217
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1218 symbol_table *parent_table = get_instance (parent_scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1219
14604 de72463862c4 Silence warnings Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14544 diff changeset	1220 parent_table->add_nest_child (*fcn_table_loc);
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1221 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1222
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1223 octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1224 symbol_table::find (const std::string& name,
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1225 const octave_value_list& args,
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1226 bool skip_variables,
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1227 bool local_funcs)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1228 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7745 diff changeset	1229 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1230
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1231 return inst
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1232 ? inst->do_find (name, args, skip_variables, local_funcs)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1233 : octave_value ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1234 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1235
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1236 octave_value
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1237 symbol_table::builtin_find (const std::string& name)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1238 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1239 symbol_table *inst = get_instance (xcurrent_scope);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1240
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1241 return inst ? inst->do_builtin_find (name) : octave_value ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1242 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1243
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1244 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1245 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	1246 const octave_value_list& args,
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1247 bool local_funcs)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1248 {
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1249 octave_value retval;
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1250
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1251 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	1252 {
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1253 // Look for a class specific function.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1254 std::string dispatch_type =
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	1255 name.substr (1, name.find_first_of (octave::sys::file_ops::dir_sep_str ()) - 1);
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1256
19871 ed5ee3f610db Correct tests using std::string::find_XXX which did not use std::string::npos. Rik <rik@octave.org> parents: 19864 diff changeset	1257 std::string method;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	1258 size_t pos = name.find_last_of (octave::sys::file_ops::dir_sep_str ());
19871 ed5ee3f610db Correct tests using std::string::find_XXX which did not use std::string::npos. Rik <rik@octave.org> parents: 19864 diff changeset	1259 if (pos != std::string::npos)
ed5ee3f610db Correct tests using std::string::find_XXX which did not use std::string::npos. Rik <rik@octave.org> parents: 19864 diff changeset	1260 method = name.substr (pos + 1);
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1261
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1262 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	1263 }
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1264 else
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1265 {
8160 436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1266 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	1267
436438954797 Check for class specific methods in symbol_table::find_function David Bateman <dbateman@free.fr> parents: 8155 diff changeset	1268 if (pos == std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1269 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	1270 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1271 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1272 std::string fcn_scope = name.substr (0, pos);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1273 scope_id stored_scope = xcurrent_scope;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1274 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	1275 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	1276 octave_value_list (), false);
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1277
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1278 if (parent.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1279 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1280 octave_function *parent_fcn = parent.function_value ();
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1281
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1282 if (parent_fcn)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1283 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1284 xcurrent_scope = parent_fcn->scope ();
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1285
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1286 if (xcurrent_scope > 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1287 retval = find_function (name.substr (pos + 1), args);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1288 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1289 }
8161 64f1cd525656 symtab.cc: style fixes John W. Eaton <jwe@octave.org> parents: 8160 diff changeset	1290
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1291 xcurrent_scope = stored_scope;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1292 }
7818 5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1293 }
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1294
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in' David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1295 return retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1296 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1297
21264 dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1298 // look for @class/method>subfunction
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1299 octave_value
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1300 symbol_table::find_submethod (const std::string& name,
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1301 const std::string& dispatch_type)
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1302 {
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1303 octave_value fcn;
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1304
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1305 std::string full_name = "@" + dispatch_type +
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1306 octave::sys::file_ops::dir_sep_str () + name;
21264 dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1307 size_t pos = full_name.find_first_of (Vfilemarker);
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1308
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1309 if (pos != std::string::npos)
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1310 {
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1311 std::string fcn_scope = full_name.substr (0, pos);
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1312 scope_id stored_scope = xcurrent_scope;
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1313 xcurrent_scope = xtop_scope;
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1314 octave_value parent = find_function (full_name.substr (0, pos),
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1315 octave_value_list (), false);
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1316 if (parent.is_defined ())
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1317 {
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1318 octave_function *parent_fcn = parent.function_value ();
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1319
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1320 if (parent_fcn)
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1321 {
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1322 xcurrent_scope = parent_fcn->scope ();
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1323
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1324 if (xcurrent_scope > 1)
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1325 fcn = find_function (full_name.substr (pos + 1),
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1326 octave_value_list ());
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1327 }
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1328 }
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1329
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1330 xcurrent_scope = stored_scope;
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1331 }
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1332
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1333 return fcn;
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1334 }
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804). Lachlan <lachlanbis@gmail.com> parents: 21200 diff changeset	1335
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1336 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1337 symbol_table::dump (std::ostream& os, scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1338 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1339 if (scope == xglobal_scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1340 dump_global (os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1341 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1342 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1343 symbol_table *inst = get_instance (scope, false);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1344
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1345 if (inst)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1346 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1347 os << "*** dumping symbol table scope " << scope
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1348 << " (" << inst->table_name << ")\n\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1349
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1350 std::map<std::string, octave_value> sfuns
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1351 = symbol_table::subfunctions_defined_in_scope (scope);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1352
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1353 if (! sfuns.empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1354 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1355 os << " subfunctions defined in this scope:\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1356
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1357 for (std::map<std::string,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1358 octave_value>::const_iterator p = sfuns.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1359 p != sfuns.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1360 os << " " << p->first << "\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1361
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1362 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1363 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1364
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1365 inst->do_dump (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1366 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1367 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1368 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1369
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1370 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1371 symbol_table::dump_global (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1372 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1373 if (! global_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1374 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1375 os << "*** dumping global symbol table\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1376
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1377 for (const auto& str_val : global_table)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1378 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1379 std::string nm = str_val.first;
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1380 octave_value val = str_val.second;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1381
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1382 os << " " << nm << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1383 val.dump (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1384 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1385 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1386 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1387 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1388
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1389 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1390 symbol_table::dump_functions (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1391 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1392 if (! fcn_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1393 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1394 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	1395 << " (c=commandline, b=built-in)\n\n";
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1396
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1397 for (const auto& nm_fi : fcn_table)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1398 nm_fi.second.dump (os, " ");
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1399
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1400 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1401 }
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
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1404 void
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1405 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	1406 const std::string& dir_name)
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1407 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1408 // FIXME: is this the best way to do this? Maybe it would be
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1409 // 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	1410 // stored with the function. Do we?
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1411
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1412 for (const auto& nm_fi : fcn_table)
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1413 {
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1414 std::pair<std::string, octave_value> tmp
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1415 = nm_fi.second.subfunction_defined_in_scope (scope);
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1416
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1417 std::string nm = tmp.first;
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1418
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1419 if (! nm.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1420 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1421 octave_value& fcn = tmp.second;
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1422
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1423 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	1424
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1425 if (f)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1426 f->stash_dir_name (dir_name);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1427 }
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1428 }
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1429 }
96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	1430
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1431 octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1432 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	1433 const octave_value_list& args,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1434 bool skip_variables,
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1435 bool local_funcs)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1436 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1437 octave_value retval;
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1438
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1439 // Variable.
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1440
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1441 if (! skip_variables)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1442 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1443 table_iterator p = table.find (name);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1444
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1445 if (p != table.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1446 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1447 symbol_record sr = p->second;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1448
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1449 if (sr.is_global ())
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1450 return symbol_table::global_varval (name);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1451 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1452 {
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1453 octave_value val = sr.varval ();
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1454
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1455 if (val.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1456 return val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1457 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1458 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1459 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1460
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1461 fcn_table_iterator p = fcn_table.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4911 diff changeset	1462
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1463 if (p != fcn_table.end ())
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1464 return p->second.find (args, local_funcs);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1465 else
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1466 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1467 fcn_info finfo (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1468
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1469 octave_value fcn = finfo.find (args, local_funcs);
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1470
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1471 if (fcn.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1472 fcn_table[name] = finfo;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1473
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1474 return fcn;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1475 }
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1476
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1477 return retval;
605 4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 584 diff changeset	1478 }
4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 584 diff changeset	1479
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1480 octave_value
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1481 symbol_table::do_builtin_find (const std::string& name)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1482 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1483 octave_value retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1484
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1485 fcn_table_iterator p = fcn_table.find (name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1486
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1487 if (p != fcn_table.end ())
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1488 return p->second.builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1489 else
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1490 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1491 fcn_info finfo (name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1492
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1493 octave_value fcn = finfo.builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1494
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1495 if (fcn.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1496 fcn_table[name] = finfo;
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1497
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1498 return fcn;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1499 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1500
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1501 return retval;
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1502 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1503
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1504 std::list<workspace_element>
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1505 symbol_table::do_workspace_info (void) const
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1506 {
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1507 std::list<workspace_element> retval;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1508
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1509 for (const auto& nm_sr : table)
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1510 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1511 std::string nm = nm_sr.first;
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1512 symbol_record sr = nm_sr.second;
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1513
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1514 if (! sr.is_hidden ())
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1515 {
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1516 octave_value val = sr.varval ();
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1517
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1518 if (val.is_defined ())
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1519 {
19718 675d92e7d507 Temporary workaround for user-defined object sizes reported as 1x1 in GUI (bug #43096) Colin Macdonald <cbm@m.fsf.org> parents: 19697 diff changeset	1520 // FIXME: fix size for objects, see kluge in variables.cc
675d92e7d507 Temporary workaround for user-defined object sizes reported as 1x1 in GUI (bug #43096) Colin Macdonald <cbm@m.fsf.org> parents: 19697 diff changeset	1521 //dim_vector dv = val.dims ();
675d92e7d507 Temporary workaround for user-defined object sizes reported as 1x1 in GUI (bug #43096) Colin Macdonald <cbm@m.fsf.org> parents: 19697 diff changeset	1522 octave_value tmp = val;
675d92e7d507 Temporary workaround for user-defined object sizes reported as 1x1 in GUI (bug #43096) Colin Macdonald <cbm@m.fsf.org> parents: 19697 diff changeset	1523 Matrix sz = tmp.size ();
675d92e7d507 Temporary workaround for user-defined object sizes reported as 1x1 in GUI (bug #43096) Colin Macdonald <cbm@m.fsf.org> parents: 19697 diff changeset	1524 dim_vector dv = dim_vector::alloc (sz.numel ());
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	1525 for (octave_idx_type i = 0; i < dv.ndims (); i++)
19718 675d92e7d507 Temporary workaround for user-defined object sizes reported as 1x1 in GUI (bug #43096) Colin Macdonald <cbm@m.fsf.org> parents: 19697 diff changeset	1526 dv(i) = sz(i);
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1527
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1528 char storage = ' ';
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1529 if (sr.is_global ())
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1530 storage = 'g';
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1531 else if (sr.is_persistent ())
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1532 storage = 'p';
16527 8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1533 else if (sr.is_automatic ())
8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1534 storage = 'a';
8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1535 else if (sr.is_formal ())
8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1536 storage = 'f';
8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1537 else if (sr.is_hidden ())
8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1538 storage = 'h';
8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1539 else if (sr.is_inherited ())
8701792e16ec include column in workspace viewer for storage class John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1540 storage = 'i';
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1541
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	1542 std::ostringstream buf;
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	1543 val.short_disp (buf);
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	1544 std::string short_disp_str = buf.str ();
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	1545
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1546 workspace_element elt (storage, nm, val.class_name (),
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	1547 short_disp_str, dv.str (),
17824 86e8dbccf7c7 show when variables are complex in workspace view (bug #40445) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	1548 val.is_complex_type ());
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1549
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1550 retval.push_back (elt);
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1551 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1552 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1553 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1554
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1555 return retval;
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1556 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	1557
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1558 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1559 symbol_table::do_dump (std::ostream& os)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1560 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1561 if (! persistent_table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1562 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1563 os << " persistent variables in this scope:\n\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1564
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1565 for (const auto& nm_val : persistent_table)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1566 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1567 std::string nm = nm_val.first;
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1568 octave_value val = nm_val.second;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1569
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1570 os << " " << nm << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1571 val.dump (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1572 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1573 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1574
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1575 os << "\n";
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
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1578 if (! table.empty ())
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1579 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1580 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	1581 << " 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	1582
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1583 for (const auto& nm_sr : table)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1584 nm_sr.second.dump (os, " ");
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1585
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1586 os << "\n";
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1587 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1588 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1589
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1590 void symbol_table::cleanup (void)
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1591 {
16605 2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691) John W. Eaton <jwe@octave.org> parents: 16527 diff changeset	1592 clear_all (true);
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1593
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1594 // Delete all possibly remaining scopes.
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1595 for (auto& scope_stp : all_instances)
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1596 {
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1597 // First zero the table entry to avoid possible duplicate delete.
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1598 symbol_table *inst = scope_stp.second;
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1599 scope_stp.second = 0;
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1600
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1601 // Now delete the scope.
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1602 // Note that there may be side effects, such as deleting other scopes.
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1603 delete inst;
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1604 }
16605 2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691) John W. Eaton <jwe@octave.org> parents: 16527 diff changeset	1605
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691) John W. Eaton <jwe@octave.org> parents: 16527 diff changeset	1606 global_table.clear ();
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691) John W. Eaton <jwe@octave.org> parents: 16527 diff changeset	1607 fcn_table.clear ();
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691) John W. Eaton <jwe@octave.org> parents: 16527 diff changeset	1608 class_precedence_table.clear ();
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691) John W. Eaton <jwe@octave.org> parents: 16527 diff changeset	1609 parent_map.clear ();
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691) John W. Eaton <jwe@octave.org> parents: 16527 diff changeset	1610 all_instances.clear ();
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1611 }
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9959 diff changeset	1612
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1613 void
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1614 symbol_table::do_update_nest (void)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1615 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1616 if (nest_parent \|\| nest_children.size ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1617 curr_fcn->mark_as_nested_function ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1618
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1619 if (nest_parent)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1620 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1621 // fix bad symbol_records
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1622 for (auto& nm_sr : table)
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1623 {
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1624 symbol_record &ours = nm_sr.second;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1625 symbol_record parents;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1626 if (! ours.is_formal ()
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1627 && nest_parent->look_nonlocal (nm_sr.first, parents))
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1628 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1629 if (ours.is_global () \|\| ours.is_persistent ())
20428 7ac907da9fba Use error() rather than ::error() unless explicitly required. Rik <rik@octave.org> parents: 20207 diff changeset	1630 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	1631
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1632 if (! ours.is_formal ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1633 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1634 ours.invalidate ();
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1635 nm_sr.second = parents;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1636 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1637 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1638 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1639 ours.set_curr_fcn (curr_fcn);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1640 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1641 }
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	1642 else if (nest_children.size ())
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1643 {
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1644 static_workspace = true;
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1645 for (auto& nm_sr : table)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1646 nm_sr.second.set_curr_fcn (curr_fcn);
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1647 }
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1648
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1649 for (auto& symtab_p : nest_children)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1650 symtab_p->do_update_nest ();
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1651 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14429 diff changeset	1652
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1653 DEFUN (ignore_function_time_stamp, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1654 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1655 @deftypefn {} {@var{val} =} ignore_function_time_stamp ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1656 @deftypefnx {} {@var{old_val} =} ignore_function_time_stamp (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1657 Query or set the internal variable that controls whether Octave checks
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1658 the time stamp on files each time it looks up functions defined in
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1659 function files.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1660
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1661 If the internal variable is set to @qcode{"system"}, Octave will not
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1662 automatically recompile function files in subdirectories of
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1663 @file{@var{octave-home}/lib/@var{version}} if they have changed since they were last compiled, but will recompile other function files in the search path if they change.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1664
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1665 If set to @qcode{"all"}, Octave will not recompile any function files
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1666 unless their definitions are removed with @code{clear}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1667
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1668 If set to @qcode{"none"}, Octave will always check time stamps on files to
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1669 determine whether functions defined in function files need to recompiled.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1670 @end deftypefn */)
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	1671 {
13081 bc6c58d29757 symtab.cc: Fix compile error accidentally introduced. Rik <octave@nomad.inbox5.com> parents: 13078 diff changeset	1672 int nargin = args.length ();
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 217 diff changeset	1673
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1674 if (nargin > 1)
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1675 print_usage ();
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1676
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20874 diff changeset	1677 octave_value retval;
13081 bc6c58d29757 symtab.cc: Fix compile error accidentally introduced. Rik <octave@nomad.inbox5.com> parents: 13078 diff changeset	1678
13078 1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1679 if (nargout > 0 \|\| nargin == 0)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1680 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1681 switch (Vignore_function_time_stamp)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1682 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1683 case 1:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1684 retval = "system";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1685 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1686
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1687 case 2:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1688 retval = "all";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1689 break;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1690
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1691 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1692 retval = "none";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1693 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1694 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1695 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	1696
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1697 if (nargin == 1)
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 2979 diff changeset	1698 {
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20704 diff changeset	1699 std::string sval = args(0).xstring_value ("ignore_function_time_stamp: first argument must be a string");
20582 ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	1700
ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	1701 if (sval == "all")
ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	1702 Vignore_function_time_stamp = 2;
ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	1703 else if (sval == "system")
ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	1704 Vignore_function_time_stamp = 1;
ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	1705 else if (sval == "none")
ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	1706 Vignore_function_time_stamp = 0;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1707 else
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20704 diff changeset	1708 error ("ignore_function_time_stamp: argument must be one of \"all\", \"system\", or \"none\"");
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1709 }
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4234 diff changeset	1710
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	1711 return retval;
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	1712 }
7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	1713
13078 1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1714 /*
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1715 %!shared old_state
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1716 %! 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	1717 %!test
13141 e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 13081 diff changeset	1718 %! 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	1719 %! assert (state, old_state);
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1720 %! 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	1721 %! 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	1722 %! assert (state, "all");
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1723 %! 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	1724 %! 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	1725
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1726 ## Test input validation
13078 1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1727 %!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	1728 %!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	1729 %!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	1730 */
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc Rik <octave@nomad.inbox5.com> parents: 11586 diff changeset	1731
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1732 DEFUN (__current_scope__, , ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1733 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1734 @deftypefn {} {[@var{scope}, @var{context}]} __current_scope__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1735 Return the current scope and context as integers.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1736 @seealso{__dump_symtab_info__}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1737 @end deftypefn */)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1738 {
20874 d112e04d1271 2015 Code Sprint: symtab.cc: use ovl (). Rik <rik@octave.org> parents: 20853 diff changeset	1739 return ovl (symbol_table::current_scope (), symbol_table::current_context ());
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1740 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1741
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1742 DEFUN (__dump_symtab_info__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1743 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1744 @deftypefn {} {} __dump_symtab_info__ ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1745 @deftypefnx {} {} __dump_symtab_info__ (@var{scope})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1746 @deftypefnx {} {} __dump_symtab_info__ ("scopes")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1747 @deftypefnx {} {} __dump_symtab_info__ ("functions")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1748 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1749 @seealso{__current_scope__}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1750 @end deftypefn */)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1751 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1752 int nargin = args.length ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1753
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1754 if (nargin > 1)
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1755 print_usage ();
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1756
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20874 diff changeset	1757 octave_value retval;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1758
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1759 if (nargin == 0)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1760 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1761 symbol_table::dump_functions (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1762
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1763 symbol_table::dump_global (octave_stdout);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1764
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1765 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	1766
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1767 for (const auto& scope_id : lst)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1768 symbol_table::dump (octave_stdout, scope_id);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1769 }
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1770 else
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1771 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1772 octave_value arg = args(0);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1773
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1774 if (arg.is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1775 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1776 std::string s_arg = arg.string_value ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1777
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1778 if (s_arg == "scopes")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1779 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1780 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	1781
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1782 RowVector v (lst.size ());
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1783
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1784 octave_idx_type k = 0;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1785
22862 e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1786 for (const auto& scope_id : lst)
e365e87371a3 maint: Use C++ range feature to simplify some for loops in libinterp/corefcn. Rik <rik@octave.org> parents: 22755 diff changeset	1787 v.xelem (k++) = scope_id;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1788
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1789 retval = v;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1790 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1791 else if (s_arg == "functions")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1792 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1793 symbol_table::dump_functions (octave_stdout);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1794 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1795 else
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20704 diff changeset	1796 error ("__dump_symtab_info__: string argument must be \"functions\" or \"scopes\"");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1797 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1798 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1799 {
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20704 diff changeset	1800 int s = arg.xint_value ("__dump_symtab_info__: first argument must be string or scope id");
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1801
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1802 symbol_table::dump (octave_stdout, s);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10306 diff changeset	1803 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1804 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1805
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1806 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1807 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1808
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	1809 DEFUN (__get_cmdline_fcn_txt__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1810 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1811 @deftypefn {} {} __get_cmdline_fcn_txt__ (@var{name})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1812 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1813 @end deftypefn */)
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	1814 {
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1815 if (args.length () != 1)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1816 print_usage ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1817
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1818 std::string name = args(0).xstring_value ("__get_cmd_line_function_text__: first argument must be function name");
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	1819
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1820 octave_value ov = symbol_table::find_cmdline_function (name);
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1821
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1822 octave_user_function *f = ov.user_function_value ();
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	1823
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20874 diff changeset	1824 octave_value_list retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20874 diff changeset	1825
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1826 if (f)
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1827 {
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1828 std::ostringstream buf;
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	1829
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	1830 octave::tree_print_code tpc (buf);
20582 ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	1831
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1832 f->accept (tpc);
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	1833
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20874 diff changeset	1834 retval = ovl (buf.str ());
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	1835 }
abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	1836
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1837 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1838 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	1839
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1840 // FIXME: should we have functions like this in Octave?
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1841 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1842 // DEFUN (set_variable, args, , "set_variable (NAME, VALUE)")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1843 // {
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1844 // if (args.length () != 2)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1845 // print_usage ();
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1846 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1847 // std::string name = args(0).xstring_value ("set_variable: variable NAME must be a string");
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1848 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1849 // symbol_table::assign (name, args(1));
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1850 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1851 // return ovl ();
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1852 // }
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1853 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1854 // DEFUN (variable_value, args, , "VALUE = variable_value (NAME)")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1855 // {
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1856 // if (args.length () != 1)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1857 // print_usage ();
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1858 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1859 // octave_value retval;
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1860 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1861 // std::string name = args(0).xstring_value ("variable_value: variable NAME must be a string");
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1862 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1863 // retval = symbol_table::varval (name);
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1864 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1865 // if (retval.is_undefined ())
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1866 // error ("variable_value: '%s' is not a variable in the current scope",
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1867 // name.c_str ());
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	1868 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1869 // return retval;
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1870 // }
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1871
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1872 /*
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1873 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	1874
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1875 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	1876 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	1877 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	1878
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22407 diff changeset	1879 %!assert <34497> (! strcmp (which ("bar"), ""))
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1880
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1881 %!function x = bar ()
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1882 %! x = 5;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1883 %!endfunction
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1884 %!test
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1885 %! assert (bar == 5);
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1886 %! 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	1887 %! clear -f bar;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1888 %! 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	1889
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1890 %!function x = bar ()
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1891 %! x = 5;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1892 %!endfunction
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1893 %!test
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1894 %! assert (bar == 5);
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1895 %! 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	1896 %! clear bar;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	1897 %! assert (! strcmp (which ("bar"), ""));
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	1898 */

Mercurial > octave

annotate libinterp/corefcn/symtab.cc @ 23137:334119c390b3