Mercurial > octave-nkf
annotate libinterp/parse-tree/pt-id.cc @ 20615:729a85dafba8
use new string_value method to handle value extraction errors
* ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-fcn-inline.cc,
ov.cc, pt-idx.cc: Use new string_value method.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 08 Oct 2015 17:55:57 -0400 |
parents | f90c8372b7ba |
children |
rev | line source |
---|---|
2887 | 1 /* |
2 | |
19731
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17856
diff
changeset
|
3 Copyright (C) 1996-2015 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 |
2887 | 50 if (l == -1 && c == -1) |
20463
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19731
diff
changeset
|
51 error_with_id ("Octave:undefined-function", |
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19731
diff
changeset
|
52 "'%s' undefined", name ().c_str ()); |
2887 | 53 else |
20463
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19731
diff
changeset
|
54 error_with_id ("Octave:undefined-function", |
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19731
diff
changeset
|
55 "'%s' undefined near line %d column %d", |
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19731
diff
changeset
|
56 name ().c_str (), l, c); |
2887 | 57 } |
58 | |
59 octave_value_list | |
16091
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15606
diff
changeset
|
60 tree_identifier::rvalue (int nargout, |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15606
diff
changeset
|
61 const std::list<octave_lvalue> *lvalue_list) |
2887 | 62 { |
63 octave_value_list retval; | |
64 | |
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
65 octave_value val = sym->find (); |
2887 | 66 |
7336 | 67 if (val.is_defined ()) |
2887 | 68 { |
7336 | 69 // GAGME -- this would be cleaner if we required |
70 // parens to indicate function calls. | |
71 // | |
72 // If this identifier refers to a function, we need to know | |
73 // 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
|
74 // 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
|
75 // 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
|
76 // 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
|
77 // 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
|
78 // return the function definition as a value. |
7336 | 79 |
15954
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
80 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
|
81 |
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
82 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
|
83 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
|
84 |
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
85 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
|
86 && fcn->is_postfix_index_handled (postfix_index ()))) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
87 { |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
88 octave_value_list tmp_args; |
2887 | 89 |
16091
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15606
diff
changeset
|
90 retval = (lvalue_list |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15606
diff
changeset
|
91 ? val.do_multi_index_op (nargout, tmp_args, lvalue_list) |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15606
diff
changeset
|
92 : val.do_multi_index_op (nargout, tmp_args)); |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
93 } |
2887 | 94 else |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
95 { |
15606
fb9dffe5fbfb
The silent_functions flag no longer modifies the parse tree
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
96 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
|
97 && tree_evaluator::statement_printing_enabled ()) |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
98 val.print_with_name (octave_stdout, name ()); |
7336 | 99 |
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
100 retval = val; |
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
101 } |
2887 | 102 } |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
103 else if (sym->is_added_static ()) |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
104 static_workspace_error (); |
7336 | 105 else |
106 eval_undefined_error (); | |
2887 | 107 |
108 return retval; | |
109 } | |
110 | |
2971 | 111 octave_value |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
112 tree_identifier::rvalue1 (int nargout) |
2971 | 113 { |
114 octave_value retval; | |
115 | |
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
116 octave_value_list tmp = rvalue (nargout); |
2971 | 117 |
118 if (! tmp.empty ()) | |
119 retval = tmp(0); | |
120 | |
121 return retval; | |
122 } | |
123 | |
2979 | 124 octave_lvalue |
2971 | 125 tree_identifier::lvalue (void) |
126 { | |
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
127 if (sym->is_added_static ()) |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
128 static_workspace_error (); |
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
129 |
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16091
diff
changeset
|
130 return octave_lvalue (sym); |
2971 | 131 } |
132 | |
5861 | 133 tree_identifier * |
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
134 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
|
135 symbol_table::context_id) const |
5861 | 136 { |
7336 | 137 // The new tree_identifier object contains a symbol_record |
138 // entry from the duplicated scope. | |
5861 | 139 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
140 // FIXME: is this the best way? |
7336 | 141 symbol_table::symbol_record new_sym |
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
142 = symbol_table::find_symbol (name (), sc); |
7336 | 143 |
144 tree_identifier *new_id | |
145 = new tree_identifier (new_sym, line (), column ()); | |
5861 | 146 |
147 new_id->copy_base (*this); | |
148 | |
149 return new_id; | |
150 } | |
151 | |
2887 | 152 void |
153 tree_identifier::accept (tree_walker& tw) | |
154 { | |
155 tw.visit_identifier (*this); | |
156 } |