octave: libinterp/corefcn/symtab.h annotate

annotate libinterp/corefcn/symtab.h @ 23693:b9378eff6d13

move symbol_table class inside octave namespace

author	John W. Eaton <jwe@octave.org>
date	Sun, 25 Jun 2017 09:50:51 -0400
parents	ef71711f6d64
children	08036a7f3660

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
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1993-2017 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
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	9 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	10 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	11 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	12
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22653 diff changeset	16 GNU General Public License for more details.
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	17
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6257 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6257 diff changeset	20 <http://www.gnu.org/licenses/>.
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	21
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	22 */
bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	23
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 20713 diff changeset	24 #if ! defined (octave_symtab_h)
383 0b52c68ec81f [project @ 1994-03-09 21:19:44 by jwe] jwe parents: 276 diff changeset	25 #define octave_symtab_h 1
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	26
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	27 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21139 diff changeset	28
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	29 #include <deque>
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	30 #include <limits>
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	31 #include <list>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	32 #include <map>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	33 #include <set>
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	34 #include <string>
2953 ca7d3625ee01 [project @ 1997-05-09 14:56:52 by jwe] jwe parents: 2948 diff changeset	35
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	36 #include "glob-match.h"
16940 99122191d3dd maint: Rename regexp.h to lo-regexp.h, regexp.cc to lo-regexp.cc in liboctave. Rik <rik@octave.org> parents: 16892 diff changeset	37 #include "lo-regexp.h"
23680 ef71711f6d64 rework __dump_symbol_table__ function John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	38 #include "oct-refcount.h"
2846 52e7c4509983 [project @ 1997-03-26 23:27:35 by jwe] jwe parents: 2791 diff changeset	39
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	40 class tree_argument_list;
9639 8d79f36ebdde store scope->function pointer Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	41 class octave_user_function;
3013 66a1cede95e7 [project @ 1997-06-02 19:35:05 by jwe] jwe parents: 3011 diff changeset	42
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	43 #include "ov.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20791 diff changeset	44 #include "ovl.h"
16468 0f143f68078d use signal/slot for updating workspace instead of using event listener John W. Eaton <jwe@octave.org> parents: 16442 diff changeset	45 #include "workspace-element.h"
1412 5db963ba9614 [project @ 1995-09-15 08:47:17 by jwe] jwe parents: 1315 diff changeset	46
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	47 namespace octave
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	48 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	49 class OCTINTERP_API symbol_table
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	50 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	51 public:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	52
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	53 static octave_value dummy_octave_value;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	54
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	55 typedef size_t context_id;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	56
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	57 class scope;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	58
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	59 class fcn_info;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	60
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	61 class symbol_record
4009 27e461aed956 [project @ 2002-07-31 09:33:03 by jwe] jwe parents: 3968 diff changeset	62 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	63 public:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	64
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	65 // generic variable
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	66 static const unsigned int local = 1;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	67
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	68 // varargin, argn, .nargin., .nargout.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	69 // (FIXME: is this really used now?)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	70 static const unsigned int automatic = 2;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	71
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	72 // formal parameter
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	73 static const unsigned int formal = 4;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	74
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	75 // not listed or cleared (.nargin., .nargout.)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	76 static const unsigned int hidden = 8;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	77
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	78 // inherited from parent scope; not cleared at function exit
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	79 static const unsigned int inherited = 16;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	80
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	81 // global (redirects to global scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	82 static const unsigned int global = 32;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	83
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	84 // not cleared at function exit
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	85 static const unsigned int persistent = 64;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	86
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	87 // this symbol may NOT become a variable.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	88 // (symbol added to a static workspace)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	89 static const unsigned int added_static = 128;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	90
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	91 private:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	92
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	93 class symbol_record_rep
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	94 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	95 public:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	96
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	97 symbol_record_rep (scope *s, const std::string& nm,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	98 const octave_value& v, unsigned int sc)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	99 : m_decl_scope (s), curr_fcn (0), name (nm), value_stack (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	100 storage_class (sc), /* finfo (), */ valid (true), count (1)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	101 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	102 value_stack.push_back (v);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	103 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	104
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	105 // No copying!
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	106
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	107 symbol_record_rep (const symbol_record_rep& ov) = delete;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	108
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	109 symbol_record_rep& operator = (const symbol_record_rep&) = delete;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	110
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	111 ~symbol_record_rep (void) = default;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	112
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	113 void assign (const octave_value& value)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	114 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	115 varref () = value;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	116 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	117
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	118 void assign (octave_value::assign_op op,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	119 const std::string& type,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	120 const std::list<octave_value_list>& idx,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	121 const octave_value& value)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	122 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	123 varref().assign (op, type, idx, value);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	124 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	125
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	126 void assign (octave_value::assign_op op, const octave_value& value)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	127 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	128 varref().assign (op, value);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	129 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	130
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	131 void do_non_const_unary_op (octave_value::unary_op op)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	132 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	133 varref().do_non_const_unary_op (op);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	134 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	135
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	136 void do_non_const_unary_op (octave_value::unary_op op,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	137 const std::string& type,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	138 const std::list<octave_value_list>& idx)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	139 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	140 varref().do_non_const_unary_op (op, type, idx);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	141 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	142
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	143 octave_value& varref (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	144 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	145 context_id context
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	146 = m_decl_scope ? m_decl_scope->current_context () : 0;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	147
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	148 if (is_global ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	149 return xglobal_varref ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	150 else if (is_persistent ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	151 return xpersistent_varref ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	152 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	153 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	154 context_id n = value_stack.size ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	155 while (n++ <= context)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	156 value_stack.push_back (octave_value ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	157
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	158 return value_stack[context];
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	159 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	160 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	161
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	162 octave_value varval (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	163 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	164 context_id context
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	165 = m_decl_scope ? m_decl_scope->current_context () : 0;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	166
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	167 if (is_global ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	168 return xglobal_varval ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	169 else if (is_persistent ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	170 return xpersistent_varval ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	171 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	172 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	173 if (context < value_stack.size ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	174 return value_stack[context];
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	175 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	176 return octave_value ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	177 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	178 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	179
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	180 void push_context (scope *sid)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	181 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	182 if (! (is_persistent () \|\| is_global ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	183 && sid == decl_scope ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	184 value_stack.push_back (octave_value ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	185 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	186
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	187 // If pop_context returns 0, we are out of values and this element
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	188 // of the symbol table should be deleted. This can happen for
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	189 // functions like
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	190 //
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	191 // function foo (n)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	192 // if (n > 0)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	193 // foo (n-1);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	194 // else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	195 // eval ("x = 1");
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	196 // endif
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	197 // endfunction
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	198 //
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	199 // Here, X should only exist in the final stack frame.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	200
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	201 size_t pop_context (scope *sid)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	202 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	203 size_t retval = 1;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	204
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	205 if (! (is_persistent () \|\| is_global ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	206 && sid == decl_scope ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	207 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	208 value_stack.pop_back ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	209 retval = value_stack.size ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	210 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	211
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	212 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	213 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	214
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	215 void clear (void) { clear (decl_scope ()); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	216
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	217 void clear (scope *sid);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	218
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	219 bool is_defined (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	220 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	221 return varval ().is_defined ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	222 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	223
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	224 bool is_valid (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	225 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	226 return valid;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	227 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	228
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	229 bool is_variable (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	230 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	231 return (! is_local () \|\| is_defined ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	232 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	233
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	234 bool is_local (void) const { return storage_class & local; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	235 bool is_automatic (void) const { return storage_class & automatic; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	236 bool is_formal (void) const { return storage_class & formal; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	237 bool is_hidden (void) const { return storage_class & hidden; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	238 bool is_inherited (void) const { return storage_class & inherited; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	239 bool is_global (void) const { return storage_class & global; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	240 bool is_persistent (void) const { return storage_class & persistent; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	241 bool is_added_static (void) const {return storage_class & added_static; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	242
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	243 void mark_local (void) { storage_class \|= local; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	244 void mark_automatic (void) { storage_class \|= automatic; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	245 void mark_formal (void) { storage_class \|= formal; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	246 void mark_hidden (void) { storage_class \|= hidden; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	247 void mark_inherited (void) { storage_class \|= inherited; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	248 void mark_global (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	249 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	250 if (is_persistent ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	251 error ("can't make persistent variable %s global", name.c_str ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	252
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	253 storage_class \|= global;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	254 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	255 void mark_persistent (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	256 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	257 if (is_global ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	258 error ("can't make global variable %s persistent", name.c_str ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	259
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	260 storage_class \|= persistent;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	261 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	262 void mark_added_static (void) { storage_class \|= added_static; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	263
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	264 void unmark_local (void) { storage_class &= ~local; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	265 void unmark_automatic (void) { storage_class &= ~automatic; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	266 void unmark_formal (void) { storage_class &= ~formal; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	267 void unmark_hidden (void) { storage_class &= ~hidden; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	268 void unmark_inherited (void) { storage_class &= ~inherited; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	269 void unmark_global (void) { storage_class &= ~global; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	270 void unmark_persistent (void) { storage_class &= ~persistent; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	271 void unmark_added_static (void) { storage_class &= ~added_static; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	272
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	273 void init_persistent (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	274
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	275 void invalidate (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	276 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	277 valid = false;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	278 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	279
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	280 void erase_persistent (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	281
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	282 scope *decl_scope (void) { return m_decl_scope; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	283
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	284 void set_curr_fcn (octave_user_function *fcn)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	285 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	286 curr_fcn = fcn;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	287 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	288
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	289 symbol_record_rep * dup (scope *new_scope) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	290
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	291 octave_value dump (void) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	292
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	293 scope *m_decl_scope;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	294
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	295 octave_user_function *curr_fcn;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	296
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	297 std::string name;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	298
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	299 std::deque<octave_value> value_stack;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	300
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	301 unsigned int storage_class;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	302
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	303 // fcn_info *finfo;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	304
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	305 bool valid;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	306
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	307 octave::refcount<size_t> count;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	308
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	309 private:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	310
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	311 octave_value& xglobal_varref (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	312
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	313 octave_value& xpersistent_varref (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	314
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	315 octave_value xglobal_varval (void) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	316
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	317 octave_value xpersistent_varval (void) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	318 };
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	319
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	320 public:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	321
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	322 symbol_record (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	323
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	324 symbol_record (scope *s, const std::string& nm = "",
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	325 const octave_value& v = octave_value (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	326 unsigned int sc = local)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	327 : rep (new symbol_record_rep (s, nm, v, sc)) { }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	328
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	329 symbol_record (const symbol_record& sr)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	330 : rep (sr.rep)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	331 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	332 rep->count++;
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	333 }
40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	334
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	335 symbol_record& operator = (const symbol_record& sr)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	336 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	337 if (this != &sr)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	338 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	339 if (--rep->count == 0)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	340 delete rep;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	341
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	342 rep = sr.rep;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	343 rep->count++;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	344 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	345
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	346 return *this;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	347 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	348
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	349 ~symbol_record (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	350 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	351 if (--rep->count == 0)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	352 delete rep;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	353 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	354
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	355 symbol_record dup (scope *sid) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	356 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	357 return symbol_record (rep->dup (sid));
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	358 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	359
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	360 const std::string& name (void) const { return rep->name; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	361
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	362 void rename (const std::string& new_name) { rep->name = new_name; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	363
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	364 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	365 find (const octave_value_list& args = octave_value_list ()) const;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	366
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	367 void assign (const octave_value& value)
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	368 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	369 rep->assign (value);
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	370 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	371
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	372 void assign (octave_value::assign_op op,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	373 const std::string& type,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	374 const std::list<octave_value_list>& idx,
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	375 const octave_value& value)
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	376 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	377 rep->assign (op, type, idx, value);
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	378 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	379
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	380 void assign (octave_value::assign_op op, const octave_value& value)
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	381 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	382 rep->assign (op, value);
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	383 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	384
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	385 void do_non_const_unary_op (octave_value::unary_op op)
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	386 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	387 rep->do_non_const_unary_op (op);
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	388 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	389
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	390 void do_non_const_unary_op (octave_value::unary_op op,
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	391 const std::string& type,
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	392 const std::list<octave_value_list>& idx)
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	393 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	394 rep->do_non_const_unary_op (op, type, idx);
16442 302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	395 }
302157614308 deprecate symbol_table::varref functions John W. Eaton <jwe@octave.org> parents: 16320 diff changeset	396
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	397 // Delete when deprecated varref functions are removed.
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	398 octave_value& varref (void)
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	399 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	400 return rep->varref ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	401 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	402
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	403 octave_value varval (void) const
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	404 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	405 return rep->varval ();
7752 40c428ea3408 initial implementation of dbup and dbdown John W. Eaton <jwe@octave.org> parents: 7489 diff changeset	406 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	407
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	408 void push_context (scope *sid) { rep->push_context (sid); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	409
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	410 size_t pop_context (scope *sid) { return rep->pop_context (sid); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	411
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	412 void clear (void) { rep->clear (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	413
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	414 void clear (scope *sid) { rep->clear (sid); }
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	415
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	416 bool is_defined (void) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	417 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	418 return rep->is_defined ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	419 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	420
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	421 bool is_undefined (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	422 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	423 return ! rep->is_defined ();
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	424 }
71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	425
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	426 bool is_valid (void) const
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	427 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	428 return rep->is_valid ();
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	429 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	430
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	431 bool is_variable (void) const
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7761 diff changeset	432 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	433 return rep->is_variable ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	434 }
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	435
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	436 bool is_local (void) const { return rep->is_local (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	437 bool is_automatic (void) const { return rep->is_automatic (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	438 bool is_formal (void) const { return rep->is_formal (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	439 bool is_global (void) const { return rep->is_global (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	440 bool is_hidden (void) const { return rep->is_hidden (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	441 bool is_inherited (void) const { return rep->is_inherited (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	442 bool is_persistent (void) const { return rep->is_persistent (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	443 bool is_added_static (void) const { return rep->is_added_static (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	444
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	445 void mark_local (void) { rep->mark_local (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	446 void mark_automatic (void) { rep->mark_automatic (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	447 void mark_formal (void) { rep->mark_formal (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	448 void mark_hidden (void) { rep->mark_hidden (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	449 void mark_inherited (void) { rep->mark_inherited (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	450 void mark_global (void) { rep->mark_global (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	451 void mark_persistent (void) { rep->mark_persistent (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	452 void mark_added_static (void) { rep->mark_added_static (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	453
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	454 void unmark_local (void) { rep->unmark_local (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	455 void unmark_automatic (void) { rep->unmark_automatic (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	456 void unmark_formal (void) { rep->unmark_formal (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	457 void unmark_hidden (void) { rep->unmark_hidden (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	458 void unmark_inherited (void) { rep->unmark_inherited (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	459 void unmark_global (void) { rep->unmark_global (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	460 void unmark_persistent (void) { rep->unmark_persistent (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	461 void unmark_added_static (void) { rep->unmark_added_static (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	462
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	463 void init_persistent (void) { rep->init_persistent (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	464
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	465 void erase_persistent (void) { rep->erase_persistent (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	466
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	467 void invalidate (void) { rep->invalidate (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	468
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	469 scope *decl_scope (void) { return rep->decl_scope (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	470
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	471 unsigned int xstorage_class (void) const { return rep->storage_class; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	472
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	473 void set_curr_fcn (octave_user_function *fcn) { rep->set_curr_fcn (fcn); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	474
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	475 octave_value dump (void) const { return rep->dump (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	476
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	477 const symbol_record_rep *xrep (void) const { return rep; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	478
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	479 private:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	480
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	481 symbol_record_rep *rep;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	482
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	483 symbol_record (symbol_record_rep *new_rep) : rep (new_rep) { }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	484 };
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	485
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	486 static symbol_record dummy_symbol_record;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	487
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	488 // Always access a symbol from the current scope.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	489 // Useful for scripts, as they may be executed in more than one scope.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	490 class
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	491 symbol_reference
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	492 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	493 public:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	494
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	495 symbol_reference (void) : m_scope (0), m_context (0) { }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	496
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	497 symbol_reference (const symbol_record& record);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	498
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	499 symbol_reference (const symbol_record& record, scope *curr_scope,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	500 context_id context)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	501 : m_scope (curr_scope), m_context (context), m_sym (record)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	502 { }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	503
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	504 symbol_reference (const symbol_reference& ref) = default;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	505
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	506 symbol_reference& operator = (const symbol_reference& ref) = default;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	507
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	508 bool is_black_hole (void) const { return ! m_scope; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	509
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	510 symbol_table::scope * scope (void) const
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	511 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	512 update ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	513 return m_scope;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	514 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	515
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	516 context_id context (void) const
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	517 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	518 update ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	519 return m_context;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	520 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	521
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	522 // The name is the same regardless of scope.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	523 const std::string& name (void) const { return m_sym.name (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	524
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	525 symbol_record *operator-> (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	526 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	527 update ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	528 return &m_sym;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	529 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	530
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	531 symbol_record *operator-> (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	532 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	533 update ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	534 return &m_sym;
14544 be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	535 }
be18c9e359bf Nested function support (bug #35772) Max Brister <max@2bass.com> parents: 14138 diff changeset	536
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	537 // can be used to place symbol_reference in maps, we don't overload < as
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	538 // it doesn't make any sense for symbol_reference
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	539 struct comparator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	540 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	541 bool operator ()(const symbol_reference& lhs,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	542 const symbol_reference& rhs) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	543 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	544 return lhs.name () < rhs.name ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	545 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	546 };
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	547 private:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	548
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	549 void update (void) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	550
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	551 mutable symbol_table::scope *m_scope;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	552 mutable context_id m_context;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	553 mutable symbol_record m_sym;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	554 };
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	555
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	556 class fcn_info
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	557 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	558 public:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	559
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	560 typedef std::map<std::string, octave_value>::const_iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	561 str_val_const_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	562 typedef std::map<std::string, octave_value>::iterator str_val_iterator;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	563
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	564 private:
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	565
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	566 class fcn_info_rep
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	567 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	568 public:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	569
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	570 fcn_info_rep (const std::string& nm)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	571 : name (nm), package_name (), local_functions (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	572 private_functions (), class_constructors (), class_methods (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	573 cmdline_function (), autoload_function (), function_on_path (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	574 built_in_function (), count (1)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	575 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	576 size_t pos = name.rfind ('.');
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	577
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	578 if (pos != std::string::npos)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	579 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	580 package_name = name.substr (0, pos);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	581 name = name.substr (pos+1);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	582 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	583 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	584
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	585 // No copying!
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	586
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	587 fcn_info_rep (const fcn_info_rep&) = delete;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	588
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	589 fcn_info_rep& operator = (const fcn_info_rep&) = delete;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	590
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	591 ~fcn_info_rep (void) = default;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	592
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	593 octave_value install_local_function (const std::string& file_name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	594
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	595 octave_value load_private_function (const std::string& dir_name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	596
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	597 octave_value load_class_constructor (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	598
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	599 octave_value load_class_method (const std::string& dispatch_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	600
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	601 octave_value find (const octave_value_list& args, bool local_funcs);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	602
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	603 octave_value builtin_find (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	604
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	605 octave_value find_method (const std::string& dispatch_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	606
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	607 octave_value find_autoload (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	608
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	609 octave_value find_package (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	610
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	611 octave_value find_user_function (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	612
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	613 bool is_user_function_defined (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	614 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	615 return function_on_path.is_defined ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	616 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	617
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	618 octave_value find_function (const octave_value_list& args,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	619 bool local_funcs)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	620 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	621 return find (args, local_funcs);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	622 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	623
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	624 void install_cmdline_function (const octave_value& f)
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	625 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	626 cmdline_function = f;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	627 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	628
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	629 void install_local_function (const octave_value& f,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	630 const std::string& file_name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	631 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	632 local_functions[file_name] = f;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	633 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	634
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	635 void install_user_function (const octave_value& f)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	636 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	637 function_on_path = f;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	638 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	639
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	640 void install_built_in_function (const octave_value& f)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	641 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	642 built_in_function = f;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	643 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	644
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	645 void install_built_in_dispatch (const std::string& klass);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	646
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	647 template <typename T>
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	648 void
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	649 clear_map (std::map<T, octave_value>& map, bool force = false)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	650 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	651 typename std::map<T, octave_value>::iterator p = map.begin ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	652
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	653 while (p != map.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	654 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	655 if (force \|\| ! p->second.islocked ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	656 map.erase (p++);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	657 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	658 p++;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	659 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	660 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	661
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	662 void clear_autoload_function (bool force = false)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	663 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	664 if (force \|\| ! autoload_function.islocked ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	665 autoload_function = octave_value ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	666 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	667
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	668 // We also clear command line functions here, as these are both
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	669 // "user defined"
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	670 void clear_user_function (bool force = false)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	671 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	672 clear_autoload_function (force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	673
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	674 if (force \|\| ! function_on_path.islocked ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	675 function_on_path = octave_value ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	676
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	677 if (force \|\| ! cmdline_function.islocked ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	678 cmdline_function = octave_value ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	679 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	680
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	681 void clear_mex_function (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	682 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	683 if (function_on_path.is_mex_function ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	684 clear_user_function ();
10313 f3b65e1ae355 untabify src header files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	685 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	686
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	687 void clear_package (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	688 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	689 package = octave_value ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	690 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	691
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	692 void clear (bool force = false)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	693 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	694 clear_map (local_functions, force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	695 clear_map (private_functions, force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	696 clear_map (class_constructors, force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	697 clear_map (class_methods, force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	698
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	699 clear_autoload_function (force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	700 clear_user_function (force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	701 clear_package ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	702 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	703
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	704 octave_value dump (void) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	705
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	706 std::string full_name (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	707 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	708 if (package_name.empty ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	709 return name;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	710 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	711 return package_name + "." + name;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	712 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	713
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	714 std::string name;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	715
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	716 std::string package_name;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	717
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	718 // File name to function object.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	719 std::map<std::string, octave_value> local_functions;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	720
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	721 // Directory name to function object.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	722 std::map<std::string, octave_value> private_functions;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	723
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	724 // Class name to function object.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	725 std::map<std::string, octave_value> class_constructors;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	726
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	727 // Dispatch type to function object.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	728 std::map<std::string, octave_value> class_methods;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	729
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	730 octave_value cmdline_function;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	731
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	732 octave_value autoload_function;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	733
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	734 octave_value function_on_path;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	735
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	736 octave_value package;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	737
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	738 octave_value built_in_function;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	739
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	740 octave::refcount<size_t> count;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	741
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	742 private:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	743
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	744 octave_value xfind (const octave_value_list& args, bool local_funcs);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	745
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	746 octave_value x_builtin_find (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	747 };
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	748
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	749 public:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	750
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	751 fcn_info (const std::string& nm = "")
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	752 : rep (new fcn_info_rep (nm)) { }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	753
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	754 fcn_info (const fcn_info& fi) : rep (fi.rep)
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	755 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	756 rep->count++;
14912 3d3c002ccc60 Add symbol_table::symbol_record_ref Max Brister <max@2bass.com> parents: 14899 diff changeset	757 }
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	758
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	759 fcn_info& operator = (const fcn_info& fi)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	760 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	761 if (this != &fi)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	762 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	763 if (--rep->count == 0)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	764 delete rep;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	765
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	766 rep = fi.rep;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	767 rep->count++;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	768 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	769
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	770 return *this;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	771 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	772
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	773 ~fcn_info (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	774 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	775 if (--rep->count == 0)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	776 delete rep;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	777 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	778
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	779 octave_value find (const octave_value_list& args = octave_value_list (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	780 bool local_funcs = true)
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16676 diff changeset	781 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	782 return rep->find (args, local_funcs);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	783 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	784
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	785 octave_value builtin_find (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	786 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	787 return rep->builtin_find ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	788 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	789
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	790 octave_value find_method (const std::string& dispatch_type) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	791 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	792 return rep->find_method (dispatch_type);
16684 edbb123cbe3a Correct handling of package context in symbol table. Michael Goffioul <michael.goffioul@gmail.com> parents: 16676 diff changeset	793 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	794
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	795 octave_value find_built_in_function (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	796 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	797 return rep->built_in_function;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	798 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	799
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	800 octave_value find_cmdline_function (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	801 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	802 return rep->cmdline_function;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	803 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	804
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	805 octave_value find_autoload (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	806 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	807 return rep->find_autoload ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	808 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	809
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	810 octave_value find_user_function (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	811 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	812 return rep->find_user_function ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	813 }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	814
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	815 bool is_user_function_defined (void) const
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	816 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	817 return rep->is_user_function_defined ();
7336 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
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	820 octave_value find_function (const octave_value_list& args
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	821 = octave_value_list (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	822 bool local_funcs = true)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	823 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	824 return rep->find_function (args, local_funcs);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	825 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	826
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	827 void install_cmdline_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	828 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	829 rep->install_cmdline_function (f);
7336 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
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	832 void install_local_function (const octave_value& f,
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	833 const std::string& file_name)
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	834 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	835 rep->install_local_function (f, file_name);
23343 49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	836 }
49f051ef6f2f local functions in classdef files (bug #41723) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	837
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	838 void install_user_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	839 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	840 rep->install_user_function (f);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	841 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	842
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	843 void install_built_in_function (const octave_value& f)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	844 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	845 rep->install_built_in_function (f);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	846 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	847
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	848 void install_built_in_dispatch (const std::string& klass)
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	849 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	850 rep->install_built_in_dispatch (klass);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	851 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	852
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	853 void clear (bool force = false) { rep->clear (force); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	854
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	855 void clear_user_function (bool force = false)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	856 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	857 rep->clear_user_function (force);
7489 8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	858 }
8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	859
16605 2f8fb02a6c31 erase subfunctions when primary function scope is deleted (bug #38691) John W. Eaton <jwe@octave.org> parents: 16596 diff changeset	860 void clear_autoload_function (bool force = false)
7489 8e4592e49fa7 don't clear locked functions John W. Eaton <jwe@octave.org> parents: 7374 diff changeset	861 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	862 rep->clear_autoload_function (force);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	863 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	864
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	865 void clear_mex_function (void) { rep->clear_mex_function (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	866
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	867 octave_value dump (void) const { return rep->dump (); }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	868
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	869 private:
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	870
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	871 fcn_info_rep *rep;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	872 };
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7067 diff changeset	873
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	874 symbol_table (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	875 : m_global_symbols (), m_fcn_table (), m_class_precedence_table (),
23602 214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	876 m_parent_map (), m_global_scope (new scope ("global scope")),
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	877 m_top_scope (new scope ("top scope")),
214cb58ccc1c use pointer to scope instead of scope id John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	878 m_current_scope (m_top_scope)
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	879 { }
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	880
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	881 // No copying!
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	882
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	883 symbol_table (const symbol_table&) = delete;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	884
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	885 symbol_table& operator = (const symbol_table&) = delete;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	886
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	887 ~symbol_table (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	888 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	889 delete m_top_scope;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	890 delete m_global_scope;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	891 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	892
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	893 scope *global_scope (void) { return m_global_scope; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	894 scope *top_scope (void) { return m_top_scope; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	895
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	896 scope *current_scope (void) { return m_current_scope; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	897
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	898 scope *require_current_scope (const std::string& who)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	899 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	900 if (! m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	901 error ("%s: missing scope", who.c_str ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	902
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	903 return m_current_scope;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	904 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	905
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	906 context_id current_context (void) const
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	907 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	908 return m_current_scope ? m_current_scope->current_context () : 0;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	909 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	910
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	911 void set_scope (scope *sid)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	912 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	913 set_scope_and_context (sid, 0);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	914 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	915
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	916 void set_scope_and_context (scope *sid, context_id context)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	917 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	918 if (sid == m_global_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	919 error ("can't set scope to global");
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	920
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	921 m_current_scope = sid;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	922
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	923 if (m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	924 m_current_scope->set_context (context);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	925 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	926
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	927 symbol_record find_symbol (const std::string& name, scope *sid)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	928 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	929 return sid ? sid->find_symbol (name) : symbol_record ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	930 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	931
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	932 symbol_record find_symbol (const std::string& name)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	933 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	934 return find_symbol (name, m_current_scope);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	935 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	936
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	937 void inherit (scope recipient_scope, scope donor_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	938 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	939 if (recipient_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	940 recipient_scope->inherit (donor_scope);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	941 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	942
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	943 void inherit (scope *recipient_scope)
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23610 diff changeset	944 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	945 inherit (recipient_scope, m_current_scope);
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23610 diff changeset	946 }
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23610 diff changeset	947
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	948 bool at_top_level (void) { return m_current_scope == m_top_scope; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	949
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	950 // Find a value corresponding to the given name in the table.
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	951 octave_value
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	952 find (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	953 const octave_value_list& args = octave_value_list (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	954 bool skip_variables = false,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	955 bool local_funcs = true);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	956
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	957 octave_value builtin_find (const std::string& name);
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	958
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	959 void
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	960 global_assign (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	961 const octave_value& value = octave_value ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	962
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	963 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	964 global_symbols_iterator p = m_global_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	965
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	966 if (p == m_global_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	967 m_global_symbols[name] = value;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	968 else
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	969 p->second = value;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	970 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	971
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	972 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	973 global_varval (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	974 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	975 global_symbols_const_iterator p = m_global_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	976
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	977 return (p != m_global_symbols.end ()) ? p->second : octave_value ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	978 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	979
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	980 void
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	981 top_level_assign (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	982 const octave_value& value = octave_value ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	983 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	984 m_top_scope->assign (name, value);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	985 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	986
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	987 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	988 top_level_varval (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	989 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	990 return m_top_scope->varval (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	991 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	992
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	993 bool
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	994 is_built_in_function_name (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	995 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	996 octave_value val = find_built_in_function (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	997
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	998 return val.is_defined ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	999 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1000
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1001 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1002 find_method (const std::string& name, const std::string& dispatch_type)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1003 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1004 fcn_table_const_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1005
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1006 if (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1007 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1008 octave_value fcn = p->second.find_method (dispatch_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1009
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1010 if (! fcn.is_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1011 fcn = find_submethod (name, dispatch_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1012
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1013 return fcn;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1014 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1015 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1016 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1017 fcn_info finfo (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1018
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1019 octave_value fcn = finfo.find_method (dispatch_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1020
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1021 if (! fcn.is_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1022 fcn = find_submethod (name, dispatch_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1023
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1024 if (fcn.is_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1025 m_fcn_table[name] = finfo;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1026
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1027 return fcn;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1028 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1029 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1030
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1031 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1032 find_submethod (const std::string& name, const std::string& dispatch_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1033
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1034 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1035 find_built_in_function (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1036 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1037 fcn_table_const_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1038
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1039 return (p != m_fcn_table.end ()
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1040 ? p->second.find_built_in_function () : octave_value ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1041 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1042
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1043 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1044 find_autoload (const std::string& name)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1045 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1046 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1047
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1048 return (p != m_fcn_table.end ()
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1049 ? p->second.find_autoload () : octave_value ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1050 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1051
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1052 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1053 find_function (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1054 const octave_value_list& args = octave_value_list (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1055 bool local_funcs = true);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1056
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1057 octave_value find_user_function (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1058 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1059 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1060
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1061 return (p != m_fcn_table.end ()
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1062 ? p->second.find_user_function () : octave_value ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1063 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1064
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1065 octave_value find_cmdline_function (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1066 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1067 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1068
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1069 return (p != m_fcn_table.end ()
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1070 ? p->second.find_cmdline_function () : octave_value ());
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1071 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1072
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1073 void install_cmdline_function (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1074 const octave_value& fcn)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1075 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1076 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1077
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1078 if (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1079 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1080 fcn_info& finfo = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1081
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1082 finfo.install_cmdline_function (fcn);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1083 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1084 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1085 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1086 fcn_info finfo (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1087
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1088 finfo.install_cmdline_function (fcn);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1089
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1090 m_fcn_table[name] = finfo;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1091 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1092 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1093
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1094 // Install local function FCN named NAME. FILE_NAME is the name of
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1095 // the file containing the local function.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1096
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1097 void install_local_function (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1098 const octave_value& fcn,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1099 const std::string& file_name)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1100 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1101 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1102
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1103 if (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1104 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1105 fcn_info& finfo = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1106
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1107 finfo.install_local_function (fcn, file_name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1108 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1109 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1110 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1111 fcn_info finfo (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1112
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1113 finfo.install_local_function (fcn, file_name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1114
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1115 m_fcn_table[name] = finfo;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1116 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1117 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1118
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1119 void install_user_function (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1120 const octave_value& fcn)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1121 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1122 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1123
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1124 if (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1125 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1126 fcn_info& finfo = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1127
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1128 finfo.install_user_function (fcn);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1129 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1130 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1131 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1132 fcn_info finfo (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1133
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1134 finfo.install_user_function (fcn);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1135
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1136 m_fcn_table[name] = finfo;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1137 }
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1138 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1139
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1140 void install_built_in_function (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1141 const octave_value& fcn)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1142 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1143 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1144
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1145 if (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1146 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1147 fcn_info& finfo = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1148
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1149 finfo.install_built_in_function (fcn);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1150 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1151 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1152 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1153 fcn_info finfo (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1154
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1155 finfo.install_built_in_function (fcn);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1156
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1157 m_fcn_table[name] = finfo;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1158 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1159 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1160
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1161 void clear_all (bool force = false)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1162 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1163 if (m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1164 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1165 m_current_scope->clear_variables ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1166 m_current_scope->clear_global_pattern ("*");
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1167 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1168
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1169 clear_functions (force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1170 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1171
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1172 // This is written as two separate functions instead of a single
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1173 // function with default values so that it will work properly with
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1174 // unwind_protect.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1175
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1176 void clear_functions (bool force = false)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1177 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1178 fcn_table_iterator p = m_fcn_table.begin ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1179
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1180 while (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1181 (p++)->second.clear (force);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1182 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1183
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1184 void clear_function (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1185 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1186 clear_user_function (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1187 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1188
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1189 void clear_symbol (const std::string& name)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1190 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1191 // FIXME: are we supposed to do both here?
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1192
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1193 if (m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1194 m_current_scope->clear_variable (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1195
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1196 clear_function (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1197 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1198
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1199 void clear_function_pattern (const std::string& pat)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1200 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1201 glob_match pattern (pat);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1202
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1203 fcn_table_iterator p = m_fcn_table.begin ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1204
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1205 while (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1206 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1207 if (pattern.match (p->first))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1208 (p++)->second.clear_user_function ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1209 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1210 p++;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1211 }
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1212 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1213
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1214 void clear_symbol_pattern (const std::string& pat)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1215 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1216 // FIXME: are we supposed to do both here?
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1217
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1218 if (m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1219 m_current_scope->clear_variable_pattern (pat);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1220
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1221 clear_function_pattern (pat);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1222 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1223
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1224 void clear_user_function (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1225 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1226 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1227
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1228 if (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1229 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1230 fcn_info& finfo = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1231
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1232 finfo.clear_user_function ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1233 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1234 // FIXME: is this necessary, or even useful?
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1235 // else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1236 // error ("clear: no such function '%s'", name.c_str ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1237 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1238
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1239 // This clears oct and mex files, including autoloads.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1240 void clear_dld_function (const std::string& name)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1241 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1242 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1243
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1244 if (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1245 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1246 fcn_info& finfo = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1247
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1248 finfo.clear_autoload_function ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1249 finfo.clear_user_function ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1250 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1251 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1252
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1253 void clear_mex_functions (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1254 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1255 fcn_table_iterator p = m_fcn_table.begin ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1256
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1257 while (p != m_fcn_table.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1258 (p++)->second.clear_mex_function ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1259 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1260
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1261 bool set_class_relationship (const std::string& sup_class,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1262 const std::string& inf_class);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1263
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1264 bool is_superiorto (const std::string& a, const std::string& b);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1265
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1266 void alias_built_in_function (const std::string& alias,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1267 const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1268 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1269 octave_value fcn = find_built_in_function (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1270
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1271 if (fcn.is_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1272 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1273 fcn_info finfo (alias);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1274
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1275 finfo.install_built_in_function (fcn);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1276
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1277 m_fcn_table[alias] = finfo;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1278 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1279 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1280 panic ("alias: '%s' is undefined", name.c_str ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1281 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1282
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1283 void install_built_in_dispatch (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1284 const std::string& klass)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1285 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1286 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1287
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1288 if (p != m_fcn_table.end ())
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1289 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1290 fcn_info& finfo = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1291
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1292 finfo.install_built_in_dispatch (klass);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1293 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1294 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1295 error ("install_built_in_dispatch: '%s' is undefined", name.c_str ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1296 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1297
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1298 void push_context (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1299 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1300 if (m_current_scope == m_top_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1301 error ("invalid call to symtab::push_context");
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1302
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1303 if (m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1304 m_current_scope->push_context ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1305 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1306
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1307 // This is written as two separate functions instead of a single
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1308 // function with default values so that it will work properly with
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1309 // unwind_protect.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1310
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1311 void pop_context (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1312 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1313 if (m_current_scope == m_top_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1314 error ("invalid call to symtab::pop_context");
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1315
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1316 if (m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1317 m_current_scope->pop_context ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1318 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1319
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1320 // For unwind_protect where a pointer argument is needed.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1321
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1322 void pop_context (void *) { pop_context (); }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1323
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1324 std::list<symbol_record> glob (const std::string& pattern)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1325 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1326 return (m_current_scope
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1327 ? m_current_scope->glob (pattern) : std::list<symbol_record> ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1328 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1329
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1330 std::list<symbol_record>
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1331 glob_global_variables (const std::string& pattern)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1332 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1333 std::list<symbol_record> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1334
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1335 glob_match pat (pattern);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1336
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1337 for (const auto& nm_val : m_global_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1338 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1339 // We generate a list of symbol_record objects so that the results from
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1340 // glob_variables and glob_global_variables may be handled the same
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1341 // way.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1342 if (pat.match (nm_val.first))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1343 retval.push_back (symbol_record (m_global_scope,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1344 nm_val.first, nm_val.second,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1345 symbol_record::global));
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1346 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1347
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1348 return retval;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1349 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1350
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1351 std::list<symbol_record>
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1352 regexp_global_variables (const std::string& pattern)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1353 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1354 std::list<symbol_record> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1355
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1356 octave::regexp pat (pattern);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1357
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1358 for (const auto& nm_val : m_global_symbols)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1359 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1360 // We generate a list of symbol_record objects so that the results from
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1361 // regexp_variables and regexp_global_variables may be handled the same
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1362 // way.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1363 if (pat.is_match (nm_val.first))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1364 retval.push_back (symbol_record (m_global_scope,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1365 nm_val.first, nm_val.second,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1366 symbol_record::global));
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1367 }
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1368
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1369 return retval;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1370 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1371
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1372 std::list<symbol_record> glob_variables (const string_vector& patterns)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1373 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1374 std::list<symbol_record> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1375
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1376 if (! m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1377 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1378
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1379 size_t len = patterns.numel ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1380
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1381 for (size_t i = 0; i < len; i++)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1382 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1383 std::list<symbol_record> tmp = m_current_scope->glob (patterns[i]);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1384
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1385 retval.insert (retval.begin (), tmp.begin (), tmp.end ());
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1386 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1387
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1388 return retval;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1389 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1390
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1391 std::list<symbol_record> regexp_variables (const string_vector& patterns)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1392 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1393 std::list<symbol_record> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1394
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1395 if (! m_current_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1396 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1397
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1398 size_t len = patterns.numel ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1399
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1400 for (size_t i = 0; i < len; i++)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1401 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1402 std::list<symbol_record> tmp = m_current_scope->regexp (patterns[i]);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1403
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1404 retval.insert (retval.begin (), tmp.begin (), tmp.end ());
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1405 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1406
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1407 return retval;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1408 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1409
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1410 std::list<std::string> user_function_names (void)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1411 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1412 std::list<std::string> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1413
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1414 for (const auto& nm_finfo : m_fcn_table)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1415 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1416 if (nm_finfo.second.is_user_function_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1417 retval.push_back (nm_finfo.first);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1418 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1419
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1420 if (! retval.empty ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1421 retval.sort ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1422
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1423 return retval;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1424 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1425
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1426 std::list<std::string> global_variable_names (void)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1427 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1428 std::list<std::string> retval;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1429
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1430 for (const auto& nm_val : m_global_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1431 retval.push_back (nm_val.first);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1432
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1433 retval.sort ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1434
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1435 return retval;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1436 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1437
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1438 std::list<std::string> top_level_variable_names (void)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1439 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1440 return (m_top_scope
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1441 ? m_top_scope->variable_names () : std::list<std::string> ());
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1442 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1443
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1444 std::list<std::string> variable_names (void)
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23610 diff changeset	1445 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1446 return (m_current_scope
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1447 ? m_current_scope->variable_names () : std::list<std::string> ());
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23610 diff changeset	1448 }
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23610 diff changeset	1449
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1450 std::list<std::string> built_in_function_names (void)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1451 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1452 std::list<std::string> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1453
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1454 for (const auto& nm_finfo : m_fcn_table)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1455 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1456 octave_value fcn = nm_finfo.second.find_built_in_function ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1457
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1458 if (fcn.is_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1459 retval.push_back (nm_finfo.first);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1460 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1461
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1462 if (! retval.empty ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1463 retval.sort ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1464
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1465 return retval;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1466 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1467
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1468 std::list<std::string> cmdline_function_names (void)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1469 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1470 std::list<std::string> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1471
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1472 for (const auto& nm_finfo : m_fcn_table)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1473 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1474 octave_value fcn = nm_finfo.second.find_cmdline_function ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1475
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1476 if (fcn.is_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1477 retval.push_back (nm_finfo.first);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1478 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1479
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1480 if (! retval.empty ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1481 retval.sort ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1482
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1483 return retval;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1484 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1485
23680 ef71711f6d64 rework __dump_symbol_table__ function John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	1486 octave_value dump (void) const;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	1487
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1488 void add_to_parent_map (const std::string& classname,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1489 const std::list<std::string>& parent_list)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1490 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1491 m_parent_map[classname] = parent_list;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1492 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1493
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1494 std::list<std::string>
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1495 parent_classes (const std::string& dispatch_type)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1496 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1497 std::list<std::string> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1498
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1499 const_parent_map_iterator it = m_parent_map.find (dispatch_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1500
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1501 if (it != m_parent_map.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1502 retval = it->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1503
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1504 for (const auto& nm : retval)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1505 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1506 // Search for parents of parents and append them to the list.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1507
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1508 // FIXME: should we worry about a circular inheritance graph?
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1509
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1510 std::list<std::string> parents = parent_classes (nm);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1511
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1512 if (! parents.empty ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1513 retval.insert (retval.end (), parents.begin (), parents.end ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1514 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1515
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1516 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1517 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1518
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1519 octave_user_function * get_curr_fcn (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1520 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1521 return m_current_scope ? m_current_scope->function () : 0;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1522 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1523
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1524 void cleanup (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1525
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1526 fcn_info * get_fcn_info (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1527 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1528 fcn_table_iterator p = m_fcn_table.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1529 return p != m_fcn_table.end () ? &p->second : 0;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1530 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1531
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1532 class scope
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1533 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1534 public:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1535
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1536 typedef std::map<std::string, symbol_table::symbol_record>::const_iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1537 table_const_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1538 typedef std::map<std::string, symbol_table::symbol_record>::iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1539 table_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1540
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1541 typedef std::map<std::string, octave_value>::const_iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1542 m_persistent_symbols_const_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1543 typedef std::map<std::string, octave_value>::iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1544 m_persistent_symbols_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1545
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1546 typedef std::map<std::string, octave_value>::const_iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1547 subfunctions_const_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1548 typedef std::map<std::string, octave_value>::iterator subfunctions_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1549
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1550 scope (const std::string& name = "")
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1551 : m_name (name), m_symbols (), m_persistent_symbols (), m_subfunctions (),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1552 m_fcn (0), m_parent (0), m_children (), m_is_nested (false),
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1553 m_is_static (false), m_context (0)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1554 { }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1555
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1556 // No copying!
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1557
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1558 scope (const scope&) = delete;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1559
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1560 scope& operator = (const scope&) = delete;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1561
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1562 ~scope (void) = default;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1563
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1564 void insert_symbol_record (const symbol_table::symbol_record& sr)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1565 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1566 m_symbols[sr.name ()] = sr;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1567 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1568
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1569 bool is_nested (void) const { return m_is_nested; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1570
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1571 void mark_nested (void) { m_is_nested = true; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1572
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1573 scope * parent_scope (void) const { return m_parent; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1574
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1575 scope * dup (void) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1576 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1577 scope *new_sid = new scope ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1578
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1579 for (const auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1580 new_sid->insert_symbol_record (nm_sr.second.dup (new_sid));
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1581
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1582 new_sid->m_parent = m_parent;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1583
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1584 return new_sid;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1585 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1586
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1587 void set_context (context_id context) { m_context = context; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1588
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1589 context_id current_context (void) const { return m_context; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1590
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1591 symbol_table::symbol_record find_symbol (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1592 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1593 table_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1594
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1595 if (p == m_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1596 return insert (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1597 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1598 return p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1599 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1600
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1601 void inherit_internal (scope& donor_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1602 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1603 for (auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1604 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1605 symbol_table::symbol_record& sr = nm_sr.second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1606
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1607 if (! (sr.is_automatic () \|\| sr.is_formal ()))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1608 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1609 std::string nm = sr.name ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1610
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1611 if (nm != "__retval__")
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1612 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1613 octave_value val = donor_scope.varval (nm);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1614
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1615 if (val.is_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1616 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1617 sr.assign (val);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1618
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1619 sr.mark_inherited ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1620 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1621 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1622 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1623 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1624 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1625
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1626 void inherit (scope *donor_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1627 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1628 while (donor_scope)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1629 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1630 inherit_internal (*donor_scope);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1631
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1632 if (donor_scope->is_nested ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1633 donor_scope = donor_scope->parent_scope ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1634 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1635 break;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1636 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1637 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1638
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1639
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1640 octave_value
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1641 find (const std::string& name, const octave_value_list& args,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1642 bool skip_variables, bool local_funcs);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1643
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1644 octave_value builtin_find (const std::string& name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1645
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1646 symbol_table::symbol_record&
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1647 insert (const std::string& name, bool force_add = false);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1648
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1649 void rename (const std::string& old_name, const std::string& new_name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1650 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1651 table_iterator p = m_symbols.find (old_name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1652
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1653 if (p != m_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1654 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1655 symbol_table::symbol_record sr = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1656
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1657 sr.rename (new_name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1658
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1659 m_symbols.erase (p);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1660
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1661 m_symbols[new_name] = sr;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1662 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1663 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1664
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1665 void assign (const std::string& name, const octave_value& value,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1666 bool force_add)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1667 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1668 table_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1669
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1670 if (p == m_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1671 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1672 symbol_table::symbol_record& sr = insert (name, force_add);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1673
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1674 sr.assign (value);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1675 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1676 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1677 p->second.assign (value);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1678 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1679
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1680 void assign (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1681 const octave_value& value = octave_value ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1682 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1683 assign (name, value, false);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1684 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1685
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1686 void force_assign (const std::string& name, const octave_value& value)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1687 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1688 table_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1689
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1690 if (p == m_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1691 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1692 symbol_table::symbol_record& sr = insert (name, true);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1693
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1694 sr.assign (value);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1695 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1696 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1697 p->second.assign (value);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1698 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1699
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1700 // Use assign (name, value, force_add) instead.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1701 // Delete when deprecated varref functions are removed.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1702 octave_value& varref (const std::string& name, bool force_add)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1703 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1704 table_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1705
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1706 if (p == m_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1707 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1708 symbol_table::symbol_record& sr = insert (name, force_add);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1709
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1710 return sr.varref ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1711 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1712 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1713 return p->second.varref ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1714 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1715
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1716 octave_value varval (const std::string& name) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1717 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1718 table_const_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1719
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1720 return (p != m_symbols.end ()
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1721 ? p->second.varval () : octave_value ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1722 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1723
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1724 void persistent_assign (const std::string& name, const octave_value& value)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1725 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1726 m_persistent_symbols_iterator p = m_persistent_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1727
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1728 if (p == m_persistent_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1729 m_persistent_symbols[name] = value;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1730 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1731 p->second = value;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1732 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1733
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1734 // Use persistent_assign (name, value) instead.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1735 // Delete when deprecated varref functions are removed.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1736 octave_value& persistent_varref (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1737 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1738 m_persistent_symbols_iterator p = m_persistent_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1739
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1740 return (p == m_persistent_symbols.end ()
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1741 ? m_persistent_symbols[name] : p->second);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1742 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1743
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1744 octave_value persistent_varval (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1745 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1746 m_persistent_symbols_const_iterator p = m_persistent_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1747
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1748 return (p != m_persistent_symbols.end ()) ? p->second : octave_value ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1749 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1750
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1751 void erase_persistent (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1752 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1753 m_persistent_symbols_iterator p = m_persistent_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1754
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1755 if (p != m_persistent_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1756 m_persistent_symbols.erase (p);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1757 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1758
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1759 bool is_variable (const std::string& name) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1760 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1761 bool retval = false;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1762
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1763 table_const_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1764
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1765 if (p != m_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1766 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1767 const symbol_table::symbol_record& sr = p->second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1768
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1769 retval = sr.is_variable ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1770 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1771
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1772 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1773 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1774
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1775 void push_context (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1776 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1777 for (auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1778 nm_sr.second.push_context (this);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1779 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1780
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1781 void pop_context (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1782 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1783 table_iterator tbl_it = m_symbols.begin ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1784
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1785 while (tbl_it != m_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1786 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1787 if (tbl_it->second.pop_context (this) == 0)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1788 m_symbols.erase (tbl_it++);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1789 else
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1790 tbl_it++;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1791 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1792 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1793
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1794 void clear_variables (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1795 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1796 for (auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1797 nm_sr.second.clear (this);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1798 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1799
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1800 void clear_objects (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1801 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1802 for (auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1803 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1804 symbol_table::symbol_record& sr = nm_sr.second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1805 octave_value val = sr.varval ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1806 if (val.isobject ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1807 nm_sr.second.clear (this);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1808 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1809 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1810
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1811 void clear_global (const std::string& name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1812
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1813 void clear_variable (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1814 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1815 table_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1816
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1817 if (p != m_symbols.end ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1818 p->second.clear (this);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1819 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1820
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1821 void clear_global_pattern (const std::string& pat);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1822
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1823 void clear_variable_pattern (const std::string& pat)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1824 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1825 glob_match pattern (pat);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1826
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1827 for (auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1828 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1829 symbol_table::symbol_record& sr = nm_sr.second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1830
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1831 if (sr.is_defined () \|\| sr.is_global ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1832 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1833 if (pattern.match (sr.name ()))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1834 sr.clear (this);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1835 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1836 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1837 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1838
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1839 void clear_variable_regexp (const std::string& pat)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1840 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1841 octave::regexp pattern (pat);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1842
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1843 for (auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1844 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1845 symbol_table::symbol_record& sr = nm_sr.second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1846
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1847 if (sr.is_defined () \|\| sr.is_global ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1848 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1849 if (pattern.is_match (sr.name ()))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1850 sr.clear (this);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1851 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1852 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1853 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1854
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1855 void mark_automatic (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1856 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1857 insert (name).mark_automatic ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1858 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1859
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1860 void mark_hidden (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1861 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1862 insert (name).mark_hidden ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1863 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1864
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1865 void mark_global (const std::string& name)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1866 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1867 insert (name).mark_global ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1868 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1869
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1870 std::list<symbol_table::symbol_record>
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1871 all_variables (bool defined_only = true,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1872 unsigned int exclude = symbol_table::symbol_record::hidden) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1873 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1874 std::list<symbol_table::symbol_record> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1875
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1876 for (const auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1877 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1878 const symbol_table::symbol_record& sr = nm_sr.second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1879
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1880 if ((defined_only && ! sr.is_defined ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1881 \|\| (sr.xstorage_class () & exclude))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1882 continue;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1883
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1884 retval.push_back (sr);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1885 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1886
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1887 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1888 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1889
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1890 std::list<symbol_table::symbol_record>
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1891 glob (const std::string& pattern, bool vars_only = false) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1892 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1893 std::list<symbol_table::symbol_record> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1894
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1895 glob_match pat (pattern);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1896
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1897 for (const auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1898 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1899 if (pat.match (nm_sr.first))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1900 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1901 const symbol_table::symbol_record& sr = nm_sr.second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1902
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1903 if (vars_only && ! sr.is_variable ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1904 continue;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1905
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1906 retval.push_back (sr);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1907 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1908 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1909
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1910 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1911 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1912
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1913 std::list<symbol_table::symbol_record>
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1914 regexp (const std::string& pattern, bool vars_only = false) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1915 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1916 std::list<symbol_table::symbol_record> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1917
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1918 octave::regexp pat (pattern);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1919
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1920 for (const auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1921 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1922 if (pat.is_match (nm_sr.first))
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1923 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1924 const symbol_table::symbol_record& sr = nm_sr.second;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1925
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1926 if (vars_only && ! sr.is_variable ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1927 continue;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1928
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1929 retval.push_back (sr);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1930 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1931 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1932
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1933 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1934 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1935
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1936 std::list<std::string> variable_names (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1937 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1938 std::list<std::string> retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1939
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1940 for (const auto& nm_sr : m_symbols)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1941 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1942 if (nm_sr.second.is_variable ())
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1943 retval.push_back (nm_sr.first);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1944 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1945
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1946 retval.sort ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1947
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1948 return retval;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1949 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1950
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1951 bool is_local_variable (const std::string& name) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1952 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1953 table_const_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1954
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1955 return (p != m_symbols.end ()
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1956 && ! p->second.is_global ()
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1957 && p->second.is_defined ());
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1958 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1959
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1960 bool is_global (const std::string& name) const
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1961 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1962 table_const_iterator p = m_symbols.find (name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1963
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1964 return p != m_symbols.end () && p->second.is_global ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1965 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1966
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1967 void install_subfunction (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1968 const octave_value& fval,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1969 bool is_nested = false);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1970
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1971 void install_nestfunction (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1972 const octave_value& fval)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1973 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1974 install_subfunction (name, fval, true);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1975 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1976
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1977 octave_value find_subfunction (const std::string& name) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1978
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1979 void lock_subfunctions (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1980 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1981 for (auto& nm_sf : m_subfunctions)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1982 nm_sf.second.lock ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1983 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1984
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1985 void unlock_subfunctions (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1986 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1987 for (auto& nm_sf : m_subfunctions)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1988 nm_sf.second.unlock ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1989 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1990
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1991 std::map<std::string, octave_value> subfunctions (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1992 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1993 return m_subfunctions;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1994 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1995
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1996 void erase_subfunctions (void)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1997 {
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1998 m_subfunctions.clear ();
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	1999 }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2000
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2001 void mark_subfunctions_in_scope_as_private (const std::string& class_name);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2002
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2003 std::list<workspace_element> workspace_info (void) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2004
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2005 octave_value dump (void) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2006
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2007 std::string name (void) const { return m_name; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2008
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2009 void cache_name (const std::string& name) { m_name = name; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2010
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2011 octave_user_function *function (void) { return m_fcn; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2012
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2013 void set_function (octave_user_function *fcn) { m_fcn = fcn; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2014
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2015 void set_parent (scope *p) { m_parent = p; }
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2016
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2017 void update_nest (void);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2018
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2019 bool look_nonlocal (const std::string& name,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2020 symbol_table::symbol_record& result);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2021
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2022 private:
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2023
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2024 // Name for this scope (usually the corresponding filename of the
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2025 // function corresponding to the scope).
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2026 std::string m_name;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2027
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2028 // Map from symbol names to symbol info.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2029 std::map<std::string, symbol_table::symbol_record> m_symbols;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2030
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2031 // Map from names of persistent variables to values.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2032 std::map<std::string, octave_value> m_persistent_symbols;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2033
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2034 // Map from symbol names to subfunctions.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2035 std::map<std::string, octave_value> m_subfunctions;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2036
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2037 // The associated user code (may be null).
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2038 octave_user_function *m_fcn;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2039
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2040 // Parent of nested function (may be null).
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2041 scope *m_parent;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2042
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2043 // Child nested functions.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2044 std::vector<scope*> m_children;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2045
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2046 // If true, then this scope belongs to a nested function.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2047 bool m_is_nested;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2048
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2049 // If true then no variables can be added.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2050 bool m_is_static;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2051
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2052 context_id m_context;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2053
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2054 octave_value dump_symbols_map (void) const;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2055 };
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2056
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2057 private:
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2058
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2059 typedef std::map<std::string, octave_value>::const_iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2060 global_symbols_const_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2061 typedef std::map<std::string, octave_value>::iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2062 global_symbols_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2063
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2064 typedef std::map<std::string, fcn_info>::const_iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2065 fcn_table_const_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2066 typedef std::map<std::string, fcn_info>::iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2067 fcn_table_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2068
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2069 // Map from names of global variables to values.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2070 std::map<std::string, octave_value> m_global_symbols;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2071
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2072 // Map from function names to function info (private
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2073 // functions, class constructors, class methods, etc.)
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2074 // Note that subfunctions are defined in the scope that contains
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2075 // them.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2076 std::map<std::string, fcn_info> m_fcn_table;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2077
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2078 // Map from class names to set of classes that have lower
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2079 // precedence.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2080 std::map<std::string, std::set<std::string>> m_class_precedence_table;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2081
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2082 typedef std::map<std::string, std::set<std::string>>::const_iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2083 class_precedence_table_const_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2084 typedef std::map<std::string, std::set<std::string>>::iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2085 class_precedence_table_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2086
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2087 // Map from class names to parent class names.
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2088 std::map<std::string, std::list<std::string>> m_parent_map;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2089
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2090 typedef std::map<std::string, std::list<std::string>>::const_iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2091 const_parent_map_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2092 typedef std::map<std::string, std::list<std::string>>::iterator
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2093 parent_map_iterator;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2094
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2095 scope *m_global_scope;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2096 scope *m_top_scope;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2097
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2098 scope *m_current_scope;
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2099
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2100 octave_value dump_fcn_table_map (void) const;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23587 diff changeset	2101 };
9981 692ab4eaf965 clean up top-level variables when exiting Octave Jaroslav Hajek <highegg@gmail.com> parents: 9958 diff changeset	2102
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2103 extern bool out_of_date_check (octave_value& function,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2104 const std::string& dispatch_type = "",
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2105 bool check_relative = true);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2106
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2107 extern OCTINTERP_API std::string
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2108 get_dispatch_type (const octave_value_list& args);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2109
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2110 extern OCTINTERP_API std::string
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2111 get_dispatch_type (const octave_value_list& args,
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2112 builtin_type_t& builtin_type);
b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23680 diff changeset	2113 }
8123 eb2beef9a9ff clear breakpoints is function found to be out of date David Bateman <dbateman@free.fr> parents: 8051 diff changeset	2114
8 bd072d0a95f9 [project @ 1993-08-08 03:55:11 by jwe] jwe parents: diff changeset	2115 #endif

Mercurial > octave

annotate libinterp/corefcn/symtab.h @ 23693:b9378eff6d13