Mercurial > octave-nkf

comparison libinterp/parse-tree/pt-unop.cc @ 20587:f90c8372b7ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate many more simple uses of error_state * Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc, det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc, levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc, lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc, pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc, strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc, __osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc, symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, 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-lazy-idx.cc, ov-mex-fcn.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc, pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc, pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2015 19:29:36 -0400
parents 4197fc428c7d
children
comparison
equal deleted inserted replaced
20586:b7ac1e94266e 20587:f90c8372b7ba
60 octave_value 60 octave_value
61 tree_prefix_expression::rvalue1 (int) 61 tree_prefix_expression::rvalue1 (int)
62 { 62 {
63 octave_value retval; 63 octave_value retval;
64 64
65 if (error_state)
66 return retval;
67
68 if (op) 65 if (op)
69 { 66 {
70 if (etype == octave_value::op_incr || etype == octave_value::op_decr) 67 if (etype == octave_value::op_incr || etype == octave_value::op_decr)
71 { 68 {
72 octave_lvalue ref = op->lvalue (); 69 octave_lvalue ref = op->lvalue ();
73 70
74 if (! error_state) 71 BEGIN_PROFILER_BLOCK (tree_prefix_expression)
75 {
76 BEGIN_PROFILER_BLOCK (tree_prefix_expression)
77 72
78 ref.do_unary_op (etype); 73 ref.do_unary_op (etype);
79 74
80 if (! error_state) 75 retval = ref.value ();
81 retval = ref.value ();
82 76
83 END_PROFILER_BLOCK 77 END_PROFILER_BLOCK
84 }
85 } 78 }
86 else 79 else
87 { 80 {
88 octave_value val = op->rvalue1 (); 81 octave_value val = op->rvalue1 ();
89 82
90 if (! error_state && val.is_defined ()) 83 if (val.is_defined ())
91 { 84 {
92 BEGIN_PROFILER_BLOCK (tree_prefix_expression) 85 BEGIN_PROFILER_BLOCK (tree_prefix_expression)
93 86
94 // Attempt to do the operation in-place if it is unshared 87 // Attempt to do the operation in-place if it is unshared
95 // (a temporary expression). 88 // (a temporary expression).
96 if (val.get_count () == 1) 89 if (val.get_count () == 1)
97 retval = val.do_non_const_unary_op (etype); 90 retval = val.do_non_const_unary_op (etype);
98 else 91 else
99 retval = ::do_unary_op (etype, val); 92 retval = ::do_unary_op (etype, val);
100
101 if (error_state)
102 retval = octave_value ();
103 93
104 END_PROFILER_BLOCK 94 END_PROFILER_BLOCK
105 } 95 }
106 } 96 }
107 } 97 }
147 octave_value 137 octave_value
148 tree_postfix_expression::rvalue1 (int) 138 tree_postfix_expression::rvalue1 (int)
149 { 139 {
150 octave_value retval; 140 octave_value retval;
151 141
152 if (error_state)
153 return retval;
154
155 if (op) 142 if (op)
156 { 143 {
157 if (etype == octave_value::op_incr || etype == octave_value::op_decr) 144 if (etype == octave_value::op_incr || etype == octave_value::op_decr)
158 { 145 {
159 octave_lvalue ref = op->lvalue (); 146 octave_lvalue ref = op->lvalue ();
160 147
161 if (! error_state) 148 retval = ref.value ();
162 {
163 retval = ref.value ();
164 149
165 BEGIN_PROFILER_BLOCK (tree_postfix_expression) 150 BEGIN_PROFILER_BLOCK (tree_postfix_expression)
166 151
167 ref.do_unary_op (etype); 152 ref.do_unary_op (etype);
168 153
169 END_PROFILER_BLOCK 154 END_PROFILER_BLOCK
170 }
171 } 155 }
172 else 156 else
173 { 157 {
174 octave_value val = op->rvalue1 (); 158 octave_value val = op->rvalue1 ();
175 159
176 if (! error_state && val.is_defined ()) 160 if (val.is_defined ())
177 { 161 {
178 BEGIN_PROFILER_BLOCK (tree_postfix_expression) 162 BEGIN_PROFILER_BLOCK (tree_postfix_expression)
179 163
180 retval = ::do_unary_op (etype, val); 164 retval = ::do_unary_op (etype, val);
181
182 if (error_state)
183 retval = octave_value ();
184 165
185 END_PROFILER_BLOCK 166 END_PROFILER_BLOCK
186 } 167 }
187 } 168 }
188 } 169 }