octave-lyh: libinterp/interpfcn/symtab.h annotate

annotate libinterp/interpfcn/symtab.h @ 16596:645672f1c873

handle setting breakpoints in subfunctions in GUI editor * symtab.h (symbol_table::subfunctions_defined_in_scope): Now public. * debug.h, debug.cc (bp_table::do_add_breakpoint_1): New function. (bp_table::do_add_breakpoint): Handle subfunctions. * ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_code::subfunctions, octave_user_function::subfunctions): New functions. * pt-bp.h (tree_breakpoint::get_line): Return 0 if line wasn't found.

author	John W. Eaton <jwe@octave.org>
date	Tue, 30 Apr 2013 14:32:16 -0400
parents	45ae1038ee89
children	2f8fb02a6c31

rev	line source
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	1 /*
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 14024 diff changeset	3 Copyright (C) 1993-2012 John W. Eaton
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10321 diff changeset	4 Copyright (C) 2009 VZLU Prague
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	5
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	7
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
bd072d0a95f9 [project @ 1993-08-08 03:55:11 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: 6257 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: 6257 diff changeset	11 option) any later version.
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	12
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	16 for more details.
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	17
bd072d0a95f9 [project @ 1993-08-08 03:55:11 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: 6257 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: 6257 diff changeset	20 <http://www.gnu.org/licenses/>.
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	21
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	22 */
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	23
383 0b52c68ec81f [project @ 1994-03-09 21:19:44 by jwe] jwe parents: 276 diff changeset	24 #if !defined (octave_symtab_h)
0b52c68ec81f [project @ 1994-03-09 21:19:44 by jwe] jwe parents: 276 diff changeset	25 #define octave_symtab_h 1
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	26
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	27 #include <deque>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	28 #include <list>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	29 #include <map>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	30 #include <set>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	31 #include <string>
2953 ca7d3625ee01 [project @ 1997-05-09 14:56:52 by jwe] jwe parents: 2948 diff changeset	32
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	33 #include "glob-match.h"
14024 fc9f204faea0 refactor regexp (bug #34440) John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	34 #include "regexp.h"
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2791 diff changeset	35
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	36 class tree_argument_list;
9639 8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	37 class octave_user_function;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 3011 diff changeset	38
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	39 #include "oct-obj.h"
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	40 #include "workspace-element.h"
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 13983 diff changeset	41 #include "oct-refcount.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	42 #include "ov.h"
1412 5db963ba9614 [project @ 1995-09-15 08:47:17 by jwe] jwe parents: 1315 diff changeset	43
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	44 class
6109 c68896f193e3 [project @ 2006-10-27 02:16:18 by jwe] jwe parents: 6072 diff changeset	45 OCTINTERP_API
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	46 symbol_table
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	47 {
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	48 public:
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	49
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	50 typedef int scope_id;
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	51 typedef size_t context_id;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	52
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	53 class
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	54 scope_id_cache
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	55 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	56 protected:
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	57
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	58 typedef std::set<scope_id>::iterator set_iterator;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	59 typedef std::set<scope_id>::const_iterator set_const_iterator;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	60
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	61 // We start with 2 because we allocate 0 for the global symbols
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	62 // and 1 for the top-level workspace.
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	63
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	64 scope_id_cache (void) : next_available (2), in_use (), free_list () { }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	65
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	66 public:
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	67
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	68 ~scope_id_cache (void) { }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	69
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	70 static scope_id alloc (void)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	71 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	72 return instance_ok () ? instance->do_alloc () : -1;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	73 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	74
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	75 static void free (scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	76 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	77 if (instance_ok ())
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	78 return instance->do_free (scope);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	79 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	80
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	81 static std::list<scope_id> scopes (void)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	82 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	83 return instance_ok () ? instance->do_scopes () : std::list<scope_id> ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	84 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	85
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12911 diff changeset	86 static void create_instance (void);
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12911 diff changeset	87
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	88 static bool instance_ok (void)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	89 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	90 bool retval = true;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	91
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	92 if (! instance)
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12911 diff changeset	93 create_instance ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	94
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	95 if (! instance)
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	96 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	97 ::error ("unable to create scope_id_cache object!");
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	98
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	99 retval = false;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	100 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	101
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	102 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	103 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	104
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	105 private:
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	106
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	107 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	108
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	109 scope_id_cache (const scope_id_cache&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	110
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	111 scope_id_cache& operator = (const scope_id_cache&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	112
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	113 static scope_id_cache *instance;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	114
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12911 diff changeset	115 static void cleanup_instance (void) { delete instance; instance = 0; }
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 12911 diff changeset	116
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	117 // The next available scope not in the free list.
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	118 scope_id next_available;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	119
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	120 // The set of scope IDs that are currently allocated.
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	121 std::set<scope_id> in_use;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	122
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	123 // The set of scope IDs that are currently available.
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	124 std::set<scope_id> free_list;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	125
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	126 scope_id do_alloc (void)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	127 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	128 scope_id retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	129
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	130 set_iterator p = free_list.begin ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	131
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	132 if (p != free_list.end ())
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	133 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	134 retval = *p;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	135 free_list.erase (p);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	136 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	137 else
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	138 retval = next_available++;
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	139
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	140 in_use.insert (retval);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	141
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	142 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	143 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	144
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	145 void do_free (scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	146 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	147 set_iterator p = in_use.find (scope);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	148
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	149 if (p != in_use.end ())
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	150 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	151 in_use.erase (p);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	152 free_list.insert (scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	153 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	154 else
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	155 error ("free_scope: scope %d not found!", scope);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	156 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	157
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	158 std::list<scope_id> do_scopes (void) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	159 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	160 std::list<scope_id> retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	161
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	162 for (set_const_iterator p = in_use.begin (); p != in_use.end (); p++)
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	163 retval.push_back (*p);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	164
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	165 retval.sort ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	166
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	167 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	168 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	169 };
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	170
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	171 class fcn_info;
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	172
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	173 class
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	174 symbol_record
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	175 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	176 public:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	177
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	178 // generic variable
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	179 static const unsigned int local = 1;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	180
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	181 // varargin, argn, .nargin., .nargout.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	182 // (FIXME -- is this really used now?)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	183 static const unsigned int automatic = 2;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	184
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	185 // formal parameter
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	186 static const unsigned int formal = 4;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	187
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	188 // not listed or cleared (.nargin., .nargout.)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	189 static const unsigned int hidden = 8;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	190
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	191 // inherited from parent scope; not cleared at function exit
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	192 static const unsigned int inherited = 16;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	193
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	194 // global (redirects to global scope)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	195 static const unsigned int global = 32;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	196
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	197 // not cleared at function exit
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	198 static const unsigned int persistent = 64;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	199
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	200 // this symbol may NOT become a variable.
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	201 // (symbol added to a static workspace)
16277 8cb65fd72164 eliminate obsolete concepts of "pending local" and "forced" variables John W. Eaton <jwe@octave.org> parents: 15572 diff changeset	202 static const unsigned int added_static = 128;
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	203
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	204 private:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	205
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	206 class
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	207 symbol_record_rep
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3968 diff changeset	208 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	209 public:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	210
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	211 symbol_record_rep (scope_id s, const std::string& nm,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	212 const octave_value& v, unsigned int sc)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	213 : decl_scope (s), curr_fcn (0), name (nm), value_stack (),
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	214 storage_class (sc), finfo (), valid (true), count (1)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	215 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	216 value_stack.push_back (v);
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	217 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	218
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	219 void assign (const octave_value& value,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	220 context_id context = xdefault_context)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	221 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	222 varref (context) = value;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	223 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	224
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	225 void assign (octave_value::assign_op op,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	226 const std::string& type,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	227 const std::list<octave_value_list>& idx,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	228 const octave_value& value,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	229 context_id context = xdefault_context)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	230 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	231 varref(context).assign (op, type, idx, value);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	232 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	233
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	234 void assign (octave_value::assign_op op, const octave_value& value,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	235 context_id context = xdefault_context)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	236 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	237 varref(context).assign (op, value);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	238 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	239
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	240 void do_non_const_unary_op (octave_value::unary_op op,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	241 context_id context = xdefault_context)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	242 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	243 varref(context).do_non_const_unary_op (op);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	244 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	245
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	246 void do_non_const_unary_op (octave_value::unary_op op,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	247 const std::string& type,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	248 const std::list<octave_value_list>& idx,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	249 context_id context = xdefault_context)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	250 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	251 varref(context).do_non_const_unary_op (op, type, idx);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	252 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	253
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	254 octave_value& varref (context_id context = xdefault_context)
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	255 {
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	256 // We duplicate global_varref and persistent_varref here to
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	257 // avoid calling deprecated functions.
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	258
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	259 if (is_global ())
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	260 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	261 symbol_table::global_table_iterator p
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	262 = symbol_table::global_table.find (name);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	263
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	264 return (p == symbol_table::global_table.end ())
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	265 ? symbol_table::global_table[name] : p->second;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	266 }
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	267 else if (is_persistent ())
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	268 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	269 static octave_value foobar;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	270
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	271 symbol_table *inst
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	272 = symbol_table::get_instance (symbol_table::current_scope ());
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	273
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	274 return inst ? inst->do_persistent_varref (name) : foobar;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	275 }
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	276 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	277 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	278 if (context == xdefault_context)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	279 context = active_context ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	280
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	281 context_id n = value_stack.size ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	282 while (n++ <= context)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	283 value_stack.push_back (octave_value ());
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	284
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	285 return value_stack[context];
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	286 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	287 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	288
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	289 octave_value varval (context_id context = xdefault_context) const
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	290 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	291 if (is_global ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	292 return symbol_table::global_varval (name);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	293 else if (is_persistent ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	294 return symbol_table::persistent_varval (name);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	295 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	296 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	297 if (context == xdefault_context)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	298 context = active_context ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	299
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	300 if (context < value_stack.size ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	301 return value_stack[context];
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	302 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	303 return octave_value ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	304 }
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	305 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	306
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	307 void push_context (scope_id s)
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	308 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	309 if (! (is_persistent () \|\| is_global ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	310 && s == scope ())
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	311 value_stack.push_back (octave_value ());
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	312 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	313
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	314 // If pop_context returns 0, we are out of values and this element
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	315 // of the symbol table should be deleted. This can happen for
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	316 // functions like
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	317 //
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	318 // function foo (n)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	319 // if (n > 0)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	320 // foo (n-1);
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	321 // else
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	322 // eval ("x = 1");
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	323 // endif
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	324 // endfunction
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	325 //
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	326 // Here, X should only exist in the final stack frame.
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	327
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	328 size_t pop_context (scope_id s)
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7346 diff changeset	329 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	330 size_t retval = 1;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	331
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	332 if (! (is_persistent () \|\| is_global ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	333 && s == scope ())
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	334 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	335 value_stack.pop_back ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	336 retval = value_stack.size ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	337 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	338
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	339 return retval;
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7346 diff changeset	340 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	341
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	342 void clear (void) { clear (scope ()); }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	343
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	344 void clear (scope_id s)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	345 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	346 if (! (is_hidden () \|\| is_inherited ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	347 && s == scope ())
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	348 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	349 if (is_global ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	350 unmark_global ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	351
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	352 if (is_persistent ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	353 {
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	354 symbol_table::persistent_assign (name, varval ());
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	355
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	356 unmark_persistent ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	357 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	358
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	359 assign (octave_value ());
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	360 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	361 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	362
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	363 bool is_defined (context_id context = xdefault_context) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	364 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	365 if (context == xdefault_context)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	366 context = active_context ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	367
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	368 return varval (context).is_defined ();
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	369 }
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	370
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	371 bool is_valid (void) const
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	372 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	373 return valid;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	374 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	375
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	376 bool is_variable (context_id context) const
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	377 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	378 if (context == xdefault_context)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	379 context = active_context ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	380
16277 8cb65fd72164 eliminate obsolete concepts of "pending local" and "forced" variables John W. Eaton <jwe@octave.org> parents: 15572 diff changeset	381 return (! is_local () \|\| is_defined (context));
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	382 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	383
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	384 bool is_local (void) const { return storage_class & local; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	385 bool is_automatic (void) const { return storage_class & automatic; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	386 bool is_formal (void) const { return storage_class & formal; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	387 bool is_hidden (void) const { return storage_class & hidden; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	388 bool is_inherited (void) const { return storage_class & inherited; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	389 bool is_global (void) const { return storage_class & global; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	390 bool is_persistent (void) const { return storage_class & persistent; }
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	391 bool is_added_static (void) const {return storage_class & added_static; }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	392
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	393 void mark_local (void) { storage_class \|= local; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	394 void mark_automatic (void) { storage_class \|= automatic; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	395 void mark_formal (void) { storage_class \|= formal; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	396 void mark_hidden (void) { storage_class \|= hidden; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	397 void mark_inherited (void) { storage_class \|= inherited; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	398 void mark_global (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	399 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	400 if (is_persistent ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	401 error ("can't make persistent variable %s global", name.c_str ());
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	402 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	403 storage_class \|= global;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	404 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	405 void mark_persistent (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	406 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	407 if (is_global ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	408 error ("can't make global variable %s persistent", name.c_str ());
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	409 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	410 storage_class \|= persistent;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	411 }
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	412 void mark_added_static (void) { storage_class \|= added_static; }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	413
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	414 void unmark_local (void) { storage_class &= ~local; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	415 void unmark_automatic (void) { storage_class &= ~automatic; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	416 void unmark_formal (void) { storage_class &= ~formal; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	417 void unmark_hidden (void) { storage_class &= ~hidden; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	418 void unmark_inherited (void) { storage_class &= ~inherited; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	419 void unmark_global (void) { storage_class &= ~global; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	420 void unmark_persistent (void) { storage_class &= ~persistent; }
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	421 void unmark_added_static (void) { storage_class &= ~added_static; }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	422
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	423 void init_persistent (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	424 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	425 if (! is_defined ())
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	426 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	427 mark_persistent ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	428
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	429 assign (symbol_table::persistent_varval (name));
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	430 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	431 // FIXME -- this causes trouble with recursive calls.
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	432 // else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	433 // error ("unable to declare existing variable persistent");
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	434 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	435
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	436 void invalidate (void)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	437 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	438 valid = false;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	439 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	440
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	441 void erase_persistent (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	442 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	443 unmark_persistent ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	444 symbol_table::erase_persistent (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	445 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	446
15260 789c8c3c9af5 Export more symbols from liboctinterp. Michael Goffioul <michael.goffioul@gmail.com> parents: 15236 diff changeset	447 OCTINTERP_API context_id active_context (void) const;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	448
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	449 scope_id scope (void) const { return decl_scope; }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	450
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	451 void set_curr_fcn (octave_user_function *fcn)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	452 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	453 curr_fcn = fcn;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	454 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	455
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	456 symbol_record_rep *dup (scope_id new_scope) const
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	457 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	458 return new symbol_record_rep (new_scope, name, varval (),
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	459 storage_class);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	460 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	461
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	462 void dump (std::ostream& os, const std::string& prefix) const;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	463
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	464 scope_id decl_scope;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	465
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	466 octave_user_function* curr_fcn;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	467
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	468 std::string name;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	469
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	470 std::deque<octave_value> value_stack;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	471
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	472 unsigned int storage_class;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	473
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	474 fcn_info *finfo;
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	475
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	476 bool valid;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	477
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 13983 diff changeset	478 octave_refcount<size_t> count;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	479
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	480 private:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	481
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	482 // No copying!
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	483
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	484 symbol_record_rep (const symbol_record_rep& ov);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	485
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	486 symbol_record_rep& operator = (const symbol_record_rep&);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	487 };
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	488
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	489 public:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	490
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	491 symbol_record (scope_id s = xcurrent_scope,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	492 const std::string& nm = std::string (),
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	493 const octave_value& v = octave_value (),
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	494 unsigned int sc = local)
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	495 : rep (new symbol_record_rep (s, nm, v, sc)) { }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	496
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	497 symbol_record (const symbol_record& sr)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	498 : rep (sr.rep)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	499 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	500 rep->count++;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	501 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	502
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	503 symbol_record& operator = (const symbol_record& sr)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	504 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	505 if (this != &sr)
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	506 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	507 if (--rep->count == 0)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	508 delete rep;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	509
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	510 rep = sr.rep;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	511 rep->count++;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	512 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	513
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	514 return *this;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	515 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	516
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	517 ~symbol_record (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	518 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	519 if (--rep->count == 0)
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	520 delete rep;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	521 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	522
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	523 symbol_record dup (scope_id new_scope) const
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	524 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	525 return symbol_record (rep->dup (new_scope));
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	526 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	527
14899 f25d2224fa02 Initial JIT support Max Brister <max@2bass.com> parents: 14544 diff changeset	528 const std::string& name (void) const { return rep->name; }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	529
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	530 void rename (const std::string& new_name) { rep->name = new_name; }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	531
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	532 octave_value
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	533 find (const octave_value_list& args = octave_value_list ()) const;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	534
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	535 void assign (const octave_value& value,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	536 context_id context = xdefault_context)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	537 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	538 rep->assign (value, context);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	539 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	540
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	541 void assign (octave_value::assign_op op,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	542 const std::string& type,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	543 const std::list<octave_value_list>& idx,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	544 const octave_value& value,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	545 context_id context = xdefault_context)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	546 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	547 rep->assign (op, type, idx, value, context);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	548 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	549
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	550 void assign (octave_value::assign_op op, const octave_value& value,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	551 context_id context = xdefault_context)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	552 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	553 rep->assign (op, value, context);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	554 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	555
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	556 void do_non_const_unary_op (octave_value::unary_op op)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	557 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	558 rep->do_non_const_unary_op (op);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	559 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	560
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	561 void do_non_const_unary_op (octave_value::unary_op op,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	562 const std::string& type,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	563 const std::list<octave_value_list>& idx)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	564 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	565 rep->do_non_const_unary_op (op, type, idx);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	566 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	567
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	568 // Delete when deprecated varref functions are removed.
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	569 octave_value& varref (context_id context = xdefault_context)
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	570 {
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	571 return rep->varref (context);
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	572 }
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	573
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	574 octave_value varval (context_id context = xdefault_context) const
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	575 {
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	576 return rep->varval (context);
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	577 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	578
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	579 void push_context (scope_id s) { rep->push_context (s); }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	580
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	581 size_t pop_context (scope_id s) { return rep->pop_context (s); }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	582
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	583 void clear (void) { rep->clear (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	584
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	585 void clear (scope_id s) { rep->clear (s); }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	586
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	587 bool is_defined (context_id context = xdefault_context) const
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	588 {
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	589 return rep->is_defined (context);
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	590 }
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	591
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	592 bool is_undefined (context_id context = xdefault_context) const
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	593 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	594 return ! rep->is_defined (context);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	595 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	596
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	597 bool is_valid (void) const
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	598 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	599 return rep->is_valid ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	600 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	601
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	602 bool is_variable (context_id context = xdefault_context) const
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	603 {
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	604 return rep->is_variable (context);
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	605 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	606
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	607 bool is_local (void) const { return rep->is_local (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	608 bool is_automatic (void) const { return rep->is_automatic (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	609 bool is_formal (void) const { return rep->is_formal (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	610 bool is_global (void) const { return rep->is_global (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	611 bool is_hidden (void) const { return rep->is_hidden (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	612 bool is_inherited (void) const { return rep->is_inherited (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	613 bool is_persistent (void) const { return rep->is_persistent (); }
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	614 bool is_added_static (void) const { return rep->is_added_static (); }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	615
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	616 void mark_local (void) { rep->mark_local (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	617 void mark_automatic (void) { rep->mark_automatic (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	618 void mark_formal (void) { rep->mark_formal (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	619 void mark_hidden (void) { rep->mark_hidden (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	620 void mark_inherited (void) { rep->mark_inherited (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	621 void mark_global (void) { rep->mark_global (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	622 void mark_persistent (void) { rep->mark_persistent (); }
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	623 void mark_added_static (void) { rep->mark_added_static (); }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	624
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	625 void unmark_local (void) { rep->unmark_local (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	626 void unmark_automatic (void) { rep->unmark_automatic (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	627 void unmark_formal (void) { rep->unmark_formal (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	628 void unmark_hidden (void) { rep->unmark_hidden (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	629 void unmark_inherited (void) { rep->unmark_inherited (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	630 void unmark_global (void) { rep->unmark_global (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	631 void unmark_persistent (void) { rep->unmark_persistent (); }
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	632 void unmark_added_static (void) { rep->unmark_added_static (); }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	633
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	634 void init_persistent (void) { rep->init_persistent (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	635
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	636 void erase_persistent (void) { rep->erase_persistent (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	637
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	638 void invalidate (void) { rep->invalidate (); }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	639
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	640 context_id active_context (void) const { return rep->active_context (); }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	641
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	642 scope_id scope (void) const { return rep->scope (); }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	643
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	644 unsigned int xstorage_class (void) const { return rep->storage_class; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	645
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	646 void set_curr_fcn (octave_user_function *fcn) { rep->set_curr_fcn (fcn); }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	647
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	648 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	649 dump (std::ostream& os, const std::string& prefix = std::string ()) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	650 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	651 rep->dump (os, prefix);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	652 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	653
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	654 private:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	655
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	656 symbol_record_rep *rep;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	657
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	658 symbol_record (symbol_record_rep *new_rep) : rep (new_rep) { }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	659 };
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	660
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	661 // Always access a symbol from the current scope.
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	662 // Useful for scripts, as they may be executed in more than one scope.
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	663 class
14930 7d44ed216b98 Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference Max Brister <max@2bass.com> parents: 14913 diff changeset	664 symbol_reference
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	665 {
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	666 public:
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	667
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	668 symbol_reference (void) : scope (-1) { }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	669
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	670 symbol_reference (const symbol_record& record,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	671 scope_id curr_scope = symbol_table::current_scope ())
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	672 : scope (curr_scope), sym (record)
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	673 { }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	674
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	675 symbol_reference (const symbol_reference& ref)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	676 : scope (ref.scope), sym (ref.sym)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	677 { }
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	678
14930 7d44ed216b98 Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference Max Brister <max@2bass.com> parents: 14913 diff changeset	679 symbol_reference& operator = (const symbol_reference& ref)
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	680 {
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	681 if (this != &ref)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	682 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	683 scope = ref.scope;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	684 sym = ref.sym;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	685 }
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	686 return *this;
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	687 }
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	688
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	689 bool is_black_hole (void) const { return scope < 0; }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	690
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	691 // The name is the same regardless of scope.
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	692 const std::string& name (void) const { return sym.name (); }
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	693
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	694 symbol_record *operator-> (void)
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	695 {
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	696 update ();
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	697 return &sym;
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	698 }
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	699
14913 c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	700 symbol_record *operator-> (void) const
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	701 {
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	702 update ();
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	703 return &sym;
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	704 }
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	705
14930 7d44ed216b98 Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference Max Brister <max@2bass.com> parents: 14913 diff changeset	706 // can be used to place symbol_reference in maps, we don't overload < as
7d44ed216b98 Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference Max Brister <max@2bass.com> parents: 14913 diff changeset	707 // it doesn't make any sense for symbol_reference
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	708 struct comparator
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	709 {
14930 7d44ed216b98 Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference Max Brister <max@2bass.com> parents: 14913 diff changeset	710 bool operator ()(const symbol_reference& lhs,
7d44ed216b98 Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference Max Brister <max@2bass.com> parents: 14913 diff changeset	711 const symbol_reference& rhs) const
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	712 {
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	713 return lhs.name () < rhs.name ();
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	714 }
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	715 };
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	716 private:
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	717
14913 c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	718 void update (void) const
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	719 {
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	720 scope_id curr_scope = symbol_table::current_scope ();
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	721
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	722 if (scope != curr_scope \|\| ! sym.is_valid ())
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	723 {
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	724 scope = curr_scope;
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	725 sym = symbol_table::insert (sym.name ());
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	726 }
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	727 }
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	728
14913 c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	729 mutable scope_id scope;
c7071907a641 Use symbol_record_ref instead of names in JIT Max Brister <max@2bass.com> parents: 14912 diff changeset	730 mutable symbol_record sym;
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	731 };
3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	732
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	733 class
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	734 fcn_info
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	735 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	736 public:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	737
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	738 typedef std::map<std::string, std::string> dispatch_map_type;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	739
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	740 typedef std::map<scope_id, octave_value>::const_iterator scope_val_const_iterator;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	741 typedef std::map<scope_id, octave_value>::iterator scope_val_iterator;
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4234 diff changeset	742
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	743 typedef std::map<std::string, octave_value>::const_iterator str_val_const_iterator;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	744 typedef std::map<std::string, octave_value>::iterator str_val_iterator;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	745
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	746 typedef dispatch_map_type::const_iterator dispatch_map_const_iterator;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	747 typedef dispatch_map_type::iterator dispatch_map_iterator;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	748
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	749 private:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	750
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	751 class
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	752 fcn_info_rep
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	753 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	754 public:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	755
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	756 fcn_info_rep (const std::string& nm)
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	757 : name (nm), subfunctions (), private_functions (),
11584 cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11557 diff changeset	758 class_constructors (), class_methods (), dispatch_map (),
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	759 cmdline_function (), autoload_function (), function_on_path (),
11584 cda4aa780d58 Another round of initialising members in the constructor initialisation list Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11557 diff changeset	760 built_in_function (), count (1) { }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	761
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	762 octave_value load_private_function (const std::string& dir_name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	763
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	764 octave_value load_class_constructor (void);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	765
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	766 octave_value load_class_method (const std::string& dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	767
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	768 octave_value find (const octave_value_list& args, bool local_funcs);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	769
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	770 octave_value builtin_find (void);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	771
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	772 octave_value find_method (const std::string& dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	773
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	774 octave_value find_autoload (void);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	775
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	776 octave_value find_user_function (void);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	777
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	778 bool is_user_function_defined (void) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	779 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	780 return function_on_path.is_defined ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	781 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	782
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	783 octave_value find_function (const octave_value_list& args, bool local_funcs)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	784 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	785 return find (args, local_funcs);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	786 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	787
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	788 void lock_subfunction (scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	789 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	790 scope_val_iterator p = subfunctions.find (scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	791
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	792 if (p != subfunctions.end ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	793 p->second.lock ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	794 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	795
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	796 void unlock_subfunction (scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	797 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	798 scope_val_iterator p = subfunctions.find (scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	799
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	800 if (p != subfunctions.end ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	801 p->second.unlock ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	802 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	803
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	804 std::pair<std::string, octave_value>
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	805 subfunction_defined_in_scope (scope_id scope) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	806 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	807 scope_val_const_iterator p = subfunctions.find (scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	808
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	809 return p == subfunctions.end ()
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	810 ? std::pair<std::string, octave_value> ()
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	811 : std::pair<std::string, octave_value> (name, p->second);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	812 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	813
7876 8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	814 void erase_subfunction (scope_id scope)
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	815 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	816 scope_val_iterator p = subfunctions.find (scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	817
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	818 if (p != subfunctions.end ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	819 subfunctions.erase (p);
7876 8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	820 }
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	821
11445 40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	822 void mark_subfunction_in_scope_as_private (scope_id scope,
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	823 const std::string& class_name);
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	824
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	825 void install_cmdline_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	826 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	827 cmdline_function = f;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	828 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	829
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	830 void install_subfunction (const octave_value& f, scope_id scope)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	831 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	832 subfunctions[scope] = f;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	833 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	834
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	835 void install_user_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	836 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	837 function_on_path = f;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	838 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	839
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	840 void install_built_in_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	841 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	842 built_in_function = f;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	843 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	844
7489 8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	845 template <class T>
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	846 void
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	847 clear_unlocked (std::map<T, octave_value>& map)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	848 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	849 typename std::map<T, octave_value>::iterator p = map.begin ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	850
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	851 while (p != map.end ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	852 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	853 if (p->second.islocked ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	854 p++;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	855 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	856 map.erase (p++);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	857 }
7489 8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	858 }
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	859
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	860 void clear_autoload_function (void)
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	861 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	862 if (! autoload_function.islocked ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	863 autoload_function = octave_value ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	864 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	865
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14981 diff changeset	866 // We also clear command line functions here, as these are both
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14981 diff changeset	867 // "user defined"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	868 void clear_user_function (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	869 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	870 if (! function_on_path.islocked ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	871 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	872 function_on_path.erase_subfunctions ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	873
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	874 function_on_path = octave_value ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	875 }
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14981 diff changeset	876
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14981 diff changeset	877 if (! cmdline_function.islocked ())
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14981 diff changeset	878 cmdline_function = octave_value ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	879 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	880
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	881 void clear_mex_function (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	882 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	883 if (function_on_path.is_mex_function ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	884 clear_user_function ();
7489 8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	885 }
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	886
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	887 void clear (void)
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	888 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	889 clear_unlocked (subfunctions);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	890 clear_unlocked (private_functions);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	891 clear_unlocked (class_constructors);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	892 clear_unlocked (class_methods);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	893 clear_autoload_function ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	894 clear_user_function ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	895 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	896
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	897 void add_dispatch (const std::string& type, const std::string& fname)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	898 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	899 dispatch_map[type] = fname;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	900 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	901
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	902 void clear_dispatch (const std::string& type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	903 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	904 dispatch_map_iterator p = dispatch_map.find (type);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	905
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	906 if (p != dispatch_map.end ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	907 dispatch_map.erase (p);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	908 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	909
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	910 void print_dispatch (std::ostream& os) const;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	911
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	912 std::string help_for_dispatch (void) const;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	913
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	914 dispatch_map_type get_dispatch (void) const { return dispatch_map; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	915
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	916 void dump (std::ostream& os, const std::string& prefix) const;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	917
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	918 std::string name;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	919
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	920 // Scope id to function object.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	921 std::map<scope_id, octave_value> subfunctions;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	922
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	923 // Directory name to function object.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	924 std::map<std::string, octave_value> private_functions;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	925
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	926 // Class name to function object.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	927 std::map<std::string, octave_value> class_constructors;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	928
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	929 // Dispatch type to function object.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	930 std::map<std::string, octave_value> class_methods;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	931
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	932 // Legacy dispatch map (dispatch type name to function name).
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	933 dispatch_map_type dispatch_map;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	934
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	935 octave_value cmdline_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	936
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	937 octave_value autoload_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	938
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	939 octave_value function_on_path;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	940
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	941 octave_value built_in_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	942
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 13983 diff changeset	943 octave_refcount<size_t> count;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	944
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	945 private:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	946
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	947 octave_value xfind (const octave_value_list& args, 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: 8282 diff changeset	948
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	949 octave_value x_builtin_find (void);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	950
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	951 // No copying!
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	952
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	953 fcn_info_rep (const fcn_info_rep&);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	954
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	955 fcn_info_rep& operator = (const fcn_info_rep&);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	956 };
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	957
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	958 public:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	959
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	960 fcn_info (const std::string& nm = std::string ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	961 : rep (new fcn_info_rep (nm)) { }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	962
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8884 diff changeset	963 fcn_info (const fcn_info& fi) : rep (fi.rep)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	964 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	965 rep->count++;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	966 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	967
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8884 diff changeset	968 fcn_info& operator = (const fcn_info& fi)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	969 {
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8884 diff changeset	970 if (this != &fi)
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	971 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	972 if (--rep->count == 0)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	973 delete rep;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	974
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	975 rep = fi.rep;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	976 rep->count++;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	977 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	978
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	979 return *this;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	980 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	981
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	982 ~fcn_info (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	983 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	984 if (--rep->count == 0)
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	985 delete rep;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	986 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	987
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	988 octave_value find (const octave_value_list& args = octave_value_list (),
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	989 bool local_funcs = true)
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	990 {
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	991 return rep->find (args, local_funcs);
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	992 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	993
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	994 octave_value builtin_find (void)
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	995 {
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	996 return rep->builtin_find ();
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	997 }
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	998
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	999 octave_value find_method (const std::string& dispatch_type) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1000 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1001 return rep->find_method (dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1002 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1003
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1004 octave_value find_built_in_function (void) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1005 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1006 return rep->built_in_function;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1007 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1008
12911 d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	1009 octave_value find_cmdline_function (void) const
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	1010 {
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	1011 return rep->cmdline_function;
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	1012 }
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	1013
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1014 octave_value find_autoload (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1015 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1016 return rep->find_autoload ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1017 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1018
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1019 octave_value find_user_function (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1020 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1021 return rep->find_user_function ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1022 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1023
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1024 bool is_user_function_defined (void) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1025 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1026 return rep->is_user_function_defined ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1027 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1028
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1029 octave_value find_function (const octave_value_list& args = octave_value_list (),
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1030 bool local_funcs = true)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1031 {
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1032 return rep->find_function (args, local_funcs);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1033 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1034
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1035 void lock_subfunction (scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1036 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1037 rep->lock_subfunction (scope);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1038 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1039
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1040 void unlock_subfunction (scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1041 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1042 rep->unlock_subfunction (scope);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1043 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1044
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1045 std::pair<std::string, octave_value>
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1046 subfunction_defined_in_scope (scope_id scope = xcurrent_scope) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1047 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1048 return rep->subfunction_defined_in_scope (scope);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1049 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1050
7876 8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1051 void erase_subfunction (scope_id scope)
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1052 {
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1053 rep->erase_subfunction (scope);
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1054 }
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1055
11445 40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1056 void mark_subfunction_in_scope_as_private (scope_id scope,
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1057 const std::string& class_name)
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1058 {
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1059 rep->mark_subfunction_in_scope_as_private (scope, class_name);
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1060 }
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1061
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1062 void install_cmdline_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1063 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1064 rep->install_cmdline_function (f);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1065 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1066
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1067 void install_subfunction (const octave_value& f, scope_id scope)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1068 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1069 rep->install_subfunction (f, scope);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1070 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1071
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1072 void install_user_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1073 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1074 rep->install_user_function (f);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1075 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1076
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1077 void install_built_in_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1078 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1079 rep->install_built_in_function (f);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1080 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1081
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1082 void clear (void) { rep->clear (); }
8881 8ed42c679af5 after defining a script or function, clear local variables created for parsing John W. Eaton <jwe@octave.org> parents: 8819 diff changeset	1083
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1084 void clear_user_function (void) { rep->clear_user_function (); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1085
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1086 void clear_autoload_function (void) { rep->clear_autoload_function (); }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1087
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1088 void clear_mex_function (void) { rep->clear_mex_function (); }
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	1089
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1090 void add_dispatch (const std::string& type, const std::string& fname)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1091 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1092 rep->add_dispatch (type, fname);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1093 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1094
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1095 void clear_dispatch (const std::string& type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1096 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1097 rep->clear_dispatch (type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1098 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1099
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1100 void print_dispatch (std::ostream& os) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1101 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1102 rep->print_dispatch (os);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1103 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1104
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1105 std::string help_for_dispatch (void) const { return rep->help_for_dispatch (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1106
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1107 dispatch_map_type get_dispatch (void) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1108 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1109 return rep->get_dispatch ();
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3968 diff changeset	1110 }
3011 2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe] jwe parents: 2979 diff changeset	1111
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1112 void
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1113 dump (std::ostream& os, const std::string& prefix = std::string ()) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1114 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1115 rep->dump (os, prefix);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1116 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1117
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1118 private:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1119
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1120 fcn_info_rep *rep;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1121 };
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1122
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1123 static scope_id global_scope (void) { return xglobal_scope; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1124 static scope_id top_scope (void) { return xtop_scope; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1125
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1126 static scope_id current_scope (void) { return xcurrent_scope; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1127
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1128 static context_id current_context (void) { return xcurrent_context; }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1129
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1130 static scope_id alloc_scope (void) { return scope_id_cache::alloc (); }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1131
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1132 static void set_scope (scope_id scope)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1133 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1134 if (scope == xglobal_scope)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1135 error ("can't set scope to global");
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1136 else if (scope != xcurrent_scope)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1137 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1138 all_instances_iterator p = all_instances.find (scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1139
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1140 if (p == all_instances.end ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1141 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1142 symbol_table *inst = new symbol_table (scope);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1143
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1144 if (inst)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1145 all_instances[scope] = instance = inst;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1146 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1147 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1148 instance = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1149
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1150 xcurrent_scope = scope;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1151 xcurrent_context = 0;
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1152 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1153 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1154
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1155 static void set_scope_and_context (scope_id scope, context_id context)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1156 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1157 if (scope == xglobal_scope)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1158 error ("can't set scope to global");
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1159 else
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1160 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1161 if (scope != xcurrent_scope)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1162 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1163 all_instances_iterator p = all_instances.find (scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1164
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1165 if (p == all_instances.end ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1166 error ("scope not found!");
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1167 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1168 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1169 instance = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1170
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1171 xcurrent_scope = scope;
9355 5e4da3b3747e fix context restoration in error state Jaroslav Hajek <highegg@gmail.com> parents: 9315 diff changeset	1172
5e4da3b3747e fix context restoration in error state Jaroslav Hajek <highegg@gmail.com> parents: 9315 diff changeset	1173 xcurrent_context = context;
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1174 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1175 }
9355 5e4da3b3747e fix context restoration in error state Jaroslav Hajek <highegg@gmail.com> parents: 9315 diff changeset	1176 else
5e4da3b3747e fix context restoration in error state Jaroslav Hajek <highegg@gmail.com> parents: 9315 diff changeset	1177 xcurrent_context = context;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1178 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1179 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1180
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1181 static void erase_scope (scope_id scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1182 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1183 assert (scope != xglobal_scope);
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1184
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1185 all_instances_iterator p = all_instances.find (scope);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1186
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1187 if (p != all_instances.end ())
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1188 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1189 delete p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1190
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1191 all_instances.erase (p);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1192
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1193 free_scope (scope);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1194 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1195 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1196
7876 8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1197 static void erase_subfunctions_in_scope (scope_id scope)
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1198 {
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1199 for (fcn_table_iterator q = fcn_table.begin ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1200 q != fcn_table.end (); q++)
7876 8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1201 q->second.erase_subfunction (scope);
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1202 }
8447a5024650 clear subfunctions when clearing parent function John W. Eaton <jwe@octave.org> parents: 7779 diff changeset	1203
11445 40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1204 static void
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1205 mark_subfunctions_in_scope_as_private (scope_id scope,
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1206 const std::string& class_name)
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1207 {
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1208 for (fcn_table_iterator q = fcn_table.begin ();
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1209 q != fcn_table.end (); q++)
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1210 q->second.mark_subfunction_in_scope_as_private (scope, class_name);
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1211 }
40f311a69417 fix OO field access in subfunctions of private functions John W. Eaton <jwe@octave.org> parents: 11238 diff changeset	1212
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1213 static scope_id dup_scope (scope_id scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1214 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1215 scope_id retval = -1;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1216
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1217 symbol_table *inst = get_instance (scope);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1218
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1219 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1220 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1221 scope_id new_scope = alloc_scope ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1222
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1223 symbol_table *new_symbol_table = new symbol_table (scope);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1224
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1225 if (new_symbol_table)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1226 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1227 all_instances[new_scope] = new_symbol_table;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1228
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1229 inst->do_dup_scope (*new_symbol_table);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1230
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1231 retval = new_scope;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1232 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1233 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1234
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1235 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1236 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1237
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1238 static std::list<scope_id> scopes (void)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1239 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1240 return scope_id_cache::scopes ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1241 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1242
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1243 static symbol_record
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1244 find_symbol (const std::string& name, scope_id scope = xcurrent_scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1245 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1246 symbol_table *inst = get_instance (scope);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1247
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1248 return inst ? inst->do_find_symbol (name) :
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1249 symbol_record (scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1250 }
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3968 diff changeset	1251
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1252 static void
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1253 inherit (scope_id scope, scope_id donor_scope, context_id donor_context)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1254 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1255 symbol_table *inst = get_instance (scope);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1256
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1257 if (inst)
8051 36a485f7f335 symtab.h (symbol_table::do_inherit): copy alll symbols from donor scope John W. Eaton <jwe@octave.org> parents: 7972 diff changeset	1258 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1259 symbol_table *donor_symbol_table = get_instance (donor_scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1260
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1261 if (donor_symbol_table)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1262 inst->do_inherit (*donor_symbol_table, donor_context);
8051 36a485f7f335 symtab.h (symbol_table::do_inherit): copy alll symbols from donor scope John W. Eaton <jwe@octave.org> parents: 7972 diff changeset	1263 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1264 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1265
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1266 static bool at_top_level (void) { return xcurrent_scope == xtop_scope; }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1267
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1268 // Find a value corresponding to the given name in the table.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1269 static octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1270 find (const std::string& name,
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	1271 const octave_value_list& args = octave_value_list (),
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1272 bool skip_variables = false,
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1273 bool local_funcs = true);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1274
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1275 static octave_value builtin_find (const std::string& name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	1276
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1277 // Insert a new name in the table.
16320 09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1278 static symbol_record& insert (const std::string& name,
09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1279 scope_id scope = xcurrent_scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1280 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1281 static symbol_record foobar;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1282
16320 09f0cb9cac7d don't modify symbol table scope in the parser John W. Eaton <jwe@octave.org> parents: 16277 diff changeset	1283 symbol_table *inst = get_instance (scope);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3968 diff changeset	1284
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1285 return inst ? inst->do_insert (name) : foobar;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1286 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1287
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1288 static void rename (const std::string& old_name,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1289 const std::string& new_name,
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1290 scope_id scope = xcurrent_scope)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1291 {
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1292 symbol_table *inst = get_instance (scope);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1293
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1294 if (inst)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1295 inst->do_rename (old_name, new_name);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1296 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	1297
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1298 static void assign (const std::string& name,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1299 const octave_value& value = octave_value (),
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1300 scope_id scope = xcurrent_scope,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1301 context_id context = xdefault_context,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1302 bool force_add = false)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1303 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1304 static octave_value foobar;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1305
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1306 symbol_table *inst = get_instance (scope);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1307
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1308 if (inst)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1309 inst->do_assign (name, value, context, force_add);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1310 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1311
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1312 // Use assign (name, value, scope, context, force_add) instead.
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1313 static octave_value&
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1314 varref (const std::string& name, scope_id scope = xcurrent_scope,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1315 context_id context = xdefault_context, bool force_add = false)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1316 GCC_ATTR_DEPRECATED
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1317 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1318 static octave_value foobar;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1319
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1320 symbol_table *inst = get_instance (scope);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1321
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1322 return inst ? inst->do_varref (name, context, force_add) : foobar;
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1323 }
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1324
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1325 // Convenience function to simplify
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1326 // octave_user_function::bind_automatic_vars
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1327
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1328 static void force_assign (const std::string& name,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1329 const octave_value& value = octave_value (),
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1330 scope_id scope = xcurrent_scope,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1331 context_id context = xdefault_context)
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	1332 {
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1333 assign (name, value, scope, context, true);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1334 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1335
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1336 // Use force_assign (name, value, scope, context) instead.
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1337 static octave_value&
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1338 force_varref (const std::string& name, scope_id scope = xcurrent_scope,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1339 context_id context = xdefault_context) GCC_ATTR_DEPRECATED
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1340 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1341 static octave_value foobar;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1342
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1343 symbol_table *inst = get_instance (scope);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1344
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1345 return inst ? inst->do_varref (name, context, true) : foobar;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1346 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1347
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1348 static octave_value varval (const std::string& name,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1349 scope_id scope = xcurrent_scope,
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1350 context_id context = xdefault_context)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1351 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1352 symbol_table *inst = get_instance (scope);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1353
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1354 return inst ? inst->do_varval (name, context) : octave_value ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1355 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1356
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1357 static void
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1358 global_assign (const std::string& name,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1359 const octave_value& value = octave_value ())
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1360
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1361 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1362 global_table_iterator p = global_table.find (name);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1363
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1364 if (p == global_table.end ())
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1365 global_table[name] = value;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1366 else
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1367 p->second = value;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1368 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1369
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1370 // Use global_assign (name, value) instead.
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1371 static octave_value&
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1372 global_varref (const std::string& name) GCC_ATTR_DEPRECATED
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1373
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1374 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1375 global_table_iterator p = global_table.find (name);
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1376
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1377 return (p == global_table.end ()) ? global_table[name] : p->second;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1378 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1379
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1380 static octave_value
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1381 global_varval (const std::string& name)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1382 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1383 global_table_const_iterator p = global_table.find (name);
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1384
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1385 return (p != global_table.end ()) ? p->second : octave_value ();
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1386 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1387
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1388 static void
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1389 top_level_assign (const std::string& name,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1390 const octave_value& value = octave_value ())
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1391 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1392 assign (name, value, top_scope (), 0);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1393 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1394
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1395 // Use top_level_assign (name, value) instead.
10071 e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1396 static octave_value&
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1397 top_level_varref (const std::string& name) GCC_ATTR_DEPRECATED
10071 e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1398 {
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1399 static octave_value foobar;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1400
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1401 symbol_table *inst = get_instance (top_scope ());
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1402
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1403 return inst ? inst->do_varref (name, 0, true) : foobar;
10071 e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1404 }
e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1405
e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1406 static octave_value
e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1407 top_level_varval (const std::string& name)
e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1408 {
e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1409 return varval (name, top_scope (), 0);
e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1410 }
e42b1bbd1052 variables.cc (get_top_level_value, set_top_level_value): new functions John W. Eaton <jwe@octave.org> parents: 9981 diff changeset	1411
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1412 static void
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1413 persistent_assign (const std::string& name,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1414 const octave_value& value = octave_value ())
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1415 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1416 symbol_table *inst = get_instance (xcurrent_scope);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1417
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1418 if (inst)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1419 inst->do_persistent_assign (name, value);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1420 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1421
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1422 // Use persistent_assign (name, value) instead.
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1423 static octave_value& persistent_varref (const std::string& name)
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	1424 GCC_ATTR_DEPRECATED
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1425 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1426 static octave_value foobar;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1427
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1428 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1429
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1430 return inst ? inst->do_persistent_varref (name) : foobar;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1431 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1432
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1433 static octave_value persistent_varval (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1434 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1435 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1436
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1437 return inst ? inst->do_persistent_varval (name) : octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1438 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1439
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1440 static void erase_persistent (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1441 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1442 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1443
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1444 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1445 inst->do_erase_persistent (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1446 }
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	1447
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1448 static bool is_variable (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1449 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1450 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1451
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1452 return inst ? inst->do_is_variable (name) : false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1453 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1454
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1455 static bool
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1456 is_built_in_function_name (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1457 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1458 octave_value val = find_built_in_function (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1459
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1460 return val.is_defined ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1461 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1462
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1463 static octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1464 find_method (const std::string& name, const std::string& dispatch_type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1465 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1466 fcn_table_const_iterator p = fcn_table.find (name);
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	1467
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1468 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1469 return p->second.find_method (dispatch_type);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1470 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1471 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1472 fcn_info finfo (name);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1473
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1474 octave_value fcn = finfo.find_method (dispatch_type);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1475
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1476 if (fcn.is_defined ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1477 fcn_table[name] = finfo;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1478
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1479 return fcn;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1480 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1481 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1482
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1483 static octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1484 find_built_in_function (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1485 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1486 fcn_table_const_iterator p = fcn_table.find (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1487
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1488 return (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1489 ? p->second.find_built_in_function () : octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1490 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1491
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1492 static octave_value
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1493 find_autoload (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1494 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1495 fcn_table_iterator p = fcn_table.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4319 diff changeset	1496
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1497 return (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1498 ? p->second.find_autoload () : octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1499 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1500
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1501 static octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1502 find_function (const std::string& name,
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1503 const octave_value_list& args = octave_value_list (),
d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	1504 bool local_funcs = true);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1505
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1506 static octave_value find_user_function (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1507 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1508 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1509
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1510 return (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1511 ? p->second.find_user_function () : octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1512 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1513
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1514 static void install_cmdline_function (const std::string& name,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1515 const octave_value& fcn)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1516 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1517 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1518
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1519 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1520 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1521 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1522
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1523 finfo.install_cmdline_function (fcn);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1524 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1525 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1526 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1527 fcn_info finfo (name);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1528
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1529 finfo.install_cmdline_function (fcn);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1530
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1531 fcn_table[name] = finfo;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1532 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1533 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1534
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1535 static void install_subfunction (const std::string& name,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1536 const octave_value& fcn,
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1537 scope_id scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1538 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1539 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1540
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1541 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1542 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1543 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1544
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1545 finfo.install_subfunction (fcn, scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1546 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1547 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1548 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1549 fcn_info finfo (name);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1550
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1551 finfo.install_subfunction (fcn, scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1552
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1553 fcn_table[name] = finfo;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1554 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1555 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1556
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1557 static void install_nestfunction (const std::string& name,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1558 const octave_value& fcn,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1559 scope_id parent_scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1560
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1561 static void update_nest (scope_id scope)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1562 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1563 symbol_table *inst = get_instance (scope);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1564 if (inst)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1565 inst->do_update_nest ();
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1566 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1567
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1568 static void install_user_function (const std::string& name,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1569 const octave_value& fcn)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1570 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1571 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1572
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1573 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1574 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1575 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1576
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1577 finfo.install_user_function (fcn);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1578 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1579 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1580 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1581 fcn_info finfo (name);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1582
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1583 finfo.install_user_function (fcn);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1584
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1585 fcn_table[name] = finfo;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1586 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1587 }
605 4f65175911a6 [project @ 1994-08-13 20:10:39 by jwe] jwe parents: 572 diff changeset	1588
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1589 static void install_built_in_function (const std::string& name,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1590 const octave_value& fcn)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1591 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1592 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1593
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1594 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1595 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1596 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1597
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1598 finfo.install_built_in_function (fcn);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1599 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1600 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1601 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1602 fcn_info finfo (name);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1603
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1604 finfo.install_built_in_function (fcn);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1605
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1606 fcn_table[name] = finfo;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1607 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1608 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1609
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1610 static void clear (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1611 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1612 clear_variable (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1613 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1614
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1615 static void clear_all (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1616 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1617 clear_variables ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1618
10559 0ecbb17d130a Clear global variables when 'clear -all' called Rik <code@nomad.inbox5.com> parents: 10521 diff changeset	1619 clear_global_pattern ("*");
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1620
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1621 clear_functions ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1622 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1623
9396 17af7cce7d1b yet more unwind_protect improvements Jaroslav Hajek <highegg@gmail.com> parents: 9355 diff changeset	1624 static void clear_variables (scope_id scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1625 {
8282 47a3d2f829e4 clear local symbol table after parsing function John W. Eaton <jwe@octave.org> parents: 8123 diff changeset	1626 symbol_table *inst = get_instance (scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1627
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1628 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1629 inst->do_clear_variables ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1630 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1631
9396 17af7cce7d1b yet more unwind_protect improvements Jaroslav Hajek <highegg@gmail.com> parents: 9355 diff changeset	1632 // This is split for unwind_protect.
17af7cce7d1b yet more unwind_protect improvements Jaroslav Hajek <highegg@gmail.com> parents: 9355 diff changeset	1633 static void clear_variables (void)
17af7cce7d1b yet more unwind_protect improvements Jaroslav Hajek <highegg@gmail.com> parents: 9355 diff changeset	1634 {
17af7cce7d1b yet more unwind_protect improvements Jaroslav Hajek <highegg@gmail.com> parents: 9355 diff changeset	1635 clear_variables (xcurrent_scope);
17af7cce7d1b yet more unwind_protect improvements Jaroslav Hajek <highegg@gmail.com> parents: 9355 diff changeset	1636 }
17af7cce7d1b yet more unwind_protect improvements Jaroslav Hajek <highegg@gmail.com> parents: 9355 diff changeset	1637
9240 f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	1638 static void clear_objects (scope_id scope = xcurrent_scope)
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	1639 {
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	1640 symbol_table *inst = get_instance (scope);
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	1641
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	1642 if (inst)
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	1643 inst->do_clear_objects ();
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	1644 }
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	1645
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1646 static void clear_functions (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1647 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1648 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1649 p->second.clear ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1650 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1651
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1652 static void clear_function (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1653 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1654 clear_user_function (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1655 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1656
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1657 static void clear_global (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1658 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1659 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1660
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1661 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1662 inst->do_clear_global (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1663 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1664
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1665 static void clear_variable (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1666 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1667 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1668
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1669 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1670 inst->do_clear_variable (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1671 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1672
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1673 static void clear_symbol (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1674 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1675 // FIXME -- are we supposed to do both here?
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1676
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1677 clear_variable (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1678 clear_function (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1679 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1680
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1681 static void clear_function_pattern (const std::string& pat)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1682 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1683 glob_match pattern (pat);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1684
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1685 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1686 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1687 if (pattern.match (p->first))
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1688 p->second.clear_user_function ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1689 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1690 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1691
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1692 static void clear_global_pattern (const std::string& pat)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1693 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1694 symbol_table *inst = get_instance (xcurrent_scope);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3968 diff changeset	1695
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1696 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1697 inst->do_clear_global_pattern (pat);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1698 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1699
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1700 static void clear_variable_pattern (const std::string& pat)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1701 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1702 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1703
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1704 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1705 inst->do_clear_variable_pattern (pat);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1706 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1707
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1708 static void clear_variable_regexp (const std::string& pat)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1709 {
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1710 symbol_table *inst = get_instance (xcurrent_scope);
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1711
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1712 if (inst)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1713 inst->do_clear_variable_regexp (pat);
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1714 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1715
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1716 static void clear_symbol_pattern (const std::string& pat)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1717 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1718 // FIXME -- are we supposed to do both here?
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1719
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1720 clear_variable_pattern (pat);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1721 clear_function_pattern (pat);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1722 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1723
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1724 static void clear_user_function (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1725 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1726 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1727
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1728 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1729 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1730 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1731
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1732 finfo.clear_user_function ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1733 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1734 // FIXME -- is this necessary, or even useful?
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1735 // else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1736 // error ("clear: no such function '%s'", name.c_str ());
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1737 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1738
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1739 // This clears oct and mex files, incl. autoloads.
80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1740 static void clear_dld_function (const std::string& name)
80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1741 {
80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1742 fcn_table_iterator p = fcn_table.find (name);
80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1743
80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1744 if (p != fcn_table.end ())
80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1745 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1746 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1747
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1748 finfo.clear_autoload_function ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1749 finfo.clear_user_function ();
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1750 }
80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1751 }
80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9639 diff changeset	1752
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1753 static void clear_mex_functions (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1754 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1755 for (fcn_table_iterator p = fcn_table.begin (); p != fcn_table.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1756 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1757 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1758
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1759 finfo.clear_mex_function ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1760 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1761 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1762
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	1763 static bool set_class_relationship (const std::string& sup_class,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1764 const std::string& inf_class);
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	1765
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	1766 static bool is_superiorto (const std::string& a, const std::string& b);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	1767
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1768 static void alias_built_in_function (const std::string& alias,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1769 const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1770 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1771 octave_value fcn = find_built_in_function (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1772
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1773 if (fcn.is_defined ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1774 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1775 fcn_info finfo (alias);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1776
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1777 finfo.install_built_in_function (fcn);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1778
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1779 fcn_table[alias] = finfo;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1780 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1781 else
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	1782 panic ("alias: '%s' is undefined", name.c_str ());
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1783 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1784
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1785 static void add_dispatch (const std::string& name, const std::string& type,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1786 const std::string& fname)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1787 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1788 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1789
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1790 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1791 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1792 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1793
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1794 finfo.add_dispatch (type, fname);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1795 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1796 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1797 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1798 fcn_info finfo (name);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1799
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1800 finfo.add_dispatch (type, fname);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1801
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1802 fcn_table[name] = finfo;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1803 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1804 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1805
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1806 static void clear_dispatch (const std::string& name, const std::string& type)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1807 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1808 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1809
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1810 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1811 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1812 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1813
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1814 finfo.clear_dispatch (type);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1815 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1816 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1817
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1818 static void print_dispatch (std::ostream& os, const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1819 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1820 fcn_table_iterator p = fcn_table.find (name);
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3968 diff changeset	1821
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1822 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1823 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1824 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1825
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1826 finfo.print_dispatch (os);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1827 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1828 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1829
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1830 static fcn_info::dispatch_map_type get_dispatch (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1831 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1832 fcn_info::dispatch_map_type retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1833
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1834 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1835
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1836 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1837 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1838 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1839
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1840 retval = finfo.get_dispatch ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1841 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1842
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1843 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1844 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1845
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1846 static std::string help_for_dispatch (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1847 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1848 std::string retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1849
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1850 fcn_table_iterator p = fcn_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1851
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1852 if (p != fcn_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1853 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1854 fcn_info& finfo = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1855
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1856 retval = finfo.help_for_dispatch ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1857 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1858
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1859 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1860 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1861
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1862 static void push_context (void)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1863 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1864 if (xcurrent_scope == xglobal_scope \|\| xcurrent_scope == xtop_scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1865 error ("invalid call to xymtab::push_context");
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1866 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1867 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1868 symbol_table *inst = get_instance (xcurrent_scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1869
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1870 if (inst)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1871 inst->do_push_context ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1872 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1873 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1874
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1875 static void pop_context (void)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1876 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1877 if (xcurrent_scope == xglobal_scope \|\| xcurrent_scope == xtop_scope)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1878 error ("invalid call to xymtab::pop_context");
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1879 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1880 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1881 symbol_table *inst = get_instance (xcurrent_scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1882
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1883 if (inst)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1884 inst->do_pop_context ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1885 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1886 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1887
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1888 // For unwind_protect.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1889 static void pop_context (void *) { pop_context (); }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1890
11557 e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	1891 static void mark_automatic (const std::string& name)
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	1892 {
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	1893 symbol_table *inst = get_instance (xcurrent_scope);
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	1894
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	1895 if (inst)
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	1896 inst->do_mark_automatic (name);
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	1897 }
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	1898
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1899 static void mark_hidden (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1900 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1901 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1902
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1903 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1904 inst->do_mark_hidden (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1905 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1906
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1907 static void mark_global (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1908 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1909 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1910
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1911 if (inst)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1912 inst->do_mark_global (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1913 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1914
15572 859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	1915 // exclude: Storage classes to exclude, you can OR them together
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1916 static std::list<symbol_record>
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	1917 all_variables (scope_id scope = xcurrent_scope,
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1918 context_id context = xdefault_context,
15572 859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	1919 bool defined_only = true,
859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	1920 unsigned int exclude = symbol_record::hidden)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1921 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1922 symbol_table *inst = get_instance (scope);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1923
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1924 return inst
15572 859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	1925 ? inst->do_all_variables (context, defined_only, exclude)
859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	1926 : std::list<symbol_record> ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1927 }
3011 2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe] jwe parents: 2979 diff changeset	1928
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1929 static std::list<symbol_record> glob (const std::string& pattern)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1930 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1931 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1932
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1933 return inst ? inst->do_glob (pattern) : std::list<symbol_record> ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1934 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1935
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1936 static std::list<symbol_record> regexp (const std::string& pattern)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1937 {
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1938 symbol_table *inst = get_instance (xcurrent_scope);
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1939
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1940 return inst ? inst->do_regexp (pattern) : std::list<symbol_record> ();
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1941 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1942
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1943 static std::list<symbol_record> glob_variables (const std::string& pattern)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1944 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1945 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1946
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1947 return inst ? inst->do_glob (pattern, true) : std::list<symbol_record> ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1948 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1949
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1950 static std::list<symbol_record> regexp_variables (const std::string& pattern)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1951 {
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1952 symbol_table *inst = get_instance (xcurrent_scope);
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1953
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1954 return inst ? inst->do_regexp (pattern, true) : std::list<symbol_record> ();
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1955 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1956
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	1957 static std::list<symbol_record>
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1958 glob_global_variables (const std::string& pattern)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1959 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1960 std::list<symbol_record> retval;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1961
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1962 glob_match pat (pattern);
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1963
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	1964 for (global_table_const_iterator p = global_table.begin ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1965 p != global_table.end (); p++)
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1966 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1967 // We generate a list of symbol_record objects so that
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1968 // the results from glob_variables and glob_global_variables
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1969 // may be handled the same way.
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1970
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1971 if (pat.match (p->first))
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1972 retval.push_back (symbol_record (xglobal_scope,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1973 p->first, p->second,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1974 symbol_record::global));
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1975 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1976
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1977 return retval;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1978 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	1979
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1980 static std::list<symbol_record>
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1981 regexp_global_variables (const std::string& pattern)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1982 {
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1983 std::list<symbol_record> retval;
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1984
14024 fc9f204faea0 refactor regexp (bug #34440) John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	1985 ::regexp pat (pattern);
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1986
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1987 for (global_table_const_iterator p = global_table.begin ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1988 p != global_table.end (); p++)
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1989 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1990 // We generate a list of symbol_record objects so that
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1991 // the results from regexp_variables and regexp_global_variables
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1992 // may be handled the same way.
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1993
14024 fc9f204faea0 refactor regexp (bug #34440) John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	1994 if (pat.is_match (p->first))
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1995 retval.push_back (symbol_record (xglobal_scope,
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	1996 p->first, p->second,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1997 symbol_record::global));
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1998 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	1999
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2000 return retval;
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2001 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2002
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2003 static std::list<symbol_record> glob_variables (const string_vector& patterns)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2004 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2005 std::list<symbol_record> retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2006
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2007 size_t len = patterns.length ();
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	2008
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2009 for (size_t i = 0; i < len; i++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2010 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2011 std::list<symbol_record> tmp = glob_variables (patterns[i]);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2012
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2013 retval.insert (retval.begin (), tmp.begin (), tmp.end ());
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2014 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2015
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2016 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2017 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2018
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	2019 static std::list<symbol_record> regexp_variables
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2020 (const string_vector& patterns)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2021 {
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2022 std::list<symbol_record> retval;
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2023
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2024 size_t len = patterns.length ();
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2025
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2026 for (size_t i = 0; i < len; i++)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2027 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2028 std::list<symbol_record> tmp = regexp_variables (patterns[i]);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2029
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2030 retval.insert (retval.begin (), tmp.begin (), tmp.end ());
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2031 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2032
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2033 return retval;
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2034 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2035
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2036 static std::list<std::string> user_function_names (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2037 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2038 std::list<std::string> retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2039
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2040 for (fcn_table_iterator p = fcn_table.begin ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2041 p != fcn_table.end (); p++)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2042 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2043 if (p->second.is_user_function_defined ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2044 retval.push_back (p->first);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2045 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2046
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2047 if (! retval.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2048 retval.sort ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2049
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2050 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2051 }
3011 2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe] jwe parents: 2979 diff changeset	2052
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2053 static std::list<std::string> global_variable_names (void)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2054 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2055 std::list<std::string> retval;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2056
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2057 for (global_table_const_iterator p = global_table.begin ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2058 p != global_table.end (); p++)
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2059 retval.push_back (p->first);
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2060
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2061 retval.sort ();
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2062
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2063 return retval;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2064 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2065
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2066 static std::list<std::string> top_level_variable_names (void)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2067 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2068 symbol_table *inst = get_instance (xtop_scope);
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2069
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2070 return inst ? inst->do_variable_names () : std::list<std::string> ();
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2071 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2072
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2073 static std::list<std::string> variable_names (void)
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2074 {
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2075 symbol_table *inst = get_instance (xcurrent_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2076
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2077 return inst ? inst->do_variable_names () : std::list<std::string> ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2078 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2079
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2080 static std::list<std::string> built_in_function_names (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2081 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2082 std::list<std::string> retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2083
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2084 for (fcn_table_const_iterator p = fcn_table.begin ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2085 p != fcn_table.end (); p++)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2086 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2087 octave_value fcn = p->second.find_built_in_function ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2088
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2089 if (fcn.is_defined ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2090 retval.push_back (p->first);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2091 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2092
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2093 if (! retval.empty ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2094 retval.sort ();
220 f736a3ec137e [project @ 1993-11-14 00:10:26 by jwe] jwe parents: 200 diff changeset	2095
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2096 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2097 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2098
12911 d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2099 static std::list<std::string> cmdline_function_names (void)
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2100 {
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2101 std::list<std::string> retval;
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2102
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2103 for (fcn_table_const_iterator p = fcn_table.begin ();
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2104 p != fcn_table.end (); p++)
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2105 {
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2106 octave_value fcn = p->second.find_cmdline_function ();
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2107
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2108 if (fcn.is_defined ())
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2109 retval.push_back (p->first);
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2110 }
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2111
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2112 if (! retval.empty ())
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2113 retval.sort ();
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2114
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2115 return retval;
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2116 }
d6151d774283 make completion work for command-line functions John W. Eaton <jwe@octave.org> parents: 12130 diff changeset	2117
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2118 static bool is_local_variable (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2119 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2120 if (xcurrent_scope == xglobal_scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2121 return false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2122 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2123 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2124 symbol_table *inst = get_instance (xcurrent_scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2125
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2126 return inst ? inst->do_is_local_variable (name) : false;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2127 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2128 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5823 diff changeset	2129
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2130 static bool is_global (const std::string& name)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2131 {
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2132 if (xcurrent_scope == xglobal_scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2133 return true;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2134 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2135 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2136 symbol_table *inst = get_instance (xcurrent_scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2137
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2138 return inst ? inst->do_is_global (name) : false;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2139 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2140 }
3011 2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe] jwe parents: 2979 diff changeset	2141
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	2142 static std::list<workspace_element> workspace_info (void)
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	2143 {
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	2144 symbol_table *inst = get_instance (xcurrent_scope);
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	2145
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	2146 return inst
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	2147 ? inst->do_workspace_info () : 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	2148 }
0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	2149
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2150 static void dump (std::ostream& os, scope_id scope = xcurrent_scope);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2151
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2152 static void dump_global (std::ostream& os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2153
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2154 static void dump_functions (std::ostream& os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2155
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2156 static void cache_name (scope_id scope, const std::string& name)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2157 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2158 symbol_table *inst = get_instance (scope, false);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2159
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2160 if (inst)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2161 inst->do_cache_name (name);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2162 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2163
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2164 static void lock_subfunctions (scope_id scope = xcurrent_scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2165 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2166 for (fcn_table_iterator p = fcn_table.begin ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2167 p != fcn_table.end (); p++)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2168 p->second.lock_subfunction (scope);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	2169 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2170
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2171 static void unlock_subfunctions (scope_id scope = xcurrent_scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2172 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2173 for (fcn_table_iterator p = fcn_table.begin ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2174 p != fcn_table.end (); p++)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2175 p->second.unlock_subfunction (scope);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	2176 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2177
16596 645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2178 static std::map<std::string, octave_value>
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2179 subfunctions_defined_in_scope (scope_id scope = xcurrent_scope)
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2180 {
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2181 std::map<std::string, octave_value> retval;
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2182
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2183 for (fcn_table_const_iterator p = fcn_table.begin ();
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2184 p != fcn_table.end (); p++)
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2185 {
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2186 std::pair<std::string, octave_value> tmp
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2187 = p->second.subfunction_defined_in_scope (scope);
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2188
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2189 std::string nm = tmp.first;
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2190
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2191 if (! nm.empty ())
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2192 retval[nm] = tmp.second;
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2193 }
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2194
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2195 return retval;
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2196 }
645672f1c873 handle setting breakpoints in subfunctions in GUI editor John W. Eaton <jwe@octave.org> parents: 16502 diff changeset	2197
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2198 static void free_scope (scope_id scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2199 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2200 if (scope == xglobal_scope \|\| scope == xtop_scope)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2201 error ("can't free global or top-level scopes!");
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2202 else
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2203 symbol_table::scope_id_cache::free (scope);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2204 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2205
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8691 diff changeset	2206 static void stash_dir_name_for_subfunctions (scope_id scope,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2207 const std::string& dir_name);
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8691 diff changeset	2208
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2209 static void add_to_parent_map (const std::string& classname,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2210 const std::list<std::string>& parent_list)
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2211 {
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2212 parent_map[classname] = parent_list;
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2213 }
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2214
11238 1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2215 static std::list<std::string>
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2216 parent_classes (const std::string& dispatch_type)
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2217 {
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2218 std::list<std::string> retval;
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2219
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2220 const_parent_map_iterator it = parent_map.find (dispatch_type);
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2221
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2222 if (it != parent_map.end ())
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2223 retval = it->second;
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2224
12130 3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2225 for (std::list<std::string>::const_iterator lit = retval.begin ();
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2226 lit != retval.end (); lit++)
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2227 {
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2228 // Search for parents of parents and append them to the list.
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2229
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2230 // FIXME -- should we worry about a circular inheritance graph?
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2231
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2232 std::list<std::string> parents = parent_classes (*lit);
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2233
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2234 if (! parents.empty ())
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2235 retval.insert (retval.end (), parents.begin (), parents.end ());
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2236 }
3229572cbe23 symbol_table::parent_classes: also add parents of parents to the list John W. Eaton <jwe@octave.org> parents: 12122 diff changeset	2237
11238 1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2238 return retval;
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2239 }
1783b360976f also consider parent classes when checking if class methods are out of date John W. Eaton <jwe@octave.org> parents: 10633 diff changeset	2240
9639 8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2241 static octave_user_function *get_curr_fcn (scope_id scope = xcurrent_scope)
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2242 {
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2243 symbol_table *inst = get_instance (scope);
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2244 return inst->curr_fcn;
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2245 }
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2246
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2247 static void set_curr_fcn (octave_user_function *curr_fcn,
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2248 scope_id scope = xcurrent_scope)
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2249 {
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2250 assert (scope != xtop_scope && scope != xglobal_scope);
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2251 symbol_table *inst = get_instance (scope);
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2252 // FIXME: normally, functions should not usurp each other's scope.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	2253 // If for any incredible reason this is needed, call
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2254 // set_user_function (0, scope) first. This may cause problems with
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2255 // nested functions, as the curr_fcn of symbol_records must be updated.
9639 8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2256 assert (inst->curr_fcn == 0 \|\| curr_fcn == 0);
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2257 inst->curr_fcn = curr_fcn;
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2258 }
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2259
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9958 diff changeset	2260 static void cleanup (void);
692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9958 diff changeset	2261
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	2262 private:
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	2263
12122 f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	2264 // No copying!
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	2265
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	2266 symbol_table (const symbol_table&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	2267
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	2268 symbol_table& operator = (const symbol_table&);
f4689107dd8c Explicitly disallow copying in some classes. Pascal Dupuis <Pascal.Dupuis@uclouvain.be> parents: 11586 diff changeset	2269
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2270 typedef std::map<std::string, symbol_record>::const_iterator table_const_iterator;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2271 typedef std::map<std::string, symbol_record>::iterator table_iterator;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2272
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2273 typedef std::map<std::string, octave_value>::const_iterator global_table_const_iterator;
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2274 typedef std::map<std::string, octave_value>::iterator global_table_iterator;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2275
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2276 typedef std::map<std::string, octave_value>::const_iterator persistent_table_const_iterator;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2277 typedef std::map<std::string, octave_value>::iterator persistent_table_iterator;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2278
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2279 typedef std::map<scope_id, symbol_table*>::const_iterator all_instances_const_iterator;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2280 typedef std::map<scope_id, symbol_table*>::iterator all_instances_iterator;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2281
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2282 typedef std::map<std::string, fcn_info>::const_iterator fcn_table_const_iterator;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2283 typedef std::map<std::string, fcn_info>::iterator fcn_table_iterator;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2284
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2285 // The scope of this symbol table.
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2286 scope_id my_scope;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2287
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2288 // Name for this table (usually the file name of the function
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2289 // corresponding to the scope);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2290 std::string table_name;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2291
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2292 // Map from symbol names to symbol info.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2293 std::map<std::string, symbol_record> table;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2294
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2295 // Child nested functions.
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2296 std::vector<symbol_table*> nest_children;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2297
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2298 // Parent nested function (may be null).
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2299 symbol_table *nest_parent;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2300
9639 8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2301 // The associated user code (may be null).
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2302 octave_user_function *curr_fcn;
8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	2303
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2304 // If true then no variables can be added.
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2305 bool static_workspace;
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2306
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2307 // Map from names of global variables to values.
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2308 static std::map<std::string, octave_value> global_table;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2309
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2310 // Map from names of persistent variables to values.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2311 std::map<std::string, octave_value> persistent_table;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2312
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2313 // Pointer to symbol table for current scope (variables only).
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2314 static symbol_table *instance;
3011 2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe] jwe parents: 2979 diff changeset	2315
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2316 // Map from scope id to symbol table instances.
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2317 static std::map<scope_id, symbol_table*> all_instances;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2318
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2319 // Map from function names to function info (subfunctions, private
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2320 // functions, class constructors, class methods, etc.)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2321 static std::map<std::string, fcn_info> fcn_table;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2322
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	2323 // Mape from class names to set of classes that have lower
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	2324 // precedence.
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	2325 static std::map<std::string, std::set<std::string> > class_precedence_table;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	2326
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	2327 typedef std::map<std::string, std::set<std::string> >::const_iterator class_precedence_table_const_iterator;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	2328 typedef std::map<std::string, std::set<std::string> >::iterator class_precedence_table_iterator;
5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7901 diff changeset	2329
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2330 // Map from class names to parent class names.
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2331 static std::map<std::string, std::list<std::string> > parent_map;
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2332
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2333 typedef std::map<std::string, std::list<std::string> >::const_iterator const_parent_map_iterator;
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2334 typedef std::map<std::string, std::list<std::string> >::iterator parent_map_iterator;
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9509 diff changeset	2335
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2336 static const scope_id xglobal_scope;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2337 static const scope_id xtop_scope;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2338
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2339 static scope_id xcurrent_scope;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2340
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2341 static context_id xcurrent_context;
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2342
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2343 static const context_id xdefault_context = static_cast<context_id> (-1);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2344
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2345 symbol_table (scope_id scope)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2346 : my_scope (scope), table_name (), table (), nest_children (), nest_parent (0),
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2347 curr_fcn (0), static_workspace (false), persistent_table () { }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2348
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2349 ~symbol_table (void) { }
3011 2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe] jwe parents: 2979 diff changeset	2350
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2351 static symbol_table *get_instance (scope_id scope, bool create = true)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2352 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2353 symbol_table *retval = 0;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2354
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2355 bool ok = true;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2356
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	2357 if (scope != xglobal_scope)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2358 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2359 if (scope == xcurrent_scope)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2360 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2361 if (! instance && create)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2362 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2363 symbol_table *inst = new symbol_table (scope);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2364
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2365 if (inst)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2366 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2367 all_instances[scope] = instance = inst;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2368
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2369 if (scope == xtop_scope)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2370 instance->do_cache_name ("top-level");
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2371 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2372 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2373
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2374 if (! instance)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2375 ok = false;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2376
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2377 retval = instance;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2378 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2379 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2380 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2381 all_instances_iterator p = all_instances.find (scope);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2382
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2383 if (p == all_instances.end ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2384 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2385 if (create)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2386 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2387 retval = new symbol_table (scope);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2388
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2389 if (retval)
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2390 all_instances[scope] = retval;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2391 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2392 ok = false;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2393 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2394 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2395 ok = false;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2396 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2397 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2398 retval = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2399 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2400 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2401
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2402 if (! ok)
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2403 error ("unable to %s symbol_table object for scope %d!",
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2404 create ? "create" : "find", scope);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2405
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2406 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2407 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2408
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2409 void add_nest_child (symbol_table& st)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2410 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2411 assert (!st.nest_parent);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2412 nest_children.push_back (&st);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2413 st.nest_parent = this;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2414 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2415
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2416 void insert_symbol_record (const symbol_record& sr)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2417 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2418 table[sr.name ()] = sr;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2419 }
4238 a5a68c0afe56 [project @ 2002-12-25 21:04:33 by jwe] jwe parents: 4234 diff changeset	2420
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4319 diff changeset	2421 void
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2422 do_dup_scope (symbol_table& new_symbol_table) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2423 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2424 for (table_const_iterator p = table.begin (); p != table.end (); p++)
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2425 new_symbol_table.insert_symbol_record (p->second.dup (new_symbol_table.my_scope));
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2426 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2427
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2428 symbol_record do_find_symbol (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2429 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2430 table_iterator p = table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2431
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2432 if (p == table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2433 return do_insert (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2434 else
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2435 return p->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2436 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2437
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8884 diff changeset	2438 void do_inherit (symbol_table& donor_table, context_id donor_context)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2439 {
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8884 diff changeset	2440 for (table_iterator p = table.begin (); p != table.end (); p++)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2441 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2442 symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2443
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2444 if (! (sr.is_automatic () \|\| sr.is_formal ()))
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2445 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2446 std::string nm = sr.name ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2447
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2448 if (nm != "__retval__")
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2449 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2450 octave_value val = donor_table.do_varval (nm, donor_context);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2451
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2452 if (val.is_defined ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2453 {
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2454 sr.assign (val, 0);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2455
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2456 sr.mark_inherited ();
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2457 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2458 }
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2459 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2460 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2461 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2462
9413 5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	2463 static fcn_info *get_fcn_info (const std::string& name)
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	2464 {
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	2465 fcn_table_iterator p = fcn_table.find (name);
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	2466 return p != fcn_table.end () ? &p->second : 0;
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	2467 }
5cd879a0d8c4 speed-up function call by caching its name lookup Jaroslav Hajek <highegg@gmail.com> parents: 9409 diff changeset	2468
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2469 octave_value
9445 c5f03874ea2a simplify symbol_table::find and associated functions Jaroslav Hajek <highegg@gmail.com> parents: 9444 diff changeset	2470 do_find (const std::string& name, const octave_value_list& args,
9463 d34baf412786 support non-local function lookups in str2func Jaroslav Hajek <highegg@gmail.com> parents: 9450 diff changeset	2471 bool skip_variables, bool local_funcs);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2472
9444 0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	2473 octave_value do_builtin_find (const std::string& name);
0c785ad961fa improve behavior of builtin John W. Eaton <jwe@octave.org> parents: 9443 diff changeset	2474
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2475 symbol_record& do_insert (const std::string& name, bool force_add = false)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2476 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2477 table_iterator p = table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2478
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2479 if (p == table.end ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2480 {
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2481 symbol_record ret (my_scope, name);
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2482
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2483 if (nest_parent && nest_parent->look_nonlocal (name, ret))
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2484 return table[name] = ret;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2485 else
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2486 {
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2487 if (static_workspace && ! force_add)
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2488 ret.mark_added_static ();
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2489
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2490 return table[name] = ret;
44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2491 }
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2492 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2493 else
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2494 return p->second;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2495 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2496
16502 45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2497 void do_rename (const std::string& old_name, const std::string& new_name)
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2498 {
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2499 table_iterator p = table.find (old_name);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2500
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2501 if (p != table.end ())
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2502 {
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2503 symbol_record sr = p->second;
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2504
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2505 sr.rename (new_name);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2506
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2507 table.erase (p);
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2508
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2509 table[new_name] = sr;
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2510 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2511 }
45ae1038ee89 allow renaming of variables in workspace viewer John W. Eaton <jwe@octave.org> parents: 16468 diff changeset	2512
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2513 void do_assign (const std::string& name, const octave_value& value,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2514 context_id context, bool force_add)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2515 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2516 table_iterator p = table.find (name);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2517
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2518 if (p == table.end ())
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2519 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2520 symbol_record& sr = do_insert (name, force_add);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2521
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2522 sr.assign (value, context);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2523 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2524 else
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2525 p->second.assign (value, context);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2526 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2527
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2528 // Use do_assign (name, value, context, force_add) instead.
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2529 // Delete when deprecated varref functions are removed.
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2530 octave_value& do_varref (const std::string& name, context_id context,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2531 bool force_add)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2532 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2533 table_iterator p = table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2534
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2535 if (p == table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2536 {
15236 44d6ffdf9479 Disallow new variables in nested functions (bug #36271) Max Brister <max@2bass.com> parents: 15195 diff changeset	2537 symbol_record& sr = do_insert (name, force_add);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2538
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2539 return sr.varref (context);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2540 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2541 else
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	2542 return p->second.varref (context);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2543 }
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4319 diff changeset	2544
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	2545 octave_value do_varval (const std::string& name, context_id context) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2546 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2547 table_const_iterator p = table.find (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2548
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	2549 return (p != table.end ()) ? p->second.varval (context) : octave_value ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2550 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2551
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2552 void do_persistent_assign (const std::string& name,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2553 const octave_value& value)
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2554 {
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2555 persistent_table_iterator p = persistent_table.find (name);
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2556
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2557 if (p == persistent_table.end ())
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2558 persistent_table[name] = value;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2559 else
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2560 p->second = value;
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2561 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2562
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2563 // Use do_persistent_assign (name, value) instead.
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2564 // Delete when deprecated varref functions are removed.
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2565 octave_value& do_persistent_varref (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2566 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2567 persistent_table_iterator p = persistent_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2568
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2569 return (p == persistent_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2570 ? persistent_table[name] : p->second;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2571 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2572
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2573 octave_value do_persistent_varval (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2574 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2575 persistent_table_const_iterator p = persistent_table.find (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2576
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2577 return (p != persistent_table.end ()) ? p->second : octave_value ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2578 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2579
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2580 void do_erase_persistent (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2581 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2582 persistent_table_iterator p = persistent_table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2583
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2584 if (p != persistent_table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2585 persistent_table.erase (p);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2586 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2587
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2588 bool do_is_variable (const std::string& name) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2589 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2590 bool retval = false;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2591
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2592 table_const_iterator p = table.find (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2593
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2594 if (p != table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2595 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2596 const symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2597
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2598 retval = sr.is_variable ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2599 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2600
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2601 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2602 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2603
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2604 void do_push_context (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2605 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2606 for (table_iterator p = table.begin (); p != table.end (); p++)
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2607 p->second.push_context (my_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2608 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2609
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2610 void do_pop_context (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2611 {
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7346 diff changeset	2612 for (table_iterator p = table.begin (); p != table.end (); )
4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7346 diff changeset	2613 {
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2614 if (p->second.pop_context (my_scope) == 0)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2615 table.erase (p++);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2616 else
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2617 p++;
7374 4ff9611147ba [project @ 2008-01-15 00:50:50 by jwe] jwe parents: 7346 diff changeset	2618 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2619 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2620
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2621 void do_clear_variables (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2622 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2623 for (table_iterator p = table.begin (); p != table.end (); p++)
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2624 p->second.clear (my_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2625 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2626
9240 f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	2627 void do_clear_objects (void)
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	2628 {
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	2629 for (table_iterator p = table.begin (); p != table.end (); p++)
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	2630 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2631 symbol_record& sr = p->second;
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	2632 octave_value val = sr.varval ();
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14544 diff changeset	2633 if (val.is_object ())
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2634 p->second.clear (my_scope);
9240 f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	2635 }
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	2636 }
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9144 diff changeset	2637
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2638 void do_clear_global (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2639 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2640 table_iterator p = table.find (name);
4913 c8368716bab3 [project @ 2004-07-23 16:00:48 by jwe] jwe parents: 4319 diff changeset	2641
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2642 if (p != table.end ())
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2643 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2644 symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2645
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2646 if (sr.is_global ())
9315 73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2647 sr.unmark_global ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2648 }
9315 73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2649
73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2650 global_table_iterator q = global_table.find (name);
73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2651
73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2652 if (q != global_table.end ())
73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2653 global_table.erase (q);
73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2654
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2655 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2656
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2657 void do_clear_variable (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2658 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2659 table_iterator p = table.find (name);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2660
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2661 if (p != table.end ())
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2662 p->second.clear (my_scope);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2663 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2664
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2665 void do_clear_global_pattern (const std::string& pat)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2666 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2667 glob_match pattern (pat);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2668
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2669 for (table_iterator p = table.begin (); p != table.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2670 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2671 symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2672
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2673 if (sr.is_global () && pattern.match (sr.name ()))
9315 73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2674 sr.unmark_global ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2675 }
9315 73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2676
11548 50a7935f2512 Don't invalidate iterators when calling std::map::erase, found by cppcheck Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11523 diff changeset	2677
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11584 diff changeset	2678 for (global_table_iterator q = global_table.begin ();
11548 50a7935f2512 Don't invalidate iterators when calling std::map::erase, found by cppcheck Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11523 diff changeset	2679 q != global_table.end ();)
9315 73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2680 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2681 if (pattern.match (q->first))
11548 50a7935f2512 Don't invalidate iterators when calling std::map::erase, found by cppcheck Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11523 diff changeset	2682 global_table.erase (q++); //Gotta be careful to not
50a7935f2512 Don't invalidate iterators when calling std::map::erase, found by cppcheck Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11523 diff changeset	2683 //invalidate iterators
50a7935f2512 Don't invalidate iterators when calling std::map::erase, found by cppcheck Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11523 diff changeset	2684 else
50a7935f2512 Don't invalidate iterators when calling std::map::erase, found by cppcheck Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11523 diff changeset	2685 q++;
9315 73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2686 }
73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2687
73e36b147e45 properly clear global variables Jaroslav Hajek <highegg@gmail.com> parents: 9260 diff changeset	2688
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2689 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2690
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2691 void do_clear_variable_pattern (const std::string& pat)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2692 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2693 glob_match pattern (pat);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2694
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2695 for (table_iterator p = table.begin (); p != table.end (); p++)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2696 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2697 symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2698
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2699 if (sr.is_defined () \|\| sr.is_global ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2700 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2701 if (pattern.match (sr.name ()))
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2702 sr.clear (my_scope);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2703 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2704 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2705 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2706
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2707 void do_clear_variable_regexp (const std::string& pat)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2708 {
14024 fc9f204faea0 refactor regexp (bug #34440) John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	2709 ::regexp pattern (pat);
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2710
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2711 for (table_iterator p = table.begin (); p != table.end (); p++)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2712 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2713 symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2714
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2715 if (sr.is_defined () \|\| sr.is_global ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2716 {
14024 fc9f204faea0 refactor regexp (bug #34440) John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	2717 if (pattern.is_match (sr.name ()))
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2718 sr.clear (my_scope);
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2719 }
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2720 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2721 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2722
11557 e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	2723 void do_mark_automatic (const std::string& name)
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	2724 {
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	2725 do_insert (name).mark_automatic ();
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	2726 }
e9d72a3caa46 mark automatic variables as automatic John W. Eaton <jwe@octave.org> parents: 11548 diff changeset	2727
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2728 void do_mark_hidden (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2729 {
10633 d022061c288d symbol_table minor improvements Jaroslav Hajek <highegg@gmail.com> parents: 10559 diff changeset	2730 do_insert (name).mark_hidden ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2731 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2732
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2733 void do_mark_global (const std::string& name)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2734 {
10633 d022061c288d symbol_table minor improvements Jaroslav Hajek <highegg@gmail.com> parents: 10559 diff changeset	2735 do_insert (name).mark_global ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2736 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2737
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	2738 std::list<symbol_record>
15572 859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	2739 do_all_variables (context_id context, bool defined_only,
859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	2740 unsigned int exclude) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2741 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2742 std::list<symbol_record> retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2743
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2744 for (table_const_iterator p = table.begin (); p != table.end (); p++)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2745 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2746 const symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2747
15572 859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	2748 if ((defined_only && ! sr.is_defined (context))
859c8bf6d134 Fix saved struct with function handle fails to load (bug #33857) Max Brister <max@2bass.com> parents: 15467 diff changeset	2749 \|\| (sr.xstorage_class () & exclude))
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2750 continue;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2751
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2752 retval.push_back (sr);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2753 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2754
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2755 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2756 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2757
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2758 std::list<symbol_record> do_glob (const std::string& pattern,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2759 bool vars_only = false) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2760 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2761 std::list<symbol_record> retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2762
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2763 glob_match pat (pattern);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2764
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2765 for (table_const_iterator p = table.begin (); p != table.end (); p++)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2766 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2767 if (pat.match (p->first))
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2768 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2769 const symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2770
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2771 if (vars_only && ! sr.is_variable ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2772 continue;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2773
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2774 retval.push_back (sr);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2775 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2776 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2777
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2778 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2779 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2780
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2781 std::list<symbol_record> do_regexp (const std::string& pattern,
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2782 bool vars_only = false) const
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2783 {
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2784 std::list<symbol_record> retval;
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2785
14024 fc9f204faea0 refactor regexp (bug #34440) John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	2786 ::regexp pat (pattern);
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2787
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2788 for (table_const_iterator p = table.begin (); p != table.end (); p++)
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2789 {
14024 fc9f204faea0 refactor regexp (bug #34440) John W. Eaton <jwe@octave.org> parents: 13985 diff changeset	2790 if (pat.is_match (p->first))
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2791 {
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2792 const symbol_record& sr = p->second;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2793
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2794 if (vars_only && ! sr.is_variable ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2795 continue;
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2796
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2797 retval.push_back (sr);
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2798 }
7779 791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2799 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2800
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2801 return retval;
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2802 }
791231dac333 Add regexp matching to Fwho and Fclear David Bateman <dbateman@free.fr> parents: 7767 diff changeset	2803
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2804 std::list<std::string> do_variable_names (void)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2805 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2806 std::list<std::string> retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2807
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2808 for (table_const_iterator p = table.begin (); p != table.end (); p++)
9260 9c2349a51218 properly unmark forced variables John W. Eaton <jwe@octave.org> parents: 9240 diff changeset	2809 {
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2810 if (p->second.is_variable ())
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2811 retval.push_back (p->first);
9260 9c2349a51218 properly unmark forced variables John W. Eaton <jwe@octave.org> parents: 9240 diff changeset	2812 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2813
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2814 retval.sort ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2815
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2816 return retval;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2817 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2818
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2819 bool do_is_local_variable (const std::string& name) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2820 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2821 table_const_iterator p = table.find (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2822
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2823 return (p != table.end ()
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2824 && ! p->second.is_global ()
f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2825 && p->second.is_defined ());
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2826 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2827
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2828 bool do_is_global (const std::string& name) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2829 {
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2830 table_const_iterator p = table.find (name);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2831
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2832 return p != table.end () && p->second.is_global ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	2833 }
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2834
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	2835 std::list<workspace_element> 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	2836
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2837 void do_dump (std::ostream& os);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2838
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7753 diff changeset	2839 void do_cache_name (const std::string& name) { table_name = name; }
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2840
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2841 void do_update_nest (void);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2842
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2843 bool look_nonlocal (const std::string& name, symbol_record& result)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2844 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2845 table_iterator p = table.find (name);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2846 if (p == table.end ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2847 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2848 if (nest_parent)
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2849 return nest_parent->look_nonlocal (name, result);
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2850 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2851 else if (! p->second.is_automatic ())
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2852 {
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2853 result = p->second;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2854 return true;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2855 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2856
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2857 return false;
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	2858 }
3011 2ad9af85b89b [project @ 1997-06-01 19:34:20 by jwe] jwe parents: 2979 diff changeset	2859 };
2790 ecc1a12678de [project @ 1997-03-05 02:47:54 by jwe] jwe parents: 2404 diff changeset	2860
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9446 diff changeset	2861 extern bool out_of_date_check (octave_value& function,
9509 c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	2862 const std::string& dispatch_type = std::string (),
c5330ef7aecd fix handles to private functions, simplify out-of-date checks in symtab Jaroslav Hajek <highegg@gmail.com> parents: 9474 diff changeset	2863 bool check_relative = true);
9450 cf714e75c656 implement overloaded function handles Jaroslav Hajek <highegg@gmail.com> parents: 9446 diff changeset	2864
10087 090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 10071 diff changeset	2865 extern OCTINTERP_API std::string
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 10071 diff changeset	2866 get_dispatch_type (const octave_value_list& args);
090173f2db40 improve overload dispatching of built-in classes Jaroslav Hajek <highegg@gmail.com> parents: 10071 diff changeset	2867 extern OCTINTERP_API std::string
10321 97b4bd6f0925 partially rewrite function handles Jaroslav Hajek <highegg@gmail.com> parents: 10313 diff changeset	2868 get_dispatch_type (const octave_value_list& args, builtin_type_t& builtin_type);
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8051 diff changeset	2869
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	2870 #endif

Mercurial > hg > octave-lyh

annotate libinterp/interpfcn/symtab.h @ 16596:645672f1c873