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

annotate libinterp/interpfcn/symtab.h @ 16277:8cb65fd72164

eliminate obsolete concepts of "pending local" and "forced" variables * symtab.h, lexh, lex.ll, oct-parse.in.yy, toplev.cc, input.cc: Delete unused functions and data for handling pending local and forced variables in the parser and lexer.

author	John W. Eaton <jwe@octave.org>
date	Mon, 11 Mar 2013 15:01:32 -0400
parents	859c8bf6d134
children	09f0cb9cac7d

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

Mercurial > octave-nkf

annotate libinterp/interpfcn/symtab.h @ 16277:8cb65fd72164