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

annotate libinterp/parse-tree/pt-fcn-handle.cc @ 20614:10ec79b47808

use new string_value method to handle value extraction errors * __voronoi__.cc, chol.cc, colamd.cc, fftw.cc: Use new string_value method.

author	John W. Eaton <jwe@octave.org>
date	Thu, 08 Oct 2015 18:15:56 -0400
parents	4197fc428c7d
children

rev	line source
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	1 /*
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	2
19731 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	3 Copyright (C) 2003-2015 John W. Eaton
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	4
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	6
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6656 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6656 diff changeset	10 option) any later version.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	11
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	15 for more details.
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	16
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6656 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6656 diff changeset	19 <http://www.gnu.org/licenses/>.
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	20
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	21 */
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	22
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	24 #include <config.h>
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	25 #endif
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	26
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	27 #include <iostream>
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	28
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	29 #include "error.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	30 #include "oct-obj.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	31 #include "ov-fcn-handle.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	32 #include "pt-fcn-handle.h"
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	33 #include "pager.h"
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	34 #include "pt-const.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	35 #include "pt-walk.h"
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	36 #include "variables.h"
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	37
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	38 void
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	39 tree_fcn_handle::print (std::ostream& os, bool pr_as_read_syntax,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	40 bool pr_orig_text)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	41 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	42 print_raw (os, pr_as_read_syntax, pr_orig_text);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	43 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	44
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	45 void
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	46 tree_fcn_handle::print_raw (std::ostream& os, bool pr_as_read_syntax,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	47 bool pr_orig_text)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	48 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	49 os << ((pr_as_read_syntax \|\| pr_orig_text) ? "@" : "") << nm;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	50 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	51
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	52 octave_value
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8045 diff changeset	53 tree_fcn_handle::rvalue1 (int)
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	54 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	55 return make_fcn_handle (nm);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	56 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	57
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	58 octave_value_list
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	59 tree_fcn_handle::rvalue (int nargout)
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	60 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	61 octave_value_list retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	62
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	63 if (nargout > 1)
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	64 error ("invalid number of output arguments for function handle expression");
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	65 else
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8045 diff changeset	66 retval = rvalue1 (nargout);
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	67
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	68 return retval;
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	69 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	70
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	71 tree_expression *
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	72 tree_fcn_handle::dup (symbol_table::scope_id,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	73 symbol_table::context_id) const
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	74 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	75 tree_fcn_handle *new_fh = new tree_fcn_handle (nm, line (), column ());
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	76
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	77 new_fh->copy_base (*this);
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	78
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	79 return new_fh;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	80 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	81
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	82 void
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	83 tree_fcn_handle::accept (tree_walker& tw)
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	84 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	85 tw.visit_fcn_handle (*this);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	86 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: diff changeset	87
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	88 octave_value
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8045 diff changeset	89 tree_anon_fcn_handle::rvalue1 (int)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	90 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	91 // FIXME: should CMD_LIST be limited to a single expression?
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	92 // I think that is what Matlab does.
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	93
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	94 tree_parameter_list *param_list = parameter_list ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	95 tree_parameter_list *ret_list = return_list ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	96 tree_statement_list *cmd_list = body ();
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	97 symbol_table::scope_id this_scope = scope ();
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	98
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	99 symbol_table::scope_id new_scope = symbol_table::dup_scope (this_scope);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	100
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	101 if (new_scope > 0)
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	102 symbol_table::inherit (new_scope, symbol_table::current_scope (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	103 symbol_table::current_context ());
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	104
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	105 octave_user_function *uf
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7017 diff changeset	106 = new octave_user_function (new_scope,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	107 param_list ? param_list->dup (new_scope, 0) : 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	108 ret_list ? ret_list->dup (new_scope, 0) : 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	109 cmd_list ? cmd_list->dup (new_scope, 0) : 0);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	110
6656 c92e679d9cc5 [project @ 2007-05-22 21:20:58 by jwe] jwe parents: 6505 diff changeset	111 octave_function *curr_fcn = octave_call_stack::current ();
c92e679d9cc5 [project @ 2007-05-22 21:20:58 by jwe] jwe parents: 6505 diff changeset	112
c92e679d9cc5 [project @ 2007-05-22 21:20:58 by jwe] jwe parents: 6505 diff changeset	113 if (curr_fcn)
8032 2fd4a5ef6b59 stash parent function scope for inline functions and anonymous function handles. John W. Eaton <jwe@octave.org> parents: 7767 diff changeset	114 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	115 // FIXME: maybe it would be better to just stash curr_fcn
11263 c78247b664fc allow private functions to find private functions John W. Eaton <jwe@octave.org> parents: 10960 diff changeset	116 // instead of individual bits of info about it?
c78247b664fc allow private functions to find private functions John W. Eaton <jwe@octave.org> parents: 10960 diff changeset	117
8032 2fd4a5ef6b59 stash parent function scope for inline functions and anonymous function handles. John W. Eaton <jwe@octave.org> parents: 7767 diff changeset	118 uf->stash_parent_fcn_name (curr_fcn->name ());
11263 c78247b664fc allow private functions to find private functions John W. Eaton <jwe@octave.org> parents: 10960 diff changeset	119 uf->stash_dir_name (curr_fcn->dir_name ());
8045 24701aa75ecb scope fixes for anonymous and inline functions that appear inside subfunctions John W. Eaton <jwe@octave.org> parents: 8032 diff changeset	120
24701aa75ecb scope fixes for anonymous and inline functions that appear inside subfunctions John W. Eaton <jwe@octave.org> parents: 8032 diff changeset	121 symbol_table::scope_id parent_scope = curr_fcn->parent_fcn_scope ();
24701aa75ecb scope fixes for anonymous and inline functions that appear inside subfunctions John W. Eaton <jwe@octave.org> parents: 8032 diff changeset	122
24701aa75ecb scope fixes for anonymous and inline functions that appear inside subfunctions John W. Eaton <jwe@octave.org> parents: 8032 diff changeset	123 if (parent_scope < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	124 parent_scope = curr_fcn->scope ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	125
8045 24701aa75ecb scope fixes for anonymous and inline functions that appear inside subfunctions John W. Eaton <jwe@octave.org> parents: 8032 diff changeset	126 uf->stash_parent_fcn_scope (parent_scope);
13241 2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	127
2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	128 if (curr_fcn->is_class_method () \|\| curr_fcn->is_class_constructor ())
2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	129 uf->stash_dispatch_class (curr_fcn->dispatch_class ());
8032 2fd4a5ef6b59 stash parent function scope for inline functions and anonymous function handles. John W. Eaton <jwe@octave.org> parents: 7767 diff changeset	130 }
6656 c92e679d9cc5 [project @ 2007-05-22 21:20:58 by jwe] jwe parents: 6505 diff changeset	131
13241 2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13125 diff changeset	132 uf->mark_as_anonymous_function ();
13125 34a49d076155 Show row/column for anonymous functions in the profiler Daniel Kraft <d@domob.eu> parents: 12783 diff changeset	133 uf->stash_fcn_file_name (file_name);
12783 ad9263d965dc First experimental profiler implementation with flat profile. Daniel Kraft <d@domob.eu> parents: 11586 diff changeset	134 uf->stash_fcn_location (line (), column ());
6149 3a68a2dc6eb1 [project @ 2006-11-09 18:26:56 by jwe] jwe parents: 6061 diff changeset	135
6505 c7901606ba70 [project @ 2007-04-06 16:11:38 by jwe] jwe parents: 6149 diff changeset	136 octave_value ov_fcn (uf);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	137
10960 409ceee18acc binders optimization Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	138 octave_value fh (octave_fcn_binder::maybe_binder (ov_fcn));
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	139
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	140 return fh;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	141 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	142
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	143 /*
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	144 %!function r = __f2 (f, x)
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	145 %! r = f (x);
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	146 %!endfunction
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	147 %!function f = __f1 (k)
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	148 %! f = @(x) __f2 (@(y) y-k, x);
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	149 %!endfunction
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	150
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	151 %!assert ((__f1 (3)) (10) == 7)
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	152
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	153 %!test
9327 e12a5ec6cf0d tree_anon_fcn_handle::dup: don't convert to tree_constant John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	154 %! g = @(t) feval (@(x) t*x, 2);
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	155 %! assert (g(0.5) == 1);
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	156
4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	157 %!test
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	158 %! h = @(x) sin (x);
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	159 %! g = @(f, x) h (x);
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	160 %! f = @() g (@(x) h, pi);
14085 4e8f23ccadce test: Use internal prefix "__" for %!functions to avoid polluting workspace Rik <octave@nomad.inbox5.com> parents: 13241 diff changeset	161 %! assert (f () == sin (pi));
16681 d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	162
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	163 The next two tests are intended to test parsing of a character string
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	164 vs. hermitian operator at the beginning of an anonymous function
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	165 expression. The use of ' for the character string and the spacing is
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	166 intentional, so don't change it.
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	167
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	168 %!test
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	169 %! f = @() 'foo';
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	170 %! assert (f (), 'foo');
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	171
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	172 %!test
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	173 %! f = @()'foo';
d3619d4d267c recognize character string at beginning of statement (bug #38926, #38958) John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	174 %! assert (f (), 'foo');
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	175 */
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	176
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	177 octave_value_list
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	178 tree_anon_fcn_handle::rvalue (int nargout)
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	179 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	180 octave_value_list retval;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	181
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	182 if (nargout > 1)
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	183 error ("invalid number of output arguments for anonymous function handle expression");
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	184 else
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8045 diff changeset	185 retval = rvalue1 (nargout);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	186
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	187 return retval;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	188 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	189
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	190 tree_expression *
8913 35cd375d4bb3 make tree::dup functions const John W. Eaton <jwe@octave.org> parents: 8906 diff changeset	191 tree_anon_fcn_handle::dup (symbol_table::scope_id,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	192 symbol_table::context_id) const
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	193 {
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	194 tree_parameter_list *param_list = parameter_list ();
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	195 tree_parameter_list *ret_list = return_list ();
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	196 tree_statement_list *cmd_list = body ();
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	197 symbol_table::scope_id this_scope = scope ();
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	198
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	199 symbol_table::scope_id new_scope = symbol_table::dup_scope (this_scope);
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	200
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	201 if (new_scope > 0)
ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	202 symbol_table::inherit (new_scope, symbol_table::current_scope (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	203 symbol_table::current_context ());
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	204
9327 e12a5ec6cf0d tree_anon_fcn_handle::dup: don't convert to tree_constant John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	205 tree_anon_fcn_handle *new_afh = new
e12a5ec6cf0d tree_anon_fcn_handle::dup: don't convert to tree_constant John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	206 tree_anon_fcn_handle (param_list ? param_list->dup (new_scope, 0) : 0,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	207 ret_list ? ret_list->dup (new_scope, 0) : 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	208 cmd_list ? cmd_list->dup (new_scope, 0) : 0,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10261 diff changeset	209 new_scope, line (), column ());
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	210
9327 e12a5ec6cf0d tree_anon_fcn_handle::dup: don't convert to tree_constant John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	211 new_afh->copy_base (*this);
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	212
9327 e12a5ec6cf0d tree_anon_fcn_handle::dup: don't convert to tree_constant John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	213 return new_afh;
8906 ab87d08d9a1b improve symbol inheritance for anonymous functions John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	214 }
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	215
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	216 void
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	217 tree_anon_fcn_handle::accept (tree_walker& tw)
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	218 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	219 tw.visit_anon_fcn_handle (*this);
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5307 diff changeset	220 }

Mercurial > octave-nkf

annotate libinterp/parse-tree/pt-fcn-handle.cc @ 20614:10ec79b47808