octave: libinterp/corefcn/symtab.h annotate

annotate libinterp/corefcn/symtab.h @ 21264:dfce76507f4b

Fix dbstop to find subfuncs of old-style class methods (bug #34804). * symtab.cc (find_submethod): New function to find subfunc in old-style class method. * symtab.h (find_method): Call find_submethod if function exists but not found through find_method. * symtab.h (find_submethod): Prototype for new function.

author	Lachlan <lachlanbis@gmail.com>
date	Mon, 15 Feb 2016 14:03:23 -0800
parents	1473547f50f5
children	ae4d7dfea337

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

Mercurial > octave

annotate libinterp/corefcn/symtab.h @ 21264:dfce76507f4b