octave: libinterp/parse-tree/pt-fcn-handle.cc annotate

annotate libinterp/parse-tree/pt-fcn-handle.cc @ 23599:5cb3a2bb5e1e

don't use singleton for symbol_table This is the first of a series of changes to make the symbol table a part of the interpreter instead of a global object. These changes also aim to simplify the implementation of symbol table so that it is easier to understand and modify. * Functions now own their scope (workspace) data. * The list of subfunctions is contained in the scope rather than a global list. * symtab.h, symtab.cc (class symbol_table): Don't use singleton pattern. * interpreter.h, interpreter.cc (interpreter::m_symbol_table): New data member. (interpreter::~interpreter): Don't set instance to 0. * interpreter-private.h, interpreter-private.cc (__get_symbol_table__): New function. Change all uses of call_stack to access call_stack object from the interpreter.

author	John W. Eaton <jwe@octave.org>
date	Fri, 09 Jun 2017 02:21:28 -0400
parents	c452180ab672
children	db947ba52118

rev	line source
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1 /*
db5e0814277a [project @ 2003-02-20 16:44:16 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) 2003-2017 John W. Eaton
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	4
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	6
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	9 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	16
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	17 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: 6656 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6656 diff changeset	19 <http://www.gnu.org/licenses/>.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	20
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	21 */
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	25 #endif
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	26
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	27 #include <iostream>
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	28
22091 0f6fc2ec3b1a move call_stack class to a separate file John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	29 #include "call-stack.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	30 #include "error.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	31 #include "interpreter-private.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 19697 diff changeset	32 #include "ovl.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	33 #include "ov-fcn-handle.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	34 #include "pt-fcn-handle.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	35 #include "pager.h"
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	36 #include "pt-const.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	37 #include "pt-walk.h"
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	38 #include "variables.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	39
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	40 namespace octave
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	41 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	42 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	43 tree_fcn_handle::print (std::ostream& os, bool pr_as_read_syntax,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	44 bool pr_orig_text)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	45 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	46 print_raw (os, pr_as_read_syntax, pr_orig_text);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	47 }
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	48
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	49 void
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	50 tree_fcn_handle::print_raw (std::ostream& os, bool pr_as_read_syntax,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	51 bool pr_orig_text)
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	52 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	53 os << ((pr_as_read_syntax \|\| pr_orig_text) ? "@" : "") << nm;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	54 }
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	55
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	56 tree_expression *
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	57 tree_fcn_handle::dup (symbol_table::scope_id,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	58 symbol_table::context_id) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	59 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	60 tree_fcn_handle *new_fh = new tree_fcn_handle (nm, line (), column ());
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	61
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	62 new_fh->copy_base (*this);
21055 5e00ed38a58b maint: Replace if/error/else paradigm with just if/error. Rik <rik@octave.org> parents: 20940 diff changeset	63
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	64 return new_fh;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	65 }
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	66
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	67 tree_anon_fcn_handle::~tree_anon_fcn_handle (void)
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	68 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	69 delete m_parameter_list;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	70 delete m_return_list;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	71 delete m_statement_list;
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	72 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	73
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	74 tree_expression *
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	75 tree_anon_fcn_handle::dup (symbol_table::scope_id,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	76 symbol_table::context_id) const
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	77 {
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	78 tree_parameter_list *param_list = parameter_list ();
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	79 tree_parameter_list *ret_list = return_list ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	80 tree_statement_list *stmt_list = body ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	81
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	82 symbol_table::scope_id af_sid = scope ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	83 symbol_table::scope_id af_parent_sid = parent_scope ();
8045 24701aa75ecb scope fixes for anonymous and inline functions that appear inside subfunctions John W. Eaton <jwe@octave.org> parents: 8032 diff changeset	84
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	85 symbol_table& symtab
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	86 = octave::__get_symbol_table__ ("tree_anon_fcn_handle::dup");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	87
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	88 symbol_table::scope_id new_scope = symtab.dup_scope (af_sid);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	89
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	90 if (new_scope > 0)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	91 symtab.inherit (new_scope);
13241 2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	92
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	93 tree_anon_fcn_handle *new_afh = new
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	94 tree_anon_fcn_handle (param_list ? param_list->dup (new_scope, 0) : 0,
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	95 ret_list ? ret_list->dup (new_scope, 0) : 0,
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	96 stmt_list ? stmt_list->dup (new_scope, 0) : 0,
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	97 new_scope, af_parent_sid, line (), column ());
6656 c92e679d9cc5 [project @ 2007-05-22 21:20:58 by jwe] jwe parents: 6505 diff changeset	98
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	99 new_afh->copy_base (*this);
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	100
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	101 return new_afh;
4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	102 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	103 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	104
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	105 /*
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	106 %!function r = __f2 (f, x)
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	107 %! r = f (x);
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	108 %!endfunction
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	109 %!function f = __f1 (k)
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	110 %! f = @(x) __f2 (@(y) y-k, x);
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	111 %!endfunction
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	112
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	113 %!assert ((__f1 (3)) (10) == 7)
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	114
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	115 %!test
9327 e12a5ec6cf0d tree_anon_fcn_handle::dup: don't convert to tree_constant John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	116 %! g = @(t) feval (@(x) t*x, 2);
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	117 %! assert (g(0.5) == 1);
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	118
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	119 %!test
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	120 %! h = @(x) sin (x);
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	121 %! g = @(f, x) h (x);
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	122 %! f = @() g (@(x) h, pi);
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	123 %! assert (f () == sin (pi));
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	124
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	125 The next two tests are intended to test parsing of a character string
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	126 vs. hermitian operator at the beginning of an anonymous function
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	127 expression. The use of ' for the character string and the spacing is
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	128 intentional, so don't change it.
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	129
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	130 %!test
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	131 %! f = @() 'foo';
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	132 %! assert (f (), 'foo');
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	133
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	134 %!test
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	135 %! f = @()'foo';
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	136 %! assert (f (), 'foo');
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	137 */

Mercurial > octave

annotate libinterp/parse-tree/pt-fcn-handle.cc @ 23599:5cb3a2bb5e1e