Mercurial > octave
comparison libinterp/parse-tree/pt-id.cc @ 31607:aac27ad79be6 stable
maint: Re-indent code after switch to using namespace macros.
* build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc,
__ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc,
__pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h,
besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc,
call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc,
debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc,
dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h,
error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h,
event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc,
file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h,
gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h,
graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc,
gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h,
interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h,
inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc,
latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h,
lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc,
matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h,
oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc,
oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h,
oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc,
pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc,
settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc,
sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc,
syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h,
symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h,
text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc,
url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h,
variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc,
gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc,
cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h,
cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h,
cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc,
ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc,
ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc,
ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc,
ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h,
ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h,
octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc,
op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h,
anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h,
comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h,
parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h,
pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h,
pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc,
pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc,
pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h,
pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h,
pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h,
pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h,
pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h,
pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h,
pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h,
pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h,
idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h,
aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h,
gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc,
lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h,
oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc,
sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h,
oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc,
oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h,
action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h,
cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h,
lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc,
oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc,
oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc,
oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc,
pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h:
Re-indent code after switch to using namespace macros.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 01 Dec 2022 18:02:15 -0800 |
parents | e88a07dec498 |
children | 597f3ee61a48 |
comparison
equal
deleted
inserted
replaced
31605:e88a07dec498 | 31607:aac27ad79be6 |
---|---|
37 #include "utils.h" | 37 #include "utils.h" |
38 #include "variables.h" | 38 #include "variables.h" |
39 | 39 |
40 OCTAVE_BEGIN_NAMESPACE(octave) | 40 OCTAVE_BEGIN_NAMESPACE(octave) |
41 | 41 |
42 // Symbols from the symbol table. | 42 // Symbols from the symbol table. |
43 | 43 |
44 void | 44 void |
45 tree_identifier::eval_undefined_error (void) | 45 tree_identifier::eval_undefined_error (void) |
46 { | 46 { |
47 int l = line (); | 47 int l = line (); |
48 int c = column (); | 48 int c = column (); |
49 | 49 |
50 std::string msg = "'" + name () + "' undefined"; | 50 std::string msg = "'" + name () + "' undefined"; |
51 | 51 |
52 if (l > 0) | 52 if (l > 0) |
53 { | 53 { |
54 msg += " near line " + std::to_string (l); | 54 msg += " near line " + std::to_string (l); |
55 | 55 |
56 if (c > 0) | 56 if (c > 0) |
57 msg += ", column " + std::to_string (c); | 57 msg += ", column " + std::to_string (c); |
58 } | 58 } |
59 | 59 |
60 std::string missing_msg = maybe_missing_function_hook (name ()); | 60 std::string missing_msg = maybe_missing_function_hook (name ()); |
61 | 61 |
62 if (! missing_msg.empty ()) | 62 if (! missing_msg.empty ()) |
63 msg += "\n\n" + missing_msg; | 63 msg += "\n\n" + missing_msg; |
64 | 64 |
65 error_with_id ("Octave:undefined-function", "%s", msg.c_str ()); | 65 error_with_id ("Octave:undefined-function", "%s", msg.c_str ()); |
66 } | 66 } |
67 | 67 |
68 octave_lvalue | 68 octave_lvalue |
69 tree_identifier::lvalue (tree_evaluator& tw) | 69 tree_identifier::lvalue (tree_evaluator& tw) |
70 { | 70 { |
71 if (m_sym.is_added_static ()) | 71 if (m_sym.is_added_static ()) |
72 static_workspace_error (); | 72 static_workspace_error (); |
73 | 73 |
74 return octave_lvalue (m_sym, tw.get_current_stack_frame ()); | 74 return octave_lvalue (m_sym, tw.get_current_stack_frame ()); |
75 } | 75 } |
76 | 76 |
77 tree_identifier * | 77 tree_identifier * |
78 tree_identifier::dup (symbol_scope& scope) const | 78 tree_identifier::dup (symbol_scope& scope) const |
79 { | 79 { |
80 // The new tree_identifier object contains a symbol_record | 80 // The new tree_identifier object contains a symbol_record |
81 // entry from the duplicated scope. | 81 // entry from the duplicated scope. |
82 | 82 |
83 symbol_record new_sym = scope.find_symbol (name ()); | 83 symbol_record new_sym = scope.find_symbol (name ()); |
84 | 84 |
85 tree_identifier *new_id | 85 tree_identifier *new_id |
86 = new tree_identifier (new_sym, line (), column ()); | 86 = new tree_identifier (new_sym, line (), column ()); |
87 | 87 |
88 new_id->copy_base (*this); | 88 new_id->copy_base (*this); |
89 | 89 |
90 return new_id; | 90 return new_id; |
91 } | 91 } |
92 | 92 |
93 octave_value_list | 93 octave_value_list |
94 tree_identifier::evaluate_n (tree_evaluator& tw, int nargout) | 94 tree_identifier::evaluate_n (tree_evaluator& tw, int nargout) |
95 { | 95 { |
96 octave_value_list retval; | 96 octave_value_list retval; |
97 | 97 |
98 octave_value val = tw.varval (m_sym); | 98 octave_value val = tw.varval (m_sym); |
99 | 99 |
100 if (val.is_undefined ()) | 100 if (val.is_undefined ()) |
101 { | 101 { |
102 interpreter& interp = tw.get_interpreter (); | 102 interpreter& interp = tw.get_interpreter (); |
103 | 103 |
104 symbol_table& symtab = interp.get_symbol_table (); | 104 symbol_table& symtab = interp.get_symbol_table (); |
105 | 105 |
106 val = symtab.find_function (m_sym.name ()); | 106 val = symtab.find_function (m_sym.name ()); |
107 } | 107 } |
108 | 108 |
109 if (val.is_defined ()) | 109 if (val.is_defined ()) |
110 { | 110 { |
111 // GAGME -- this would be cleaner if we required | 111 // GAGME -- this would be cleaner if we required |
112 // parens to indicate function calls. | 112 // parens to indicate function calls. |
113 // | 113 // |
114 // If this identifier refers to a function, we need to know | 114 // If this identifier refers to a function, we need to know |
115 // whether it is indexed so that we can do the same thing | 115 // whether it is indexed so that we can do the same thing |
116 // for 'f' and 'f()'. If the index is present and the function | 116 // for 'f' and 'f()'. If the index is present and the function |
117 // object declares it can handle it, return the function object | 117 // object declares it can handle it, return the function object |
118 // and let tree_index_expression::rvalue handle indexing. | 118 // and let tree_index_expression::rvalue handle indexing. |
119 // Otherwise, arrange to call the function here, so that we don't | 119 // Otherwise, arrange to call the function here, so that we don't |
120 // return the function definition as a value. | 120 // return the function definition as a value. |
121 | 121 |
122 octave_function *fcn = nullptr; | 122 octave_function *fcn = nullptr; |
123 | 123 |
124 if (val.is_function ()) | 124 if (val.is_function ()) |
125 fcn = val.function_value (true); | 125 fcn = val.function_value (true); |
126 | 126 |
127 if (fcn && ! (is_postfix_indexed () | 127 if (fcn && ! (is_postfix_indexed () |
128 && fcn->accepts_postfix_index (postfix_index ()))) | 128 && fcn->accepts_postfix_index (postfix_index ()))) |
129 { | 129 { |
130 retval = fcn->call (tw, nargout); | 130 retval = fcn->call (tw, nargout); |
131 } | 131 } |
132 else | 132 else |
133 { | 133 { |
134 if (print_result () && nargout == 0 | 134 if (print_result () && nargout == 0 |
135 && tw.statement_printing_enabled ()) | 135 && tw.statement_printing_enabled ()) |
136 { | 136 { |
137 octave_value_list args = ovl (val); | 137 octave_value_list args = ovl (val); |
138 args.stash_name_tags (string_vector (name ())); | 138 args.stash_name_tags (string_vector (name ())); |
139 feval ("display", args); | 139 feval ("display", args); |
140 } | 140 } |
141 | 141 |
142 retval = ovl (val); | 142 retval = ovl (val); |
143 } | 143 } |
144 } | 144 } |
145 else if (m_sym.is_added_static ()) | 145 else if (m_sym.is_added_static ()) |
146 static_workspace_error (); | 146 static_workspace_error (); |
147 else | 147 else |
148 eval_undefined_error (); | 148 eval_undefined_error (); |
149 | 149 |
150 return retval; | 150 return retval; |
151 } | 151 } |
152 | 152 |
153 octave_lvalue | 153 octave_lvalue |
154 tree_black_hole::lvalue (tree_evaluator& tw) | 154 tree_black_hole::lvalue (tree_evaluator& tw) |
155 { | 155 { |
156 octave_lvalue retval (m_sym, tw.get_current_stack_frame ()); | 156 octave_lvalue retval (m_sym, tw.get_current_stack_frame ()); |
157 | 157 |
158 retval.mark_black_hole (); | 158 retval.mark_black_hole (); |
159 | 159 |
160 return retval; | 160 return retval; |
161 } | 161 } |
162 | 162 |
163 OCTAVE_END_NAMESPACE(octave) | 163 OCTAVE_END_NAMESPACE(octave) |