octave: libinterp/corefcn/symtab.cc annotate

annotate libinterp/corefcn/symtab.cc @ 27923:bd51beb6205e

update formatting of copyright notices * Use <https://octave.org/copyright/> instead of <https://octave.org/COPYRIGHT.html/>. * For consistency with other comments in the Octave sources, use C++-style comments for copyright blocks in C and C++ files. * Use delimiters above and below copyright blocks that are appropriate for the language used in the file. * Eliminate extra spacing inside copyright blocks. * lex.ll (looks_like_copyright): Also allow newlines and carriage returns before the word "Copyright". * scripts/mk-doc.pl (gethelp): Also skip empty comment lines. * bp-table.cc, type.m: Adjust tests.

author	John W. Eaton <jwe@octave.org>
date	Wed, 08 Jan 2020 11:59:41 -0500
parents	1891570abac8
children	76a9f31540e3

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 1993-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21264 diff changeset	27 # include "config.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	28 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	29
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	30 #include <iostream>
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	31
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	32 #include <sstream>
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17824 diff changeset	33
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	34 #include "oct-time.h"
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	35
23137 334119c390b3 move bp_table class to separate file John W. Eaton <jwe@octave.org> parents: 23127 diff changeset	36 #include "bp-table.h"
3308 7ae1928ca623 [project @ 1999-10-21 08:57:11 by jwe] jwe parents: 3258 diff changeset	37 #include "defun.h"
24263 3b302b2890d7 disentangle symbol_record, scope, and fcn_info from symbol_table class John W. Eaton <jwe@octave.org> parents: 24064 diff changeset	38 #include "fcn-info.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23433 diff changeset	39 #include "interpreter-private.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	40 #include "interpreter.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	41 #include "load-path.h"
16048 10142aad4b9f Implement indirect method call: fun(obj, ...). Michael Goffioul <michael.goffioul@gmail.com> parents: 15467 diff changeset	42 #include "ov-classdef.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	43 #include "ov-fcn.h"
8819 96d87674b818 also stash directory name for subfunctions John W. Eaton <jwe@octave.org> parents: 8785 diff changeset	44 #include "ov-usr-fcn.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	45 #include "pager.h"
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7081 diff changeset	46 #include "parse.h"
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	47 #include "pt-pr-code.h"
24269 f494b87d2a93 rename scope to symbol_scope John W. Eaton <jwe@octave.org> parents: 24263 diff changeset	48 #include "symscope.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 13916 diff changeset	49 #include "symtab.h"
3355 c4983fc7318f [project @ 1999-11-18 05:20:50 by jwe] jwe parents: 3325 diff changeset	50
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23686 diff changeset	51 namespace octave
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	52 {
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	53 symbol_table::symbol_table (interpreter& interp)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	54 : m_interpreter (interp), m_fcn_table (), m_class_precedence_table (),
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	55 m_parent_map ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	56 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	57 install_builtins ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	58 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	59
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	60 symbol_scope symbol_table::current_scope (void) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	61 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	62 tree_evaluator& tw = m_interpreter.get_evaluator ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	63
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	64 return tw.get_current_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	65 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	66
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	67 bool symbol_table::is_built_in_function_name (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	68 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	69 octave_value val = find_built_in_function (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	70
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	71 return val.is_defined ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	72 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	73
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	74 // FIXME: this function only finds legacy class methods, not
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	75 // classdef methods.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	76
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	77 octave_value symbol_table::find_method (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	78 const std::string& dispatch_type)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	79 {
26750 a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	80 if (name.empty ())
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	81 return octave_value ();
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	82
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	83 fcn_table_const_iterator p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	84
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	85 if (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	86 return p->second.find_method (dispatch_type);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	87 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	88 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	89 fcn_info finfo (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	90
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	91 octave_value fcn = finfo.find_method (dispatch_type);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	92
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	93 if (fcn.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	94 m_fcn_table[name] = finfo;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	95
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	96 return fcn;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	97 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	98 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	99
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	100 octave_value symbol_table::find_built_in_function (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	101 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	102 fcn_table_const_iterator p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	103
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	104 return (p != m_fcn_table.end ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	105 ? p->second.find_built_in_function () : octave_value ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	106 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	107
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	108 octave_value symbol_table::find_autoload (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	109 {
26750 a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	110 if (name.empty ())
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	111 return octave_value ();
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	112
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	113 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	114
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	115 return (p != m_fcn_table.end ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	116 ? p->second.find_autoload () : octave_value ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	117 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	118
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	119 octave_value
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	120 symbol_table::builtin_find (const std::string& name,
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	121 const symbol_scope& search_scope_arg)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	122 {
26750 a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	123 if (name.empty ())
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	124 return octave_value ();
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	125
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	126 fcn_table_iterator p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	127
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	128 symbol_scope search_scope
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	129 = (search_scope_arg ? search_scope_arg : current_scope ());
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	130
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	131 if (p != m_fcn_table.end ())
26845 6322d51c655c allow function search in arbitrary scope John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	132 return p->second.builtin_find (search_scope);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	133 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	134 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	135 fcn_info finfo (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	136
26845 6322d51c655c allow function search in arbitrary scope John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	137 octave_value fcn = finfo.builtin_find (search_scope);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	138
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	139 if (fcn.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	140 m_fcn_table[name] = finfo;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	141
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	142 return fcn;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	143 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	144
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	145 return octave_value ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	146 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	147
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	148 octave_value
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	149 symbol_table::fcn_table_find (const std::string& name,
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	150 const octave_value_list& args,
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	151 const symbol_scope& search_scope_arg)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	152 {
26750 a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	153 if (name.empty ())
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	154 return octave_value ();
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	155
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	156 fcn_table_iterator p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	157
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	158 symbol_scope search_scope
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	159 = (search_scope_arg ? search_scope_arg : current_scope ());
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	160
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	161 if (p != m_fcn_table.end ())
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	162 return p->second.find (search_scope, args);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	163 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	164 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	165 fcn_info finfo (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	166
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	167 octave_value fcn = finfo.find (search_scope, args);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	168
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	169 if (fcn.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	170 m_fcn_table[name] = finfo;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	171
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	172 return fcn;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	173 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	174
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	175 return octave_value ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	176 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	177
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	178 octave_value
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	179 symbol_table::find_function (const std::string& name,
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	180 const symbol_scope& search_scope_arg)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	181 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	182 if (name.empty ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	183 return octave_value ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	184
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	185 if (name[0] == '@')
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	186 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	187 size_t pos = name.find_first_of ('/');
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	188
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	189 if (pos == std::string::npos)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	190 return octave_value ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	191
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	192 std::string method = name.substr (pos+1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	193 std::string dispatch_type = name.substr (1, pos-1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	194
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	195 return find_method (method, dispatch_type);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	196 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	197 else
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	198 {
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	199 symbol_scope search_scope
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	200 = (search_scope_arg ? search_scope_arg : current_scope ());
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	201
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	202 return find_function (name, ovl (), search_scope);
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	203 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	204 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	205
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	206 octave_value
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	207 symbol_table::find_function (const std::string& name,
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	208 const octave_value_list& args,
4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	209 const symbol_scope& search_scope)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	210 {
26750 a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	211 if (name.empty ())
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	212 return octave_value ();
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	213
26846 4ff25d9b1eec set default scope in symbol_table find functions instead of fcn_info John W. Eaton <jwe@octave.org> parents: 26845 diff changeset	214 return fcn_table_find (name, args, search_scope);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	215 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	216
26845 6322d51c655c allow function search in arbitrary scope John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	217 octave_value
6322d51c655c allow function search in arbitrary scope John W. Eaton <jwe@octave.org> parents: 26781 diff changeset	218 symbol_table::find_user_function (const std::string& name)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	219 {
26750 a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	220 if (name.empty ())
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	221 return octave_value ();
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	222
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	223 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	224
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	225 return (p != m_fcn_table.end ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	226 ? p->second.find_user_function () : octave_value ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	227 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	228
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	229 octave_value symbol_table::find_cmdline_function (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	230 {
26750 a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	231 if (name.empty ())
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	232 return octave_value ();
a89aa5b95a59 return early if searching for function or package with empty name John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	233
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	234 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	235
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	236 return (p != m_fcn_table.end ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	237 ? p->second.find_cmdline_function () : octave_value ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	238 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	239
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	240 void symbol_table::install_cmdline_function (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	241 const octave_value& fcn)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	242 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	243 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	244
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	245 if (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	246 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	247 fcn_info& finfo = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	248
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	249 finfo.install_cmdline_function (fcn);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	250 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	251 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	252 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	253 fcn_info finfo (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	254
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	255 finfo.install_cmdline_function (fcn);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	256
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	257 m_fcn_table[name] = finfo;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	258 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	259 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	260
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	261 // Install local function FCN named NAME. FILE_NAME is the name of
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	262 // the file containing the local function.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	263
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	264 void symbol_table::install_local_function (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	265 const octave_value& fcn,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	266 const std::string& file_name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	267 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	268 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	269
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	270 if (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	271 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	272 fcn_info& finfo = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	273
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	274 finfo.install_local_function (fcn, file_name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	275 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	276 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	277 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	278 fcn_info finfo (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	279
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	280 finfo.install_local_function (fcn, file_name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	281
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	282 m_fcn_table[name] = finfo;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	283 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	284 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	285
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	286 void symbol_table::install_user_function (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	287 const octave_value& fcn)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	288 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	289 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	290
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	291 if (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	292 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	293 fcn_info& finfo = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	294
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	295 finfo.install_user_function (fcn);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	296 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	297 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	298 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	299 fcn_info finfo (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	300
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	301 finfo.install_user_function (fcn);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	302
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	303 m_fcn_table[name] = finfo;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	304 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	305 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	306
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	307 // FIXME: should we ensure that FCN really is a built-in function
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	308 // object?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	309 void symbol_table::install_built_in_function (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	310 const octave_value& fcn)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	311 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	312 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	313
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	314 if (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	315 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	316 fcn_info& finfo = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	317
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	318 finfo.install_built_in_function (fcn);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	319 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	320 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	321 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	322 fcn_info finfo (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	323
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	324 finfo.install_built_in_function (fcn);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	325
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	326 m_fcn_table[name] = finfo;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	327 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	328 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	329
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	330 // This is written as two separate functions instead of a single
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	331 // function with default values so that it will work properly with
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	332 // unwind_protect.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	333
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	334 void symbol_table::clear_functions (bool force)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	335 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	336 auto p = m_fcn_table.begin ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	337
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	338 while (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	339 (p++)->second.clear (force);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	340 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	341
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	342 void symbol_table::clear_function (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	343 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	344 clear_user_function (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	345 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	346
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	347 void symbol_table::clear_function_pattern (const std::string& pat)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	348 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	349 glob_match pattern (pat);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	350
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	351 auto p = m_fcn_table.begin ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	352
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	353 while (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	354 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	355 if (pattern.match (p->first))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	356 (p++)->second.clear_user_function ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	357 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	358 p++;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	359 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	360 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	361
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	362 void symbol_table::clear_function_regexp (const std::string& pat)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	363 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	364 regexp pattern (pat);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	365
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	366 auto p = m_fcn_table.begin ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	367
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	368 while (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	369 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	370 if (pattern.is_match (p->first))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	371 (p++)->second.clear_user_function ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	372 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	373 p++;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	374 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	375 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	376
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	377 void symbol_table::clear_user_function (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	378 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	379 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	380
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	381 if (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	382 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	383 fcn_info& finfo = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	384
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	385 finfo.clear_user_function ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	386 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	387 // FIXME: is this necessary, or even useful?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	388 // else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	389 // error ("clear: no such function '%s'", name.c_str ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	390 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	391
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	392 // This clears oct and mex files, including autoloads.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	393 void symbol_table::clear_dld_function (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	394 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	395 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	396
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	397 if (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	398 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	399 fcn_info& finfo = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	400
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	401 finfo.clear_autoload_function ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	402 finfo.clear_user_function ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	403 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	404 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	405
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	406 void symbol_table::clear_mex_functions (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	407 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	408 auto p = m_fcn_table.begin ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	409
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	410 while (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	411 (p++)->second.clear_mex_function ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	412 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	413
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	414 // Insert INF_CLASS in the set of class names that are considered
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	415 // inferior to SUP_CLASS. Return FALSE if INF_CLASS is currently
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	416 // marked as superior to SUP_CLASS.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	417
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	418 bool symbol_table::set_class_relationship (const std::string& sup_class,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	419 const std::string& inf_class)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	420 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	421 if (is_superiorto (inf_class, sup_class))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	422 return false;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	423
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	424 // If sup_class doesn't have an entry in the precedence table,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	425 // this will automatically create it, and associate to it a
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	426 // singleton set {inf_class} of inferior classes.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	427 m_class_precedence_table[sup_class].insert (inf_class);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	428
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	429 return true;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	430 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	431
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	432 // Has class A been marked as superior to class B? Also returns
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	433 // TRUE if B has been marked as inferior to A, since we only keep
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	434 // one table, and convert inferiorto information to a superiorto
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	435 // relationship. Two calls are required to determine whether there
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	436 // is no relationship between two classes:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	437 //
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	438 // if (symbol_table::is_superiorto (a, b))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	439 // // A is superior to B, or B has been marked inferior to A.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	440 // else if (symbol_table::is_superiorto (b, a))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	441 // // B is superior to A, or A has been marked inferior to B.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	442 // else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	443 // // No relation.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	444
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	445 bool symbol_table::is_superiorto (const std::string& a, const std::string& b)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	446 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	447 class_precedence_table_const_iterator p = m_class_precedence_table.find (a);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	448 // If a has no entry in the precedence table, return false
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	449 if (p == m_class_precedence_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	450 return false;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	451
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	452 const std::set<std::string>& inferior_classes = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	453 std::set<std::string>::const_iterator q = inferior_classes.find (b);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	454 return (q != inferior_classes.end ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	455 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	456
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	457 void symbol_table::alias_built_in_function (const std::string& alias,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	458 const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	459 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	460 octave_value fcn = find_built_in_function (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	461
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	462 if (fcn.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	463 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	464 fcn_info finfo (alias);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	465
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	466 finfo.install_built_in_function (fcn);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	467
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	468 m_fcn_table[alias] = finfo;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	469 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	470 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	471 panic ("alias: '%s' is undefined", name.c_str ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	472 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	473
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	474 void symbol_table::install_built_in_dispatch (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	475 const std::string& klass)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	476 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	477 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	478
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	479 if (p != m_fcn_table.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	480 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	481 fcn_info& finfo = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	482
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	483 finfo.install_built_in_dispatch (klass);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	484 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	485 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	486 error ("install_built_in_dispatch: '%s' is undefined", name.c_str ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	487 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	488
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	489 std::list<std::string> symbol_table::user_function_names (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	490 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	491 std::list<std::string> retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	492
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	493 for (const auto& nm_finfo : m_fcn_table)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	494 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	495 if (nm_finfo.second.is_user_function_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	496 retval.push_back (nm_finfo.first);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	497 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	498
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	499 if (! retval.empty ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	500 retval.sort ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	501
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	502 return retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	503 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	504
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	505 std::list<std::string> symbol_table::built_in_function_names (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	506 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	507 std::list<std::string> retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	508
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	509 for (const auto& nm_finfo : m_fcn_table)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	510 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	511 octave_value fcn = nm_finfo.second.find_built_in_function ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	512
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	513 if (fcn.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	514 retval.push_back (nm_finfo.first);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	515 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	516
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	517 if (! retval.empty ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	518 retval.sort ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	519
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	520 return retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	521 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	522
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	523 std::list<std::string> symbol_table::cmdline_function_names (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	524 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	525 std::list<std::string> retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	526
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	527 for (const auto& nm_finfo : m_fcn_table)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	528 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	529 octave_value fcn = nm_finfo.second.find_cmdline_function ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	530
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	531 if (fcn.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	532 retval.push_back (nm_finfo.first);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	533 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	534
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	535 if (! retval.empty ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	536 retval.sort ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	537
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	538 return retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	539 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	540
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	541 template <template <typename, typename...> class C, typename V,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	542 typename... A>
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	543 static octave_value
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	544 dump_container_map (const std::map<std::string, C<V, A...>>& container_map)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	545 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	546 if (container_map.empty ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	547 return octave_value (Matrix ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	548
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	549 std::map<std::string, octave_value> info_map;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	550
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	551 for (const auto& nm_container : container_map)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	552 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	553 std::string nm = nm_container.first;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	554 const C<V, A...>& container = nm_container.second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	555 info_map[nm] = Cell (container);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	556 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	557
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	558 return octave_value (info_map);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	559 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	560
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	561 octave_value symbol_table::dump (void) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	562 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	563 std::map<std::string, octave_value> m
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	564 = {{ "function_info", dump_fcn_table_map () },
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	565 { "precedence_table", dump_container_map (m_class_precedence_table) },
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	566 { "parent_classes", dump_container_map (m_parent_map) }};
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	567
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	568 return octave_value (m);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	569 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	570
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	571 void symbol_table::add_to_parent_map (const std::string& classname,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	572 const std::list<std::string>& parent_list)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	573 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	574 m_parent_map[classname] = parent_list;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	575 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	576
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	577 std::list<std::string> symbol_table::parent_classes (const std::string& dispatch_type)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	578 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	579 std::list<std::string> retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	580
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	581 const_parent_map_iterator it = m_parent_map.find (dispatch_type);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	582
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	583 if (it != m_parent_map.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	584 retval = it->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	585
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	586 for (const auto& nm : retval)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	587 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	588 // Search for parents of parents and append them to the list.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	589
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	590 // FIXME: should we worry about a circular inheritance graph?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	591
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	592 std::list<std::string> parents = parent_classes (nm);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	593
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	594 if (! parents.empty ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	595 retval.insert (retval.end (), parents.begin (), parents.end ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	596 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	597
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	598 return retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	599 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	600
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	601 void symbol_table::cleanup (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	602 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	603 clear_functions ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	604
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	605 m_fcn_table.clear ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	606 m_class_precedence_table.clear ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	607 m_parent_map.clear ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	608 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	609
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	610 fcn_info * symbol_table::get_fcn_info (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	611 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	612 auto p = m_fcn_table.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	613 return p != m_fcn_table.end () ? &p->second : nullptr;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	614 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	615
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	616 octave_value symbol_table::dump_fcn_table_map (void) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	617 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	618 if (m_fcn_table.empty ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	619 return octave_value (Matrix ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	620
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	621 std::map<std::string, octave_value> info_map;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	622
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	623 for (const auto& nm_finfo : m_fcn_table)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	624 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	625 std::string nm = nm_finfo.first;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	626 const fcn_info& finfo = nm_finfo.second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	627 info_map[nm] = finfo.dump ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	628 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	629
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	630 return octave_value (info_map);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26594 diff changeset	631 }
27594 e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	632
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	633 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	634 bool symbol_table::at_top_level (void)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	635 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	636 return m_interpreter.at_top_level ();
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	637 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	638
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	639 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	640 octave_value symbol_table::varval (const std::string& name) const
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	641 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	642 return m_interpreter.varval (name);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	643 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	644
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	645 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	646 octave_value symbol_table::global_varval (const std::string& name) const
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	647 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	648 return m_interpreter.global_varval (name);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	649 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	650
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	651 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	652 octave_value symbol_table::top_level_varval (const std::string& name) const
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	653 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	654 return m_interpreter.top_level_varval (name);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	655 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	656
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	657 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	658 std::list<std::string> symbol_table::global_variable_names (void)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	659 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	660 return m_interpreter.global_variable_names ();
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	661 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	662
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	663 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	664 std::list<std::string> symbol_table::top_level_variable_names (void)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	665 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	666 return m_interpreter.top_level_variable_names ();
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	667 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	668
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	669 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	670 std::list<std::string> symbol_table::variable_names (void)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	671 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	672 return m_interpreter.variable_names ();
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	673 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	674
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	675 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	676 void symbol_table::assign (const std::string& name, const octave_value& value)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	677 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	678 return m_interpreter.assign (name, value);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	679 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	680
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	681 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	682 void symbol_table::clear_all (bool force)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	683 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	684 return m_interpreter.clear_all (force);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	685 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	686
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	687 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	688 void symbol_table::clear_global (const std::string& name)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	689 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	690 return m_interpreter.clear_global_variable (name);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	691 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	692
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	693 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	694 void symbol_table::clear_global_pattern (const std::string& pattern)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	695 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	696 return m_interpreter.clear_global_variable_pattern (pattern);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	697 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	698
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	699 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	700 void symbol_table::clear_symbol (const std::string& name)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	701 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	702 return m_interpreter.clear_symbol (name);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	703 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	704
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	705 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	706 void symbol_table::clear_symbol_pattern (const std::string& pattern)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	707 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	708 return m_interpreter.clear_symbol_pattern (pattern);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	709 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	710
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	711 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	712 void symbol_table::global_assign (const std::string& name,
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	713 const octave_value& value)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	714 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	715 return m_interpreter.global_assign (name, value);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	716 }
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	717
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	718 // DEPRECATED
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	719 void symbol_table::top_level_assign (const std::string& name,
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	720 const octave_value& value)
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	721 {
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	722 return m_interpreter.top_level_assign (name, value);
e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27336 diff changeset	723 }
23603 18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	724 }
18bd46c4b79a make symbol table context info mostly local to symbol table scopes John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	725
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	726 DEFMETHOD (__dump_symtab_info__, interp, args, ,
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	727 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	728 @deftypefn {} {} __dump_symtab_info__ ()
23680 ef71711f6d64 rework __dump_symbol_table__ function John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	729 @deftypefnx {} {} __dump_symtab_info__ (@var{function})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	730 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	731 @end deftypefn */)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	732 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	733 int nargin = args.length ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	734
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	735 if (nargin > 1)
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	736 print_usage ();
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	737
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23686 diff changeset	738 octave::symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	739
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	740 if (nargin == 0)
23680 ef71711f6d64 rework __dump_symbol_table__ function John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	741 return symtab.dump ();
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	742 else
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	743 {
23680 ef71711f6d64 rework __dump_symbol_table__ function John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	744 std::string fname = args(0).xstring_value ("__dump_symtab_info__: argument must be a function name");
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	745
24263 3b302b2890d7 disentangle symbol_record, scope, and fcn_info from symbol_table class John W. Eaton <jwe@octave.org> parents: 24064 diff changeset	746 octave::fcn_info *finfo = symtab.get_fcn_info (fname);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	747
23680 ef71711f6d64 rework __dump_symbol_table__ function John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	748 if (finfo)
ef71711f6d64 rework __dump_symbol_table__ function John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	749 return finfo->dump ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	750 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	751
23680 ef71711f6d64 rework __dump_symbol_table__ function John W. Eaton <jwe@octave.org> parents: 23667 diff changeset	752 return ovl ();
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	753 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	754
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	755 DEFMETHOD (__get_cmdline_fcn_txt__, interp, args, ,
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	756 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	757 @deftypefn {} {} __get_cmdline_fcn_txt__ (@var{name})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	758 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	759 @end deftypefn */)
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	760 {
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	761 if (args.length () != 1)
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	762 print_usage ();
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	763
27336 1fb234f01eea correct function name in error message text John W. Eaton <jwe@octave.org> parents: 27110 diff changeset	764 std::string name = args(0).xstring_value ("__get_cmdline_fcn_txt__: first argument must be function name");
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	765
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23686 diff changeset	766 octave::symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	767
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	768 octave_value ov = symtab.find_cmdline_function (name);
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	769
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	770 octave_user_function *f = ov.user_function_value ();
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	771
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20874 diff changeset	772 octave_value_list retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20874 diff changeset	773
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	774 if (f)
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	775 {
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	776 std::ostringstream buf;
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	777
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22897 diff changeset	778 octave::tree_print_code tpc (buf);
20582 ba2b07c13913 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20469 diff changeset	779
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	780 f->accept (tpc);
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20716 diff changeset	781
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20874 diff changeset	782 retval = ovl (buf.str ());
20207 abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	783 }
abf85f8cbd6c Expand type() to work on command-line entered functions (bug #40462). John W. Eaton <jwe@octave.org> parents: 20172 diff changeset	784
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	785 return retval;
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	786 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7752 diff changeset	787
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	788 // FIXME: should we have functions like this in Octave?
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	789 //
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	790 // DEFMETHOD (set_variable, interp, args, , "set_variable (NAME, VALUE)")
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	791 // {
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	792 // if (args.length () != 2)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	793 // print_usage ();
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	794 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	795 // std::string name = args(0).xstring_value ("set_variable: variable NAME must be a string");
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	796 //
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23686 diff changeset	797 // octave::symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	798 //
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	799 // symtab.assign (name, args(1));
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	800 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	801 // return ovl ();
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	802 // }
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	803 //
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	804 // DEFMETHOD (variable_value, interp, args, , "VALUE = variable_value (NAME)")
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	805 // {
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	806 // if (args.length () != 1)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	807 // print_usage ();
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	808 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	809 // octave_value retval;
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	810 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	811 // std::string name = args(0).xstring_value ("variable_value: variable NAME must be a string");
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	812 //
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23686 diff changeset	813 // octave::symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	814 //
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23581 diff changeset	815 // retval = symtab.varval (name);
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	816 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	817 // if (retval.is_undefined ())
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	818 // error ("variable_value: '%s' is not a variable in the current scope",
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	819 // name.c_str ());
21992 03c692adf563 maint: strip trailing whitespace from files. John W. Eaton <jwe@octave.org> parents: 21966 diff changeset	820 //
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	821 // return retval;
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	822 // }
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	823
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	824 /*
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	825 bug #34497: 'clear -f' does not work for command line functions
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	826
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	827 This test relies on bar being a core function that is implemented in an m-file.
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	828 If the first assert fails, this is no longer the case and the tests need to be
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	829 updated to use some other function.
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	830
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 22407 diff changeset	831 %!assert <34497> (! strcmp (which ("bar"), ""))
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	832
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	833 %!function x = bar ()
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	834 %! x = 5;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	835 %!endfunction
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	836 %!test
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	837 %! assert (bar == 5);
23295 c1362a71fb0e which.m: Return a non-empty string for built-in classes and command line fcns (bug #50541); Rik <rik@octave.org> parents: 23220 diff changeset	838 %! assert (strcmp (which ("bar"), "command-line function"));
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	839 %! clear -f bar;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	840 %! assert (! strcmp (which ("bar"), ""));
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	841
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	842 %!function x = bar ()
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	843 %! x = 5;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	844 %!endfunction
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	845 %!test
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	846 %! assert (bar == 5);
23295 c1362a71fb0e which.m: Return a non-empty string for built-in classes and command line fcns (bug #50541); Rik <rik@octave.org> parents: 23220 diff changeset	847 %! assert (strcmp (which ("bar"), "command-line function"));
15003 1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	848 %! clear bar;
1f5dbfc23fc2 'clear -f' does not work for command line functions (bug #34497) Max Brister <max@2bass.com> parents: 14861 diff changeset	849 %! assert (! strcmp (which ("bar"), ""));
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	850 */

Mercurial > octave

annotate libinterp/corefcn/symtab.cc @ 27923:bd51beb6205e