Mercurial > octave

annotate libinterp/corefcn/symtab.cc @ 22489:93ea313301f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: Add bug ids (<#####>) to BIST tests. * bsxfun.cc, cellfun.cc, conv2.cc, data.cc, ellipj.cc, error.cc, file-io.cc, graphics.cc, hash.cc, mappers.cc, max.cc, rand.cc, regexp.cc, symtab.cc, chol.cc, gzip.cc, symbfact.cc, ov-cx-diag.cc, ov-fcn-handle.cc, ov-java.cc, Sparse.cc, accumarray.m, bitset.m, fieldnames.m, inputParser.m, interp2.m, interpft.m, num2str.m, postpad.m, prepad.m, rat.m, rectint.m, image.m, imread.m, imwrite.m, importdata.m, strread.m, textread.m, orderfields.m, qp.m, axis.m, legend.m, hist.m, residue.m, setdiff.m, fftshift.m, ifftshift.m, nthroot.m, magic.m, median.m, quantile.m, base2dec.m, strsplit.m, datestr.m, datevec.m: test: Add bug ids (<#####>) to BIST tests.
author Rik <rik@octave.org>
date Wed, 14 Sep 2016 16:05:16 -0700
parents 34ce5be04942
children e7a9dfb8bf16 e9a0469dedd9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7001
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7001
diff changeset
11 option) any later version.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
12
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
16 for more details.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
17
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7001
diff changeset
19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 7001
diff changeset
20 <http://www.gnu.org/licenses/>.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
21
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
22 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
23
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
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13916
diff changeset
36 #include "debug.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"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
46 #include "pt-arg-list.h"
20207
abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462).
John W. Eaton <jwe@octave.org>
parents: 20172
diff changeset
47 #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
48 #include "symtab.h"
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
49 #include "unwind-prot.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
50 #include "utils.h"
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
51
21573
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 20172
diff changeset
52 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
53
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
54 symbol_table *symbol_table::instance = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
55
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
56 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
57
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
58 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
59
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7745
diff changeset
60 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
61
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
62 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
63
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
64 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
65 symbol_table::class_precedence_table;
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
66
9581
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9509
diff changeset
67 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
68
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
69 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
70 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
71
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
72 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
73
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7745
diff changeset
74 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
75
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
76 // 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
77 // since they were last compiled?
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
78 static int Vignore_function_time_stamp = 1;
3355
c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe]
jwe
parents: 3325
diff changeset
79
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
80 void
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13916
diff changeset
81 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
82 {
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13916
diff changeset
83 instance = new scope_id_cache ();
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13916
diff changeset
84
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13916
diff changeset
85 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
86 }
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13916
diff changeset
87
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
88 symbol_table::context_id
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
89 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
90 {
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
91 octave_user_function *fcn = curr_fcn;
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
92
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
93 // 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
94 // 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
95 // 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
96 // 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
97
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
98 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
99 ? fcn->active_context () : xcurrent_context;
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
100 }
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
101
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 13916
diff changeset
102 void
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
103 symbol_table::symbol_record::symbol_record_rep::dump
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
104 (std::ostream& os, const std::string& prefix) const
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
105 {
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
106 octave_value val = varval ();
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
107
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
108 os << prefix << name;
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
109
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
110 if (val.is_defined ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
111 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
112 os << " ["
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
113 << (is_local () ? "l" : "")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
114 << (is_automatic () ? "a" : "")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
115 << (is_formal () ? "f" : "")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
116 << (is_hidden () ? "h" : "")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
117 << (is_inherited () ? "i" : "")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
118 << (is_global () ? "g" : "")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
119 << (is_persistent () ? "p" : "")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
120 << "] ";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
121 val.dump (os);
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
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
124 os << "\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
125 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
126
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
127 octave_value
9445
c5f03874ea2a simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents: 9444
diff changeset
128 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
129 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
130 octave_value retval;
3355
c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe]
jwe
parents: 3325
diff changeset
131
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
132 if (is_global ())
16442
302157614308 deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents: 16071
diff changeset
133 retval = symbol_table::global_varval (name ());
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
134 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
135 {
9413
5cd879a0d8c4 speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents: 9151
diff changeset
136 retval = varval ();
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
137
9413
5cd879a0d8c4 speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents: 9151
diff changeset
138 if (retval.is_undefined ())
5cd879a0d8c4 speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents: 9151
diff changeset
139 {
5cd879a0d8c4 speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents: 9151
diff changeset
140 // 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
141 if (rep->finfo)
9445
c5f03874ea2a simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents: 9444
diff changeset
142 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
143 else
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
144 {
9445
c5f03874ea2a simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents: 9444
diff changeset
145 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
146
5cd879a0d8c4 speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents: 9151
diff changeset
147 if (retval.is_defined ())
5cd879a0d8c4 speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents: 9151
diff changeset
148 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
149 }
5cd879a0d8c4 speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents: 9151
diff changeset
150 }
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
151 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
152
9413
5cd879a0d8c4 speed-up function call by caching its name lookup
Jaroslav Hajek <highegg@gmail.com>
parents: 9151
diff changeset
153 return retval;
3355
c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe]
jwe
parents: 3325
diff changeset
154 }
c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe]
jwe
parents: 3325
diff changeset
155
21573
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372)
John W. Eaton <jwe@octave.org>
parents: 20172
diff changeset
156 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
157
18304
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
158 static void
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
159 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
160 std::string& pname)
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
161 {
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
162 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
163
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
164 fname.clear ();
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
165 pname.clear ();
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
166
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
167 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
168 {
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
169 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
170 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
171 }
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
172 else
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
173 fname = name;
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
174 }
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
175
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
176 // 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
177 // 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
178 // 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
179 // 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
180 // function was loaded/parsed. However, this check should only
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
181 // 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
182 // 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
183 // since the last time the function was loaded/parsed).
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
184 //
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
185 // 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
186 // 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
187 // 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
188
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
189 static inline bool
7745
0ff0fc033f28 better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents: 7437
diff changeset
190 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
191 octave_value& function,
21017
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents: 20946
diff changeset
192 const std::string& dispatch_type = "",
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents: 20946
diff changeset
193 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
194 {
0ff0fc033f28 better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents: 7437
diff changeset
195 bool retval = false;
0ff0fc033f28 better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents: 7437
diff changeset
196
18304
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
diff changeset
197 octave_function *fcn = load_fcn_from_file (ff, dir_name, dispatch_type,
b0e8cc676396 Fix out-of-date status check for package functions.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 18300
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 ())
633f9d837982 include autoloads in out-of-date checks
Jaroslav Hajek <highegg@gmail.com>
parents: 9639
diff changeset
301 file = lookup_autoload (nm);
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 {
8781
f57c9fdb6836 stash directory name when loading private function
John W. Eaton <jwe@octave.org>
parents: 8691
diff changeset
394 octave_function *fcn = load_fcn_from_file (file_name, dir_name);
4009
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
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 {
16676
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
433 octave_function *fcn = load_fcn_from_file (file_name, dir_name, name,
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
434 package_name);
4009
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
435
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
436 if (fcn)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
437 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
438 retval = octave_value (fcn);
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
439
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
440 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
441 class_methods[name] = retval;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
442 }
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
443 }
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
444 else
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
445 {
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
446 // 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
447 // 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
448 // 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
449 // 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
450
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
451 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
452
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
453 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
454
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
455 if (maybe_cdef_ctor.is_defined ())
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
456 {
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
457 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
458
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
459 if (fcn && fcn->is_classdef_constructor ())
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
460 {
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
461 retval = maybe_cdef_ctor;
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
462
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
463 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
464 class_methods[name] = retval;
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
465
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
466 function_on_path = old_function_on_path;
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
467 }
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 }
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
470
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
471 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
472 }
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 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
475 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
476 (const std::string& dispatch_type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
477 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
478 octave_value retval;
4009
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
479
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
480 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
481 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
482 else
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
483 {
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
484 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
485 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
486
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
487 if (cm)
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
488 retval = octave_value (cm);
4009
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
489
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
490 if (! retval.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
491 {
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
492 std::string dir_name;
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
493
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
494 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
495 dir_name);
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
496
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
497 if (! file_name.empty ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
498 {
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
499 octave_function *fcn = load_fcn_from_file (file_name, dir_name,
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
500 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
501
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
502 if (fcn)
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
503 {
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
504 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
505
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
506 class_methods[dispatch_type] = retval;
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
507 }
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
508 }
9581
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9509
diff changeset
509
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
510 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
511 {
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
512 // 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
513
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
514 const std::list<std::string>& plist =
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
515 parent_classes (dispatch_type);
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
516
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
517 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
518
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
519 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
520 {
16048
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
521 retval = find_method (*it);
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
522
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
523 if (retval.is_defined ())
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 class_methods[dispatch_type] = retval;
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
526 break;
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
527 }
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
528
10142aad4b9f Implement indirect method call: fun(obj, ...).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15467
diff changeset
529 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
530 }
9581
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9509
diff changeset
531 }
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9509
diff changeset
532 }
4009
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
533 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
534
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
535 return retval;
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
536 }
27e461aed956 [project @ 2002-07-31 09:33:03 by jwe]
jwe
parents: 3944
diff changeset
537
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
538 void
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
539 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
540 (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
541 {
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
542 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
543
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
544 if (p != subfunctions.end ())
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
545 {
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
546 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
547
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
548 if (fcn)
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
549 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
550 }
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
551 }
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
552
40f311a69417 fix OO field access in subfunctions of private functions
John W. Eaton <jwe@octave.org>
parents: 11321
diff changeset
553 void
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
554 symbol_table::fcn_info::fcn_info_rep::print_dispatch (std::ostream& os) const
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
555 {
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
556 if (dispatch_map.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
557 os << "dispatch: " << name << " is not overloaded" << std::endl;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
558 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
559 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
560 os << "Overloaded function " << name << ":\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
561
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
562 for (dispatch_map_const_iterator p = dispatch_map.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
563 p != dispatch_map.end (); p++)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
564 os << " " << name << " (" << p->first << ", ...) -> "
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
565 << p->second << " (" << p->first << ", ...)\n";
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
566
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
567 os << std::endl;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
568 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
569 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
570
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
571 std::string
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
572 symbol_table::fcn_info::fcn_info_rep::help_for_dispatch (void) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
573 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
574 std::string retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
575
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
576 if (! dispatch_map.empty ())
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
577 {
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
578 retval = "Overloaded function:\n\n";
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
579
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
580 for (dispatch_map_const_iterator p = dispatch_map.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
581 p != dispatch_map.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
582 retval += " " + p->second + " (" + p->first + ", ...)\n\n";
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
583 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
584
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
585 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
586 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
587
10087
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
588 // :-) 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
589 // 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
590 // 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
591
10306
7b5e8527441e partially revert 2ceae0b40515, implement a better fallback
Jaroslav Hajek <highegg@gmail.com>
parents: 10304
diff changeset
592 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
593 {
10306
7b5e8527441e partially revert 2ceae0b40515, implement a better fallback
Jaroslav Hajek <highegg@gmail.com>
parents: 10304
diff changeset
594 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
595 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
596 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
597 {
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
598 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
599 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
600 // FIXME: Is this really right?
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
601 bool use_j =
10087
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
602 (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
603 || (btyp_isarray (ityp)
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
604 && (! btyp_isarray (jtyp)
10087
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
605 || (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
606 || ((ityp == btyp_double || ityp == btyp_complex
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
607 || ityp == btyp_char)
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
608 && (jtyp == btyp_float
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
609 || jtyp == btyp_float_complex)))));
10087
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
610
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
611 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
612 }
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
613
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
614 return sup_table;
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
615 }
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
616
9450
cf714e75c656 implement overloaded function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 9445
diff changeset
617 std::string
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
618 get_dispatch_type (const octave_value_list& args,
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
619 builtin_type_t& builtin_type)
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
620 {
10306
7b5e8527441e partially revert 2ceae0b40515, implement a better fallback
Jaroslav Hajek <highegg@gmail.com>
parents: 10304
diff changeset
621 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
622 std::string dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
623
9445
c5f03874ea2a simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents: 9444
diff changeset
624 int n = args.length ();
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
625
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
626 if (n > 0)
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
627 {
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
628 int i = 0;
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
629 builtin_type = args(0).builtin_type ();
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
630 if (builtin_type != btyp_unknown)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
631 {
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
632 for (i = 1; i < n; i++)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
633 {
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
634 builtin_type_t bti = args(i).builtin_type ();
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
635 if (bti != btyp_unknown)
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
636 builtin_type = sup_table[builtin_type][bti];
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
637 else
10087
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
638 {
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
639 builtin_type = btyp_unknown;
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
640 break;
10087
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
641 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
642 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
643 }
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
644
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
645 if (builtin_type == btyp_unknown)
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
646 {
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
647 // There's a non-builtin class in the argument list.
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
648 dispatch_type = args(i).class_name ();
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
649
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
650 for (int j = i+1; j < n; j++)
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
651 {
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
652 octave_value arg = args(j);
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 if (arg.builtin_type () == btyp_unknown)
10306
7b5e8527441e partially revert 2ceae0b40515, implement a better fallback
Jaroslav Hajek <highegg@gmail.com>
parents: 10304
diff changeset
655 {
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
656 std::string cname = arg.class_name ();
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
657
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
658 // 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
659 // to the current DISPATCH_TYPE.
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
660 if (! symbol_table::is_superiorto (dispatch_type, cname)
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
661 && symbol_table::is_superiorto (cname, dispatch_type))
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
662 dispatch_type = cname;
10306
7b5e8527441e partially revert 2ceae0b40515, implement a better fallback
Jaroslav Hajek <highegg@gmail.com>
parents: 10304
diff changeset
663 }
7b5e8527441e partially revert 2ceae0b40515, implement a better fallback
Jaroslav Hajek <highegg@gmail.com>
parents: 10304
diff changeset
664 }
10087
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
665 }
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
666 else
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
667 dispatch_type = btyp_class_name[builtin_type];
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
668 }
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
669 else
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
670 builtin_type = btyp_unknown;
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
671
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
672 return dispatch_type;
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
673 }
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
674
10087
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
675 std::string
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
676 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
677 {
10321
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
678 builtin_type_t builtin_type;
97b4bd6f0925 partially rewrite function handles
Jaroslav Hajek <highegg@gmail.com>
parents: 10315
diff changeset
679 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
680 }
090173f2db40 improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents: 9992
diff changeset
681
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
682 // 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
683 // list:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
684 //
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
685 // variable
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
686 // subfunction
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
687 // private function
13147
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
688 // class method
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
689 // class constructor
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
690 // legacy dispatch
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
691 // command-line function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
692 // autoload function
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
693 // function on the path
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
694 // built-in function
13147
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
695 //
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
696 // Matlab documentation states that constructors have higher precedence
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
697 // 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
698
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
699 octave_value
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
700 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
701 bool local_funcs)
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
702 {
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
703 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
704
20678
4b00afb5e9c3 eliminate more uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20582
diff changeset
705 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
706 {
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents: 8580
diff changeset
707 // 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
708 // 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
709 // 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
710
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents: 8580
diff changeset
711 load_path::update ();
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
712
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
713 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
714 }
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents: 8580
diff changeset
715
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents: 8580
diff changeset
716 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
717 }
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents: 8580
diff changeset
718
7838271ee25c symtab.cc (symbol_table::fcn_info::fcn_info_rep::find): avoid recursive call
John W. Eaton <jwe@octave.org>
parents: 8580
diff changeset
719 octave_value
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
720 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
721 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
722 {
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
723 if (local_funcs)
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
724 {
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
725 // 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
726 // 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
727 // from a .m file.
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
728
21339
6228796397bc * symtab.cc: Avoid shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 21317
diff changeset
729 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
730
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
731 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
732 {
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
733 scope_val_iterator r = subfunctions.find (scope);
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
734 if (r != subfunctions.end ())
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
735 {
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
736 // 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
737
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
738 return r->second;
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
739 }
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
740
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
741 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
742 if (scope_curr_fcn)
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
743 scope = scope_curr_fcn->parent_fcn_scope ();
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
744 else
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
745 scope = -1;
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
746 }
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
747
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
748 // Private function.
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
749
21339
6228796397bc * symtab.cc: Avoid shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 21317
diff changeset
750 if (current_fcn)
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
751 {
21339
6228796397bc * symtab.cc: Avoid shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 21317
diff changeset
752 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
753
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
754 if (! dir_name.empty ())
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
755 {
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
756 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
757
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
758 if (q == private_functions.end ())
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);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
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 else
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 octave_value& fval = q->second;
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
768
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
769 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
770 out_of_date_check (fval, "", false);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
771
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
772 if (fval.is_defined ())
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
773 return fval;
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
774 else
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
775 {
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
776 octave_value val = load_private_function (dir_name);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
777
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
778 if (val.is_defined ())
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
779 return val;
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
780 }
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
781 }
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
782 }
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
783 }
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
784 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
785
13147
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
786 // Class methods.
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
787
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
788 if (! args.empty ())
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
789 {
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
790 std::string dispatch_type = get_dispatch_type (args);
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
791
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
792 octave_value fcn = find_method (dispatch_type);
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
793
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
794 if (fcn.is_defined ())
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
795 return fcn;
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
796 }
6c952376482d look for methods before constructors
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
797
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
798 // 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
799
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
800 str_val_iterator q = class_constructors.find (name);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
801
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
802 if (q == class_constructors.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
803 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
804 octave_value val = load_class_constructor ();
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
805
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
806 if (val.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
807 return val;
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
808 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
809 else
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
810 {
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
811 octave_value& fval = q->second;
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
812
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
813 if (fval.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
814 out_of_date_check (fval, name);
867
b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe]
jwe
parents: 773
diff changeset
815
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
816 if (fval.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
817 return fval;
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
818 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
819 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
820 octave_value val = load_class_constructor ();
867
b6b78f85743a [project @ 1994-11-02 14:20:02 by jwe]
jwe
parents: 773
diff changeset
821
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
822 if (val.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
823 return val;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
824 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
825 }
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1742
diff changeset
826
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
827 // Legacy dispatch.
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
828
9445
c5f03874ea2a simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents: 9444
diff changeset
829 if (! args.empty () && ! dispatch_map.empty ())
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
830 {
9445
c5f03874ea2a simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents: 9444
diff changeset
831 std::string dispatch_type = args(0).type_name ();
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
832
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
833 std::string fname;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
834
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
835 dispatch_map_iterator p = dispatch_map.find (dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
836
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
837 if (p == dispatch_map.end ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
838 p = dispatch_map.find ("any");
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
839
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
840 if (p != dispatch_map.end ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
841 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
842 fname = p->second;
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
843
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
844 octave_value fcn
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
845 = symbol_table::find_function (fname, args);
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
846
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
847 if (fcn.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
848 return fcn;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
849 }
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
850 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
851
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
852 // Command-line function.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
853
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
854 if (cmdline_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
855 return cmdline_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
856
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
857 // Autoload?
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
858
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
859 octave_value fcn = find_autoload ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
860
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
861 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
862 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
863
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
864 // Function on the path.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
865
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
866 fcn = find_user_function ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
867
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
868 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
869 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
870
16676
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
871 // Package
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
872
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
873 fcn = find_package ();
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
874
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
875 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
876 return fcn;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
877
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
878 // Built-in function (might be undefined).
3145
0d640dc625c7 [project @ 1998-02-05 08:44:59 by jwe]
jwe
parents: 3125
diff changeset
879
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
880 return built_in_function;
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
881 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
882
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
883 // 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
884 // list:
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 // built-in function
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
887 // function on the path
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
888 // autoload function
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
889 // command-line function
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
890 // private function
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
891 // subfunction
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 // 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
894 // searches for "built-in" functions. In Matlab, "builtin" only
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
895 // 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
896 // 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
897 // 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
898 // something that matches. Note that we are only searching by name,
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
899 // so class methods, constructors, and legacy dispatch functions are
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
900 // skipped.
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 octave_value
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
903 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
904 {
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
905 octave_value retval = x_builtin_find ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
906
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
907 if (! retval.is_defined ())
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
908 {
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
909 // 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
910 // 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
911 // searching again.
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 load_path::update ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
914
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
915 retval = x_builtin_find ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
916 }
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
917
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
918 return retval;
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
919 }
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
920
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
921 octave_value
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
922 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
923 {
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
924 // Built-in function.
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
925 if (built_in_function.is_defined ())
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
926 return built_in_function;
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
927
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
928 // Function on the path.
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
929
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
930 octave_value fcn = find_user_function ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
931
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
932 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
933 return fcn;
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
934
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
935 // Autoload?
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
936
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
937 fcn = find_autoload ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
938
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
939 if (fcn.is_defined ())
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
940 return fcn;
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
941
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
942 // Command-line function.
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 if (cmdline_function.is_defined ())
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
945 return cmdline_function;
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
946
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
947 // Private function.
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
948
21339
6228796397bc * symtab.cc: Avoid shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 21317
diff changeset
949 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
950
21339
6228796397bc * symtab.cc: Avoid shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 21317
diff changeset
951 if (current_fcn)
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
952 {
21339
6228796397bc * symtab.cc: Avoid shadowed variable warnings.
John W. Eaton <jwe@octave.org>
parents: 21317
diff changeset
953 std::string dir_name = current_fcn->dir_name ();
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
954
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
955 if (! dir_name.empty ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
956 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
957 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
958
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
959 if (q == private_functions.end ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
960 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
961 octave_value val = load_private_function (dir_name);
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
962
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
963 if (val.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
964 return val;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
965 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
966 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
967 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
968 octave_value& fval = q->second;
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
969
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
970 if (fval.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
971 out_of_date_check (fval);
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
972
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
973 if (fval.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
974 return fval;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
975 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
976 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
977 octave_value val = load_private_function (dir_name);
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
978
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
979 if (val.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
980 return val;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
981 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
982 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
983 }
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
984 }
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
985
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
986 // 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
987 // subfunctions if we are currently executing a function defined
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
988 // from a .m file.
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
989
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
990 for (scope_id scope = xcurrent_scope; scope >= 0;)
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
991 {
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
992 scope_val_iterator r = subfunctions.find (scope);
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
993 if (r != subfunctions.end ())
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
994 {
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
995 // FIXME: out-of-date check here.
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
996
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
997 return r->second;
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
998 }
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
999
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1000 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
1001 if (scope_curr_fcn)
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1002 scope = scope_curr_fcn->parent_fcn_scope ();
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1003 else
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1004 scope = -1;
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1005 }
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1006
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1007 return octave_value ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1008 }
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1009
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1010 octave_value
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1011 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
1012 (const std::string& dispatch_type)
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1013 {
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1014 octave_value retval;
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1015
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1016 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
1017
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1018 if (q == class_methods.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1019 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1020 octave_value val = load_class_method (dispatch_type);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1021
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1022 if (val.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1023 return val;
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1024 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1025 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1026 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1027 octave_value& fval = q->second;
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1028
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1029 if (fval.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1030 out_of_date_check (fval, dispatch_type);
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1031
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1032 if (fval.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1033 return fval;
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1034 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1035 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1036 octave_value val = load_class_method (dispatch_type);
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1037
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1038 if (val.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1039 return val;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1040 }
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1041 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1042
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1043 return retval;
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1044 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1045
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1046 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1047 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
1048 {
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1049 // Autoloaded function.
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1050
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1051 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
1052 out_of_date_check (autoload_function);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1053
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1054 if (! autoload_function.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1055 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1056 std::string file_name = lookup_autoload (name);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1057
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1058 if (! file_name.empty ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1059 {
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
1060 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
1061
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1062 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
1063
16676
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1064 octave_function *fcn = load_fcn_from_file (file_name, dir_name, "",
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1065 "", name, true);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1066
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1067 if (fcn)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1068 autoload_function = octave_value (fcn);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1069 }
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1070 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1071
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1072 return autoload_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1073 }
4914
1c0442da75fd [project @ 2004-07-23 16:55:13 by jwe]
jwe
parents: 4913
diff changeset
1074
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1075 octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1076 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
1077 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1078 // Function on the path.
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1079
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1080 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
1081 out_of_date_check (function_on_path);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1082
20678
4b00afb5e9c3 eliminate more uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20582
diff changeset
1083 if (function_on_path.is_undefined ())
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1084 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1085 std::string dir_name;
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1086
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
1087 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
1088 package_name);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1089
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1090 if (! file_name.empty ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1091 {
16676
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1092 octave_function *fcn = load_fcn_from_file (file_name, dir_name, "",
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
1093 package_name);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1094
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1095 if (fcn)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1096 function_on_path = octave_value (fcn);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1097 }
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1098 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1099
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1100 return function_on_path;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1101 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1102
16676
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1103 octave_value
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
1104 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
1105 {
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1106 // 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
1107 //if (package.is_defined ())
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1108 // out_of_date_check (package);
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1109
20678
4b00afb5e9c3 eliminate more uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20582
diff changeset
1110 if (package.is_undefined ())
16676
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1111 {
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
1112 octave_function * fcn =
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
1113 cdef_manager::find_package_symbol (full_name ());
16676
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1114
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1115 if (fcn)
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1116 package = octave_value (fcn);
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1117 }
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1118
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1119 return package;
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1120 }
7368654f302f Initial support for (classdef) packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16644
diff changeset
1121
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1122 // 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
1123 // 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
1124 // marked as superior to SUP_CLASS.
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 bool
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1127 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
1128 const std::string& inf_class)
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1129 {
16070
e603ce23f20c Fix and improve functions related to class precedence (bug #38290)
Julien Bect <julien.bect@supelec.fr>
parents: 15467
diff changeset
1130 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
1131 return false;
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1132
16071
94e95309710c Whitespace cleanup
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 16070
diff changeset
1133 // 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
1134 // 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
1135 // singleton set {inf_class} of inferior classes.
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1136 class_precedence_table[sup_class].insert (inf_class);
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1137
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1138 return true;
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1139 }
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1140
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1141 // 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
1142 // 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
1143 // 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
1144 // 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
1145 // is no relationship between two classes:
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1146 //
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1147 // if (symbol_table::is_superiorto (a, b))
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1148 // // 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
1149 // else if (symbol_table::is_superiorto (b, a))
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1150 // // 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
1151 // else
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1152 // // No relation.
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1153
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1154 bool
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1155 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
1156 {
16071
94e95309710c Whitespace cleanup
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 16070
diff changeset
1157 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
1158 // 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
1159 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
1160 return false;
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1161
16070
e603ce23f20c Fix and improve functions related to class precedence (bug #38290)
Julien Bect <julien.bect@supelec.fr>
parents: 15467
diff changeset
1162 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
1163 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
1164 return (q != inferior_classes.end ());
7972
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1165 }
5bf4e2c13ed8 make superiorto and inferiorto work
John W. Eaton <jwe@octave.org>
parents: 7968
diff changeset
1166
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1167 static std::string
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1168 fcn_file_name (const octave_value& fcn)
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1169 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1170 const octave_function *f = fcn.function_value ();
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1171
21017
93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents: 20946
diff changeset
1172 return f ? f->fcn_file_name () : "";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1173 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1174
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1175 void
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1176 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
1177 const std::string& prefix) const
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1178 {
16684
edbb123cbe3a Correct handling of package context in symbol table.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 16682
diff changeset
1179 os << prefix << full_name ()
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1180 << " ["
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1181 << (cmdline_function.is_defined () ? "c" : "")
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1182 << (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
1183 << (package.is_defined () ? "p" : "")
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1184 << "]\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1185
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1186 std::string tprefix = prefix + " ";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1187
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1188 if (autoload_function.is_defined ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1189 os << tprefix << "autoload: "
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1190 << fcn_file_name (autoload_function) << "\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1191
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1192 if (function_on_path.is_defined ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1193 os << tprefix << "function from path: "
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1194 << fcn_file_name (function_on_path) << "\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1195
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1196 if (! subfunctions.empty ())
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 for (scope_val_const_iterator p = subfunctions.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1199 p != subfunctions.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1200 os << tprefix << "subfunction: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1201 << " [" << p->first << "]\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1202 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1203
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1204 if (! private_functions.empty ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1205 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1206 for (str_val_const_iterator p = private_functions.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1207 p != private_functions.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1208 os << tprefix << "private: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1209 << " [" << p->first << "]\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1210 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1211
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1212 if (! class_constructors.empty ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1213 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1214 for (str_val_const_iterator p = class_constructors.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1215 p != class_constructors.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1216 os << tprefix << "constructor: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1217 << " [" << p->first << "]\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1218 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1219
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1220 if (! class_methods.empty ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1221 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1222 for (str_val_const_iterator p = class_methods.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1223 p != class_methods.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1224 os << tprefix << "method: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1225 << " [" << p->first << "]\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1226 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1227
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1228 if (! dispatch_map.empty ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1229 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1230 for (dispatch_map_const_iterator p = dispatch_map.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1231 p != dispatch_map.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1232 os << tprefix << "dispatch: " << fcn_file_name (p->second)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1233 << " [" << p->first << "]\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1234 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1235 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1236
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1237 void
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1238 symbol_table::install_nestfunction (const std::string& name,
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1239 const octave_value& fcn,
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1240 scope_id parent_scope)
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1241 {
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1242 install_subfunction (name, fcn, parent_scope);
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1243
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1244 // 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
1245 octave_function *fv = fcn.function_value ();
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1246
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
1247 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
1248
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1249 symbol_table *parent_table = get_instance (parent_scope);
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1250
14604
de72463862c4 Silence warnings
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 14544
diff changeset
1251 parent_table->add_nest_child (*fcn_table_loc);
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1252 }
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1253
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1254 octave_value
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1255 symbol_table::find (const std::string& name,
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1256 const octave_value_list& args,
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
1257 bool skip_variables,
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
1258 bool local_funcs)
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1259 {
7752
40c428ea3408 initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents: 7745
diff changeset
1260 symbol_table *inst = get_instance (xcurrent_scope);
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1261
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1262 return inst
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1263 ? 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
1264 : octave_value ();
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1265 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1266
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1267 octave_value
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1268 symbol_table::builtin_find (const std::string& name)
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1269 {
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1270 symbol_table *inst = get_instance (xcurrent_scope);
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1271
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1272 return inst ? inst->do_builtin_find (name) : octave_value ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1273 }
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1274
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1275 octave_value
9445
c5f03874ea2a simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents: 9444
diff changeset
1276 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
1277 const octave_value_list& args,
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
1278 bool local_funcs)
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1279 {
7818
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents: 7767
diff changeset
1280 octave_value retval;
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents: 7767
diff changeset
1281
8161
64f1cd525656 symtab.cc: style fixes
John W. Eaton <jwe@octave.org>
parents: 8160
diff changeset
1282 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
1283 {
8161
64f1cd525656 symtab.cc: style fixes
John W. Eaton <jwe@octave.org>
parents: 8160
diff changeset
1284 // Look for a class specific function.
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1285 std::string dispatch_type =
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
1286 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
1287
19871
ed5ee3f610db Correct tests using std::string::find_XXX which did not use std::string::npos.
Rik <rik@octave.org>
parents: 19864
diff changeset
1288 std::string method;
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
1289 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
1290 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
1291 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
1292
436438954797 Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents: 8155
diff changeset
1293 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
1294 }
7818
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents: 7767
diff changeset
1295 else
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents: 7767
diff changeset
1296 {
8160
436438954797 Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents: 8155
diff changeset
1297 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
1298
436438954797 Check for class specific methods in symbol_table::find_function
David Bateman <dbateman@free.fr>
parents: 8155
diff changeset
1299 if (pos == std::string::npos)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1300 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
1301 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1302 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1303 std::string fcn_scope = name.substr (0, pos);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1304 scope_id stored_scope = xcurrent_scope;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1305 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
1306 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
1307 octave_value_list (), false);
8161
64f1cd525656 symtab.cc: style fixes
John W. Eaton <jwe@octave.org>
parents: 8160
diff changeset
1308
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1309 if (parent.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1310 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1311 octave_function *parent_fcn = parent.function_value ();
8161
64f1cd525656 symtab.cc: style fixes
John W. Eaton <jwe@octave.org>
parents: 8160
diff changeset
1312
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1313 if (parent_fcn)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1314 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1315 xcurrent_scope = parent_fcn->scope ();
8161
64f1cd525656 symtab.cc: style fixes
John W. Eaton <jwe@octave.org>
parents: 8160
diff changeset
1316
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1317 if (xcurrent_scope > 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1318 retval = find_function (name.substr (pos + 1), args);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1319 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1320 }
8161
64f1cd525656 symtab.cc: style fixes
John W. Eaton <jwe@octave.org>
parents: 8160
diff changeset
1321
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1322 xcurrent_scope = stored_scope;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1323 }
7818
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents: 7767
diff changeset
1324 }
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents: 7767
diff changeset
1325
5640a70cbab1 Add Ffilemarker and fix for 'dbstep in'
David Bateman <dbateman@free.fr>
parents: 7767
diff changeset
1326 return retval;
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1327 }
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1328
21264
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1329 // 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
1330 octave_value
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1331 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
1332 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
1333 {
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1334 octave_value fcn;
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1335
22407
34ce5be04942 maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents: 22323
diff changeset
1336 std::string full_name = "@" + dispatch_type +
34ce5be04942 maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents: 22323
diff changeset
1337 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
1338 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
1339
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1340 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
1341 {
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1342 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
1343 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
1344 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
1345 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
1346 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
1347 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
1348 {
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1349 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
1350
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1351 if (parent_fcn)
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1352 {
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1353 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
1354
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1355 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
1356 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
1357 octave_value_list ());
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1358 }
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1359 }
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1360
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1361 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
1362 }
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1363
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1364 return fcn;
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1365 }
dfce76507f4b Fix dbstop to find subfuncs of old-style class methods (bug #34804).
Lachlan <lachlanbis@gmail.com>
parents: 21200
diff changeset
1366
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1367 void
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1368 symbol_table::dump (std::ostream& os, scope_id scope)
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 if (scope == xglobal_scope)
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1371 dump_global (os);
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1372 else
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1373 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1374 symbol_table *inst = get_instance (scope, false);
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1375
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1376 if (inst)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1377 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1378 os << "*** dumping symbol table scope " << scope
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1379 << " (" << inst->table_name << ")\n\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1380
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1381 std::map<std::string, octave_value> sfuns
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1382 = symbol_table::subfunctions_defined_in_scope (scope);
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1383
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1384 if (! sfuns.empty ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1385 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1386 os << " subfunctions defined in this scope:\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1387
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1388 for (std::map<std::string,
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1389 octave_value>::const_iterator p = sfuns.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1390 p != sfuns.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1391 os << " " << p->first << "\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1392
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1393 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1394 }
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1395
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1396 inst->do_dump (os);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1397 }
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1398 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1399 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1400
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1401 void
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1402 symbol_table::dump_global (std::ostream& os)
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1403 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1404 if (! global_table.empty ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1405 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1406 os << "*** dumping global symbol table\n\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1407
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1408 for (global_table_const_iterator p = global_table.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1409 p != global_table.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1410 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1411 std::string nm = p->first;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1412 octave_value val = p->second;
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1413
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1414 os << " " << nm << " ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1415 val.dump (os);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1416 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1417 }
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1418 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1419 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1420
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1421 void
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1422 symbol_table::dump_functions (std::ostream& os)
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1423 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1424 if (! fcn_table.empty ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1425 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1426 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
1427 << " (c=commandline, b=built-in)\n\n";
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1428
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1429 for (fcn_table_const_iterator p = fcn_table.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1430 p != fcn_table.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1431 p->second.dump (os, " ");
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1432
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1433 os << "\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1434 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1435 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1436
8819
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1437 void
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1438 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
1439 const std::string& dir_name)
8819
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1440 {
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1441 // 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
1442 // 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
1443 // stored with the function. Do we?
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1444
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1445 for (fcn_table_const_iterator p = fcn_table.begin ();
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1446 p != fcn_table.end (); p++)
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1447 {
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1448 std::pair<std::string, octave_value> tmp
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1449 = p->second.subfunction_defined_in_scope (scope);
8819
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1450
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1451 std::string nm = tmp.first;
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1452
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1453 if (! nm.empty ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1454 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1455 octave_value& fcn = tmp.second;
8819
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1456
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1457 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
1458
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1459 if (f)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1460 f->stash_dir_name (dir_name);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1461 }
8819
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1462 }
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1463 }
96d87674b818 also stash directory name for subfunctions
John W. Eaton <jwe@octave.org>
parents: 8785
diff changeset
1464
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1465 octave_value
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1466 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
1467 const octave_value_list& args,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1468 bool skip_variables,
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
1469 bool 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 octave_value retval;
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1472
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1473 // Variable.
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1474
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1475 if (! skip_variables)
3013
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 table_iterator p = table.find (name);
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1478
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1479 if (p != table.end ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1480 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1481 symbol_record sr = p->second;
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1482
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1483 if (sr.is_global ())
16442
302157614308 deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents: 16071
diff changeset
1484 return symbol_table::global_varval (name);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1485 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1486 {
16442
302157614308 deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents: 16071
diff changeset
1487 octave_value val = sr.varval ();
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1488
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1489 if (val.is_defined ())
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1490 return val;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1491 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1492 }
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1493 }
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1494
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1495 fcn_table_iterator p = fcn_table.find (name);
4913
c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe]
jwe
parents: 4911
diff changeset
1496
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1497 if (p != fcn_table.end ())
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
1498 return p->second.find (args, local_funcs);
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1499 else
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1500 {
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1501 fcn_info finfo (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1502
9463
d34baf412786 support non-local function lookups in str2func
Jaroslav Hajek <highegg@gmail.com>
parents: 9450
diff changeset
1503 octave_value fcn = finfo.find (args, local_funcs);
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1504
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1505 if (fcn.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1506 fcn_table[name] = finfo;
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1507
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1508 return fcn;
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1509 }
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1510
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1511 return retval;
605
4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe]
jwe
parents: 584
diff changeset
1512 }
4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe]
jwe
parents: 584
diff changeset
1513
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1514 octave_value
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1515 symbol_table::do_builtin_find (const std::string& name)
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1516 {
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1517 octave_value retval;
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1518
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1519 fcn_table_iterator p = fcn_table.find (name);
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1520
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1521 if (p != fcn_table.end ())
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1522 return p->second.builtin_find ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1523 else
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1524 {
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1525 fcn_info finfo (name);
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1526
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1527 octave_value fcn = finfo.builtin_find ();
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1528
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1529 if (fcn.is_defined ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1530 fcn_table[name] = finfo;
9444
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1531
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1532 return fcn;
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1533 }
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1534
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1535 return retval;
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1536 }
0c785ad961fa improve behavior of builtin
John W. Eaton <jwe@octave.org>
parents: 9443
diff changeset
1537
16468
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1538 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
1539 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
1540 {
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1541 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
1542
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1543 for (table_const_iterator p = table.begin (); p != table.end (); p++)
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1544 {
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1545 std::string nm = p->first;
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1546 symbol_record sr = p->second;
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1547
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1548 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
1549 {
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1550 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
1551
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1552 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
1553 {
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
1554 // 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
1555 //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
1556 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
1557 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
1558 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
1559 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
1560 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
1561
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1562 char storage = ' ';
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1563 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
1564 storage = 'g';
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1565 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
1566 storage = 'p';
16527
8701792e16ec include column in workspace viewer for storage class
John W. Eaton <jwe@octave.org>
parents: 16468
diff changeset
1567 else if (sr.is_automatic ())
8701792e16ec include column in workspace viewer for storage class
John W. Eaton <jwe@octave.org>
parents: 16468
diff changeset
1568 storage = 'a';
8701792e16ec include column in workspace viewer for storage class
John W. Eaton <jwe@octave.org>
parents: 16468
diff changeset
1569 else if (sr.is_formal ())
8701792e16ec include column in workspace viewer for storage class
John W. Eaton <jwe@octave.org>
parents: 16468
diff changeset
1570 storage = 'f';
8701792e16ec include column in workspace viewer for storage class
John W. Eaton <jwe@octave.org>
parents: 16468
diff changeset
1571 else if (sr.is_hidden ())
8701792e16ec include column in workspace viewer for storage class
John W. Eaton <jwe@octave.org>
parents: 16468
diff changeset
1572 storage = 'h';
8701792e16ec include column in workspace viewer for storage class
John W. Eaton <jwe@octave.org>
parents: 16468
diff changeset
1573 else if (sr.is_inherited ())
8701792e16ec include column in workspace viewer for storage class
John W. Eaton <jwe@octave.org>
parents: 16468
diff changeset
1574 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
1575
17870
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17824
diff changeset
1576 std::ostringstream buf;
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17824
diff changeset
1577 val.short_disp (buf);
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17824
diff changeset
1578 std::string short_disp_str = buf.str ();
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17824
diff changeset
1579
16468
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1580 workspace_element elt (storage, nm, val.class_name (),
17870
1d2e709bbbda rework short_disp methods
John W. Eaton <jwe@octave.org>
parents: 17824
diff changeset
1581 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
1582 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
1583
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1584 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
1585 }
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1586 }
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1587 }
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1588
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1589 return retval;
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1590 }
0f143f68078d use signal/slot for updating workspace instead of using event listener
John W. Eaton <jwe@octave.org>
parents: 16442
diff changeset
1591
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1592 void
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1593 symbol_table::do_dump (std::ostream& os)
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1594 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1595 if (! persistent_table.empty ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1596 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1597 os << " persistent variables in this scope:\n\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1598
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1599 for (persistent_table_const_iterator p = persistent_table.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1600 p != persistent_table.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1601 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1602 std::string nm = p->first;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1603 octave_value val = p->second;
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1604
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1605 os << " " << nm << " ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1606 val.dump (os);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1607 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1608 }
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1609
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1610 os << "\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1611 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1612
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1613 if (! table.empty ())
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1614 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1615 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
1616 << " 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
1617
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1618 for (table_const_iterator p = table.begin (); p != table.end (); p++)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1619 p->second.dump (os, " ");
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1620
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1621 os << "\n";
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1622 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1623 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1624
9981
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1625 void symbol_table::cleanup (void)
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1626 {
16605
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents: 16527
diff changeset
1627 clear_all (true);
9981
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1628
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1629 // Delete all possibly remaining scopes.
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
1630 for (all_instances_iterator iter = all_instances.begin ();
9981
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1631 iter != all_instances.end (); iter++)
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1632 {
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1633 // First zero the table entry to avoid possible duplicate delete.
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1634 symbol_table *inst = iter->second;
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1635 iter->second = 0;
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1636
21751
b571fc85953f maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents: 21736
diff changeset
1637 // Now delete the scope. Note that there may be side effects, such as
9981
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1638 // deleting other scopes.
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1639 delete inst;
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1640 }
16605
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents: 16527
diff changeset
1641
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents: 16527
diff changeset
1642 global_table.clear ();
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents: 16527
diff changeset
1643 fcn_table.clear ();
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents: 16527
diff changeset
1644 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
1645 parent_map.clear ();
2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691)
John W. Eaton <jwe@octave.org>
parents: 16527
diff changeset
1646 all_instances.clear ();
9981
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1647 }
692ab4eaf965 clean up top-level variables when exiting Octave
Jaroslav Hajek <highegg@gmail.com>
parents: 9959
diff changeset
1648
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1649 void
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1650 symbol_table::do_update_nest (void)
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 if (nest_parent || nest_children.size ())
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1653 curr_fcn->mark_as_nested_function ();
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1654
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1655 if (nest_parent)
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1656 {
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1657 // fix bad symbol_records
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1658 for (table_iterator ti = table.begin (); ti != table.end (); ++ti)
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1659 {
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1660 symbol_record &ours = ti->second;
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1661 symbol_record parents;
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1662 if (! ours.is_formal ()
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1663 && nest_parent->look_nonlocal (ti->first, parents))
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1664 {
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1665 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
1666 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
1667
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1668 if (! ours.is_formal ())
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1669 {
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1670 ours.invalidate ();
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1671 ti->second = parents;
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1672 }
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1673 }
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1674 else
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1675 ours.set_curr_fcn (curr_fcn);
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1676 }
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1677 }
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
1678 else if (nest_children.size ())
15236
44d6ffdf9479 Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents: 15195
diff changeset
1679 {
44d6ffdf9479 Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents: 15195
diff changeset
1680 static_workspace = true;
44d6ffdf9479 Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents: 15195
diff changeset
1681 for (table_iterator ti = table.begin (); ti != table.end (); ++ti)
44d6ffdf9479 Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents: 15195
diff changeset
1682 ti->second.set_curr_fcn (curr_fcn);
44d6ffdf9479 Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents: 15195
diff changeset
1683 }
14544
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1684
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1685 for (std::vector<symbol_table*>::iterator iter = nest_children.begin ();
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1686 iter != nest_children.end (); ++iter)
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1687 (*iter)->do_update_nest ();
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1688 }
be18c9e359bf Nested function support (bug #35772)
Max Brister <max@2bass.com>
parents: 14429
diff changeset
1689
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1690 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
1691 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
1692 @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
1693 @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
1694 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
1695 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
1696 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
1697
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1698 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
1699 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
1700 @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
1701
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1702 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
1703 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
1704
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1705 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
1706 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
1707 @end deftypefn */)
220
f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe]
jwe
parents: 217
diff changeset
1708 {
13081
bc6c58d29757 symtab.cc: Fix compile error accidentally introduced.
Rik <octave@nomad.inbox5.com>
parents: 13078
diff changeset
1709 int nargin = args.length ();
220
f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe]
jwe
parents: 217
diff changeset
1710
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1711 if (nargin > 1)
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1712 print_usage ();
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1713
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20874
diff changeset
1714 octave_value retval;
13081
bc6c58d29757 symtab.cc: Fix compile error accidentally introduced.
Rik <octave@nomad.inbox5.com>
parents: 13078
diff changeset
1715
13078
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
1716 if (nargout > 0 || nargin == 0)
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5823
diff changeset
1717 {
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1718 switch (Vignore_function_time_stamp)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1719 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1720 case 1:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1721 retval = "system";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1722 break;
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5823
diff changeset
1723
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1724 case 2:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1725 retval = "all";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1726 break;
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5823
diff changeset
1727
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1728 default:
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1729 retval = "none";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1730 break;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1731 }
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5823
diff changeset
1732 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5823
diff changeset
1733
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1734 if (nargin == 1)
3013
66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe]
jwe
parents: 2979
diff changeset
1735 {
20711
7b608fadc663 Make error messages more specific about the variable and problem encountered.
Rik <rik@octave.org>
parents: 20704
diff changeset
1736 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
1737
ba2b07c13913 use new string_value method to handle value extraction errors
John W. Eaton <jwe@octave.org>
parents: 20469
diff changeset
1738 if (sval == "all")
ba2b07c13913 use new string_value method to handle value extraction errors
John W. Eaton <jwe@octave.org>
parents: 20469
diff changeset
1739 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
1740 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
1741 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
1742 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
1743 Vignore_function_time_stamp = 0;
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1744 else
20711
7b608fadc663 Make error messages more specific about the variable and problem encountered.
Rik <rik@octave.org>
parents: 20704
diff changeset
1745 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
1746 }
4238
a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe]
jwe
parents: 4234
diff changeset
1747
7336
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe]
jwe
parents: 7081
diff changeset
1748 return retval;
3308
7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe]
jwe
parents: 3258
diff changeset
1749 }
7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe]
jwe
parents: 3258
diff changeset
1750
13078
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
1751 /*
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
1752 %!shared old_state
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
1753 %! 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
1754 %!test
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13081
diff changeset
1755 %! 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
1756 %! assert (state, old_state);
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
1757 %! 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
1758 %! 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
1759 %! assert (state, "all");
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
1760 %! 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
1761 %! 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
1762
14429
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
1763 ## Test input validation
13078
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
1764 %!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
1765 %!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
1766 %!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
1767 */
1dfd4c1d62a3 codesprint: Tests for ignore_function_time_stamp() in symtab.cc
Rik <octave@nomad.inbox5.com>
parents: 11586
diff changeset
1768
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1769 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
1770 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
1771 @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
1772 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
1773 @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
1774 @end deftypefn */)
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1775 {
20874
d112e04d1271 2015 Code Sprint: symtab.cc: use ovl ().
Rik <rik@octave.org>
parents: 20853
diff changeset
1776 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
1777 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1778
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1779 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
1780 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
1781 @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
1782 @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
1783 @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
1784 @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
1785 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
1786 @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
1787 @end deftypefn */)
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1788 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1789 int nargin = args.length ();
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1790
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1791 if (nargin > 1)
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1792 print_usage ();
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1793
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20874
diff changeset
1794 octave_value retval;
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1795
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1796 if (nargin == 0)
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1797 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1798 symbol_table::dump_functions (octave_stdout);
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1799
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1800 symbol_table::dump_global (octave_stdout);
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1801
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1802 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
1803
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1804 for (std::list<symbol_table::scope_id>::const_iterator p = lst.begin ();
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1805 p != lst.end (); p++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1806 symbol_table::dump (octave_stdout, *p);
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1807 }
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1808 else
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1809 {
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1810 octave_value arg = args(0);
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1811
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1812 if (arg.is_string ())
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1813 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1814 std::string s_arg = arg.string_value ();
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1815
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1816 if (s_arg == "scopes")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1817 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1818 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
1819
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1820 RowVector v (lst.size ());
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1821
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1822 octave_idx_type k = 0;
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1823
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1824 for (std::list<symbol_table::scope_id>::const_iterator
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1825 p = lst.begin (); p != lst.end (); p++)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1826 v.xelem (k++) = *p;
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1827
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1828 retval = v;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1829 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1830 else if (s_arg == "functions")
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1831 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1832 symbol_table::dump_functions (octave_stdout);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1833 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1834 else
20711
7b608fadc663 Make error messages more specific about the variable and problem encountered.
Rik <rik@octave.org>
parents: 20704
diff changeset
1835 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
1836 }
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1837 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1838 {
20711
7b608fadc663 Make error messages more specific about the variable and problem encountered.
Rik <rik@octave.org>
parents: 20704
diff changeset
1839 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
1840
20704
571508c1ed06 eliminate more uses of error_state
John W. Eaton <jwe@octave.org>
parents: 20700
diff changeset
1841 symbol_table::dump (octave_stdout, s);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10306
diff changeset
1842 }
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1843 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1844
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1845 return retval;
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1846 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1847
20207
abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462).
John W. Eaton <jwe@octave.org>
parents: 20172
diff changeset
1848 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
1849 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
1850 @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
1851 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
1852 @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
1853 {
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1854 if (args.length () != 1)
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1855 print_usage ();
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1856
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1857 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
1858
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1859 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
1860
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1861 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
1862
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20874
diff changeset
1863 octave_value_list retval;
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20874
diff changeset
1864
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1865 if (f)
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1866 {
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1867 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
1868
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1869 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
1870
20799
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1871 f->accept (tpc);
c349d4c91ce2 eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20716
diff changeset
1872
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20874
diff changeset
1873 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
1874 }
abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462).
John W. Eaton <jwe@octave.org>
parents: 20172
diff changeset
1875
7761
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1876 return retval;
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1877 }
5adeea5de26c symbol table reporting functions
John W. Eaton <jwe@octave.org>
parents: 7752
diff changeset
1878
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1879 // 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
1880 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1881 // 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
1882 // {
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1883 // 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
1884 // print_usage ();
21992
03c692adf563 maint: strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
1885 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1886 // 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
1887 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1888 // symbol_table::assign (name, args(1));
21992
03c692adf563 maint: strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
1889 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1890 // 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
1891 // }
21992
03c692adf563 maint: strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
1892 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1893 // 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
1894 // {
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1895 // 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
1896 // print_usage ();
21992
03c692adf563 maint: strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
1897 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1898 // octave_value retval;
21992
03c692adf563 maint: strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
1899 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1900 // 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
1901 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1902 // retval = symbol_table::varval (name);
21992
03c692adf563 maint: strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
1903 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1904 // 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
1905 // 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
1906 // name.c_str ());
21992
03c692adf563 maint: strip trailing whitespace from files.
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
1907 //
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
1908 // 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
1909 // }
15003
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1910
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1911 /*
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1912 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
1913
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1914 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
1915 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
1916 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
1917
22489
93ea313301f9 test: Add bug ids (<#####>) to BIST tests.
Rik <rik@octave.org>
parents: 22407
diff changeset
1918 %!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
1919
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1920 %!function x = bar ()
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1921 %! x = 5;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1922 %!endfunction
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1923 %!test
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1924 %! assert (bar == 5);
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1925 %! 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
1926 %! clear -f bar;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1927 %! 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
1928
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1929 %!function x = bar ()
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1930 %! x = 5;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1931 %!endfunction
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1932 %!test
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1933 %! assert (bar == 5);
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1934 %! 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
1935 %! clear bar;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497)
Max Brister <max@2bass.com>
parents: 14861
diff changeset
1936 %! assert (! strcmp (which ("bar"), ""));
20946
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
1937 */
22407
34ce5be04942 maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents: 22323
diff changeset
1938