Mercurial > octave
annotate libinterp/parse-tree/pt-id.cc @ 15236:44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
* src/ov-usr-fcn.cc (octave_user_function::bind_automatic_vars):
Use force_varref.
* src/variables.cc (bind_ans): Use force_varref.
* src/pt-id.cc (tree_identifier::rvalue, tree_identifier::lvalue):
Identify static workspace errors.
* src/pt-id.h (tree_identifier::static_workspace_error): New function.
* src/symtab.cc (symbol_table::do_update_nest): Mark static workspaces.
* src/symtab.h (symbol_table::symbol_record::symbol_record_rep::is_added_static,
symbol_table::symbol_record::symbol_record_rep::mark_added_static,
symbol_table::symbol_record::symbol_record_rep::unmark_added_static,
symbol_table::symbol_record::is_added_static,
symbol_table::symbol_record::mark_added_static,
symbol_table::symbol_record::unmark_added_static, symbol_table::force_varref):
New functions.
(symbol_table::symbol_table): Initialize static_workspace to false.
(symbol_table::do_insert): Added force_add parameter. Mark records as
added_static.
(symbol_table::do_varref): Added force_add parameter.
* test/nest/test_nest.m: Added nest_eval tests.
* test/nest/module.mk: Added nest/nest_eval.m.
* test/nest/nest_eval.m: New file.
| author | Max Brister <max@2bass.com> |
|---|---|
| date | Tue, 17 Apr 2012 21:24:20 -0600 |
| parents | 2fc554ffbc28 |
| children | 049e8bbff782 |
| rev | line source |
|---|---|
| 2887 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
3 Copyright (C) 1996-2012 John W. Eaton |
| 2887 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2887 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2887 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "error.h" | |
| 28 #include "oct-obj.h" | |
| 2979 | 29 #include "oct-lvalue.h" |
| 2900 | 30 #include "pager.h" |
| 3770 | 31 #include "pt-bp.h" |
| 2887 | 32 #include "pt-const.h" |
| 33 #include "pt-id.h" | |
| 34 #include "pt-walk.h" | |
| 2900 | 35 #include "symtab.h" |
| 2887 | 36 #include "utils.h" |
| 2956 | 37 #include "variables.h" |
| 2887 | 38 |
| 39 // Symbols from the symbol table. | |
| 40 | |
| 41 void | |
| 42 tree_identifier::eval_undefined_error (void) | |
| 43 { | |
| 44 int l = line (); | |
| 45 int c = column (); | |
| 46 | |
|
10443
34e51d4e199b
implement smart warnings about missing Matlab functionality
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
47 maybe_missing_function_hook (name ()); |
|
34e51d4e199b
implement smart warnings about missing Matlab functionality
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
48 if (error_state) |
|
34e51d4e199b
implement smart warnings about missing Matlab functionality
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
49 return; |
|
34e51d4e199b
implement smart warnings about missing Matlab functionality
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
50 |
| 2887 | 51 if (l == -1 && c == -1) |
|
14871
26c4ca9782b0
Give message id to undefined function error
Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
parents:
14846
diff
changeset
|
52 ::error_with_id ("Octave:undefined-function", |
|
26c4ca9782b0
Give message id to undefined function error
Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
parents:
14846
diff
changeset
|
53 "`%s' undefined", name ().c_str ()); |
| 2887 | 54 else |
|
14871
26c4ca9782b0
Give message id to undefined function error
Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
parents:
14846
diff
changeset
|
55 ::error_with_id ("Octave:undefined-function", |
|
26c4ca9782b0
Give message id to undefined function error
Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
parents:
14846
diff
changeset
|
56 "`%s' undefined near line %d column %d", |
|
26c4ca9782b0
Give message id to undefined function error
Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
parents:
14846
diff
changeset
|
57 name ().c_str (), l, c); |
| 2887 | 58 } |
| 59 | |
| 60 octave_value_list | |
| 2971 | 61 tree_identifier::rvalue (int nargout) |
| 2887 | 62 { |
| 63 octave_value_list retval; | |
| 64 | |
| 65 if (error_state) | |
| 66 return retval; | |
| 67 | |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
68 octave_value val = sym->find (); |
| 2887 | 69 |
| 7336 | 70 if (val.is_defined ()) |
| 2887 | 71 { |
| 7336 | 72 // GAGME -- this would be cleaner if we required |
| 73 // parens to indicate function calls. | |
| 74 // | |
| 75 // If this identifier refers to a function, we need to know | |
| 76 // whether it is indexed so that we can do the same thing | |
| 77 // for `f' and `f()'. If the index is present, return the | |
| 78 // function object and let tree_index_expression::rvalue | |
| 79 // handle indexing. Otherwise, arrange to call the function | |
| 80 // here, so that we don't return the function definition as | |
| 81 // a value. | |
| 82 | |
| 83 if (val.is_function () && ! is_postfix_indexed ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
84 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
85 octave_value_list tmp_args; |
| 2887 | 86 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
87 retval = val.do_multi_index_op (nargout, tmp_args); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
88 } |
| 2887 | 89 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
90 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
91 if (print_result () && nargout == 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
92 val.print_with_name (octave_stdout, name ()); |
| 7336 | 93 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
94 retval = val; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
95 } |
| 2887 | 96 } |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
97 else if (sym->is_added_static ()) |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
98 static_workspace_error (); |
| 7336 | 99 else |
| 100 eval_undefined_error (); | |
| 2887 | 101 |
| 102 return retval; | |
| 103 } | |
| 104 | |
| 2971 | 105 octave_value |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
106 tree_identifier::rvalue1 (int nargout) |
| 2971 | 107 { |
| 108 octave_value retval; | |
| 109 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
110 octave_value_list tmp = rvalue (nargout); |
| 2971 | 111 |
| 112 if (! tmp.empty ()) | |
| 113 retval = tmp(0); | |
| 114 | |
| 115 return retval; | |
| 116 } | |
| 117 | |
| 2979 | 118 octave_lvalue |
| 2971 | 119 tree_identifier::lvalue (void) |
| 120 { | |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
121 if (sym->is_added_static ()) |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
122 static_workspace_error (); |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
123 |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
124 return octave_lvalue (&(sym->varref ())); |
| 2971 | 125 } |
| 126 | |
| 5861 | 127 tree_identifier * |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
128 tree_identifier::dup (symbol_table::scope_id sc, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
129 symbol_table::context_id) const |
| 5861 | 130 { |
| 7336 | 131 // The new tree_identifier object contains a symbol_record |
| 132 // entry from the duplicated scope. | |
| 5861 | 133 |
| 7336 | 134 // FIXME -- is this the best way? |
| 135 symbol_table::symbol_record new_sym | |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
136 = symbol_table::find_symbol (name (), sc); |
| 7336 | 137 |
| 138 tree_identifier *new_id | |
| 139 = new tree_identifier (new_sym, line (), column ()); | |
| 5861 | 140 |
| 141 new_id->copy_base (*this); | |
| 142 | |
| 143 return new_id; | |
| 144 } | |
| 145 | |
| 2887 | 146 void |
| 147 tree_identifier::accept (tree_walker& tw) | |
| 148 { | |
| 149 tw.visit_identifier (*this); | |
| 150 } |