Mercurial > hg > octave-nkf
annotate libinterp/parse-tree/pt-id.cc @ 20638:7ac907da9fba
Use error() rather than ::error() unless explicitly required.
* resource-manager.cc (instance_ok), shortcut-manager.cc (instance_ok),
daspk.cc (DASPK_ABORT, DASPK_ABORT2), dasrt.cc (DASRT_ABORT, DASRT_ABORT2),
dassl.cc (DASSL_ABORT, DASSL_ABORT2), debug.cc (instance_ok),
display.cc (instance_ok), dynamic-ld.cc (octave_shlib_list::instance_ok,
octave_dynamic_loader::instance_ok, do_load_oct, do_load_mex), file-io.cc
(fopen_mode_to_ios_mode, do_stream_open, Ffprintf, Fsprintf, Fscanf, Ffscanf,
get_sscanf_data, Fsscanf, do_fread, do_fwrite, Fpopen, Ftempname, convert,
Fumask), graphics.in.h (graphics_toolkit::instance_ok,
gh_manager::instance_ok), load-path.cc (instance_ok),
ls-oct-ascii.cc (save_three_d), lsode.cc (LSODE_ABORT, LSODE_ABORT2),
oct-errno.in.cc (instance_ok), octave-link.cc (connect_link),
pager.cc (octave_pager_stream::instance_ok, octave_diary_stream::instance_ok),
quad.cc (QUAD_ABORT, QUAD_ABORT2),
sighandlers.cc (w32_interrupt_manager::instance_ok,
octave_child_list::instance_ok), symtab.cc (do_update_nest),
symtab.h (instance_ok), syscalls.cc (convert), toplev.h (instance_ok),
txt-eng-ft.cc (instance_ok, set_mode), urlwrite.cc (instance_ok),
__init_fltk__.cc (instance_ok), ov-builtin.cc (do_multi_index_op),
ov-classdef.cc (class_fevalStatic, make_class, octave_classdef::subsasgn,
do_multi_index_op, cdef_object_array::subsref, cdef_object_array::subsasgn,
install_meth, meta_subsref, run_constructor, make_meta_class, get_value,
set_value, check_method), ov-classdef.h (meta_subsref, instance_ok),
ov-fcn-handle.cc (octave_fcn_handle), ov-mex-fcn.cc (do_multi_index_op),
ov-range.h (octave_range), ov-typeinfo.cc (instance_ok),
ov-usr-fcn.cc (subsref, do_multi_index_op), pt-arg-list.cc (Fend,
convert_to_const_vector), pt-cell.cc (rvalue1), pt-colon.cc (append, rvalue1),
pt-eval.cc (visit_simple_for_command, visit_switch_command),
pt-exp.cc (is_logically_true, rvalue), pt-id.cc (eval_undefined_error),
pt-id.h (workspace_error), pt-mat.cc (get_concat_class):
Use error() rather than ::error().
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 06 Aug 2015 08:09:01 -0700 |
| parents | 4197fc428c7d |
| children | f90c8372b7ba |
| rev | line source |
|---|---|
| 2887 | 1 /* |
| 2 | |
|
19898
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 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) |
|
20638
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
53 error_with_id ("Octave:undefined-function", |
|
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
54 "'%s' undefined", name ().c_str ()); |
| 2887 | 55 else |
|
20638
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
56 error_with_id ("Octave:undefined-function", |
|
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
57 "'%s' undefined near line %d column %d", |
|
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19898
diff
changeset
|
58 name ().c_str (), l, c); |
| 2887 | 59 } |
| 60 | |
| 61 octave_value_list | |
|
16091
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15606
diff
changeset
|
62 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
|
63 const std::list<octave_lvalue> *lvalue_list) |
| 2887 | 64 { |
| 65 octave_value_list retval; | |
| 66 | |
| 67 if (error_state) | |
| 68 return retval; | |
| 69 | |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14138
diff
changeset
|
70 octave_value val = sym->find (); |
| 2887 | 71 |
| 7336 | 72 if (val.is_defined ()) |
| 2887 | 73 { |
| 7336 | 74 // GAGME -- this would be cleaner if we required |
| 75 // parens to indicate function calls. | |
| 76 // | |
| 77 // If this identifier refers to a function, we need to know | |
| 78 // 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
|
79 // 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
|
80 // 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
|
81 // 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
|
82 // 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
|
83 // return the function definition as a value. |
| 7336 | 84 |
|
15954
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
85 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
|
86 |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
87 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
|
88 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
|
89 |
|
46ca8488de92
Re-engineer tree_expression postfix handling to make it more flexible.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15606
diff
changeset
|
90 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
|
91 && fcn->is_postfix_index_handled (postfix_index ()))) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
92 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
93 octave_value_list tmp_args; |
| 2887 | 94 |
|
16091
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15606
diff
changeset
|
95 retval = (lvalue_list |
|
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15606
diff
changeset
|
96 ? 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
|
97 : 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
|
98 } |
| 2887 | 99 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
100 { |
|
15606
fb9dffe5fbfb
The silent_functions flag no longer modifies the parse tree
Max Brister <max@2bass.com>
parents:
15467
diff
changeset
|
101 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
|
102 && tree_evaluator::statement_printing_enabled ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
103 val.print_with_name (octave_stdout, name ()); |
| 7336 | 104 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
105 retval = val; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
106 } |
| 2887 | 107 } |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
108 else if (sym->is_added_static ()) |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
109 static_workspace_error (); |
| 7336 | 110 else |
| 111 eval_undefined_error (); | |
| 2887 | 112 |
| 113 return retval; | |
| 114 } | |
| 115 | |
| 2971 | 116 octave_value |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
117 tree_identifier::rvalue1 (int nargout) |
| 2971 | 118 { |
| 119 octave_value retval; | |
| 120 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7924
diff
changeset
|
121 octave_value_list tmp = rvalue (nargout); |
| 2971 | 122 |
| 123 if (! tmp.empty ()) | |
| 124 retval = tmp(0); | |
| 125 | |
| 126 return retval; | |
| 127 } | |
| 128 | |
| 2979 | 129 octave_lvalue |
| 2971 | 130 tree_identifier::lvalue (void) |
| 131 { | |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
132 if (sym->is_added_static ()) |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
133 static_workspace_error (); |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
134 |
|
16442
302157614308
deprecate symbol_table::varref functions
John W. Eaton <jwe@octave.org>
parents:
16091
diff
changeset
|
135 return octave_lvalue (sym); |
| 2971 | 136 } |
| 137 | |
| 5861 | 138 tree_identifier * |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7761
diff
changeset
|
139 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
|
140 symbol_table::context_id) const |
| 5861 | 141 { |
| 7336 | 142 // The new tree_identifier object contains a symbol_record |
| 143 // entry from the duplicated scope. | |
| 5861 | 144 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
145 // FIXME: is this the best way? |
| 7336 | 146 symbol_table::symbol_record new_sym |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
147 = symbol_table::find_symbol (name (), sc); |
| 7336 | 148 |
| 149 tree_identifier *new_id | |
| 150 = new tree_identifier (new_sym, line (), column ()); | |
| 5861 | 151 |
| 152 new_id->copy_base (*this); | |
| 153 | |
| 154 return new_id; | |
| 155 } | |
| 156 | |
| 2887 | 157 void |
| 158 tree_identifier::accept (tree_walker& tw) | |
| 159 { | |
| 160 tw.visit_identifier (*this); | |
| 161 } |