Mercurial > hg > octave-lyh
annotate libinterp/parse-tree/pt-id.cc @ 15954:46ca8488de92 classdef
Re-engineer tree_expression postfix handling to make it more flexible.
* libinterp/octave-value/ov-fcn.h (octave_function::is_postfix_index_handled):
New method.
* libinterp/parse-tree/oct-parse.yy
(make_index_expression, make_indirect_ref): Set expression postfix index type.
* libinterp/parse-tree/pt-exp.h (tree_expression::postfix_index): Remove field.
(tree_expression::postfix_index_type): New field.
(tree_expression::tree_expression): Initialize it.
(tree_expression::copy_base): Copy it.
(tree_expression::set_postfix_index, tree_expression::postfix_index): New
methods.
(tree_expression::mark_postfix_indexed): Remove method.
(tree_expression::is_postfix_indexed): Use postfix_index_type field.
* libinterp/parse-tree/pt-id.cc (tree_identifier::rvalue): Let the function
object determine whether it can handle the first postfix index and call
do_multi_index_op if it can't.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Tue, 15 Jan 2013 17:01:10 -0500 |
| parents | fb9dffe5fbfb |
| children | 0259254a3ccc |
| 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" |
|
15606
fb9dffe5fbfb
The silent_functions flag no longer modifies the parse tree
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
33 #include "pt-eval.h" |
| 2887 | 34 #include "pt-id.h" |
| 35 #include "pt-walk.h" | |
| 2900 | 36 #include "symtab.h" |
| 2887 | 37 #include "utils.h" |
| 2956 | 38 #include "variables.h" |
| 2887 | 39 |
| 40 // Symbols from the symbol table. | |
| 41 | |
| 42 void | |
| 43 tree_identifier::eval_undefined_error (void) | |
| 44 { | |
| 45 int l = line (); | |
| 46 int c = column (); | |
| 47 | |
|
10443
34e51d4e199b
implement smart warnings about missing Matlab functionality
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
48 maybe_missing_function_hook (name ()); |
|
34e51d4e199b
implement smart warnings about missing Matlab functionality
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
49 if (error_state) |
|
34e51d4e199b
implement smart warnings about missing Matlab functionality
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
50 return; |
|
34e51d4e199b
implement smart warnings about missing Matlab functionality
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
51 |
| 2887 | 52 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
|
53 ::error_with_id ("Octave:undefined-function", |
|
15467
049e8bbff782
maint: periodic merge of stable to default
John W. Eaton <jwe@octave.org>
diff
changeset
|
54 "'%s' undefined", name ().c_str ()); |
| 2887 | 55 else |
|
14871
26c4ca9782b0
Give message id to undefined function error
Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
parents:
14846
diff
changeset
|
56 ::error_with_id ("Octave:undefined-function", |
|
15467
049e8bbff782
maint: periodic merge of stable to default
John W. Eaton <jwe@octave.org>
diff
changeset
|
57 "'%s' undefined near line %d column %d", |
|
14871
26c4ca9782b0
Give message id to undefined function error
Juan Pablo Carbajal <carbajal@ifi.uzh.ch>
parents:
14846
diff
changeset
|
58 name ().c_str (), l, c); |
| 2887 | 59 } |
| 60 | |
| 61 octave_value_list | |
| 2971 | 62 tree_identifier::rvalue (int nargout) |
| 2887 | 63 { |
| 64 octave_value_list retval; | |
| 65 | |
| 66 if (error_state) | |
| 67 return retval; | |
| 68 | |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
69 octave_value val = sym->find (); |
| 2887 | 70 |
| 7336 | 71 if (val.is_defined ()) |
| 2887 | 72 { |
| 7336 | 73 // GAGME -- this would be cleaner if we required |
| 74 // parens to indicate function calls. | |
| 75 // | |
| 76 // If this identifier refers to a function, we need to know | |
| 77 // whether it is indexed so that we can do the same thing | |
|
15954
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
78 // for 'f' and 'f()'. If the index is present and the function |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
79 // object declares it can handle it, return the function object |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
80 // and let tree_index_expression::rvalue handle indexing. |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
81 // Otherwise, arrange to call the function here, so that we don't |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
82 // return the function definition as a value. |
| 7336 | 83 |
|
15954
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
84 octave_function *fcn = 0; |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
85 |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
86 if (val.is_function ()) |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
87 fcn = val.function_value (true); |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
88 |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
89 if (fcn && ! (is_postfix_indexed () |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
90 && fcn->is_postfix_index_handled (postfix_index ()))) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
91 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
92 octave_value_list tmp_args; |
| 2887 | 93 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
94 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
|
95 } |
| 2887 | 96 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
97 { |
|
15606
fb9dffe5fbfb
The silent_functions flag no longer modifies the parse tree
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
98 if (print_result () && nargout == 0 |
|
fb9dffe5fbfb
The silent_functions flag no longer modifies the parse tree
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
99 && tree_evaluator::statement_printing_enabled ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
100 val.print_with_name (octave_stdout, name ()); |
| 7336 | 101 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
102 retval = val; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
103 } |
| 2887 | 104 } |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
105 else if (sym->is_added_static ()) |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
106 static_workspace_error (); |
| 7336 | 107 else |
| 108 eval_undefined_error (); | |
| 2887 | 109 |
| 110 return retval; | |
| 111 } | |
| 112 | |
| 2971 | 113 octave_value |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
114 tree_identifier::rvalue1 (int nargout) |
| 2971 | 115 { |
| 116 octave_value retval; | |
| 117 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
118 octave_value_list tmp = rvalue (nargout); |
| 2971 | 119 |
| 120 if (! tmp.empty ()) | |
| 121 retval = tmp(0); | |
| 122 | |
| 123 return retval; | |
| 124 } | |
| 125 | |
| 2979 | 126 octave_lvalue |
| 2971 | 127 tree_identifier::lvalue (void) |
| 128 { | |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
129 if (sym->is_added_static ()) |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
130 static_workspace_error (); |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
131 |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
132 return octave_lvalue (&(sym->varref ())); |
| 2971 | 133 } |
| 134 | |
| 5861 | 135 tree_identifier * |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
136 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
|
137 symbol_table::context_id) const |
| 5861 | 138 { |
| 7336 | 139 // The new tree_identifier object contains a symbol_record |
| 140 // entry from the duplicated scope. | |
| 5861 | 141 |
| 7336 | 142 // FIXME -- is this the best way? |
| 143 symbol_table::symbol_record new_sym | |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
144 = symbol_table::find_symbol (name (), sc); |
| 7336 | 145 |
| 146 tree_identifier *new_id | |
| 147 = new tree_identifier (new_sym, line (), column ()); | |
| 5861 | 148 |
| 149 new_id->copy_base (*this); | |
| 150 | |
| 151 return new_id; | |
| 152 } | |
| 153 | |
| 2887 | 154 void |
| 155 tree_identifier::accept (tree_walker& tw) | |
| 156 { | |
| 157 tw.visit_identifier (*this); | |
| 158 } |