Mercurial > octave
annotate libinterp/parse-tree/pt-colon.cc @ 20940:48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
* libinterp/corefcn/oct-obj.h: Replaced. Contains a #warning issued if used in
compilation and includes "ovl.h" instead. Original file renamed to
libinterp/octave-value/ovl.h
* libinterp/corefcn/oct-obj.cc: Renamed to libinterp/octave-value/ovl.cc.
* oct-obj.cc (ovl ()): Added new function to return empty octave_value_list.
* libinterp/corefcn/module.mk: Remove oct-obj.cc from build system.
* libinterp/octave-value/module.mk: Add ovl.h and ovl.cc to build system.
* mk-opts.pl, annotation-dialog.h, Cell.cc, __contourc__.cc, __dsearchn__.cc,
__lin_interpn__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc,
betainc.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
debug.cc, defaults.cc, defun.cc, det.cc, dirfns.cc, dlmread.cc, eig.cc,
error.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc,
gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
graphics.cc, gripes.cc, help.cc, hess.cc, hex2num.cc, hook-fcn.h, input.cc,
input.h, inv.cc, kron.cc, load-save.cc, lookup.cc, ls-hdf5.cc, ls-mat-ascii.cc,
ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lsode.cc, lu.cc,
luinc.cc, max.cc, mex.cc, oct-hist.cc, oct-lvalue.cc, oct-lvalue.h, oct-map.h,
oct-stream.cc, oct.h, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, quad.cc,
quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sparse-xpow.cc,
strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.h, syscalls.cc, sysdep.cc,
time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc,
variables.cc, xpow.cc, __delaunayn__.cc, __glpk__.cc, __voronoi__.cc,
audiodevinfo.cc, audioread.cc, chol.cc, convhulln.cc, dmperm.cc, qr.cc,
symbfact.cc, mkbuiltins, ov-base-diag.h, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base-sparse.cc, ov-base-sparse.h,
ov-base.cc, ov-bool-mat.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-colon.cc,
ov-complex.cc, ov-cs-list.h, ov-cx-mat.cc, ov-dld-fcn.cc, ov-fcn.cc, ov-fcn.h,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc,
ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.h, ov-mex-fcn.cc,
ov-perm.h, ov-range.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, octave.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc,
op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc,
op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc,
op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc,
op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-double-conv.cc, op-fcdm-fcdm.cc,
op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc,
op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc,
op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc,
op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc,
op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc,
op-int-conv.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-cm.cc,
op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc,
op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc,
op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc,
op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc,
parse.h, pt-arg-list.cc, pt-assign.cc, pt-binop.cc, pt-cbinop.cc, pt-cell.cc,
pt-colon.cc, pt-const.cc, pt-eval.h, pt-fcn-handle.cc, pt-funcall.h, pt-id.cc,
pt-idx.cc, pt-jump.cc, pt-mat.cc, pt-select.cc, pt-unop.cc, token.cc,
Array-sym.cc: replace '#include "oct-obj.h"' with '#include "ovl.h"'.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 18 Dec 2015 16:04:56 -0800 |
| parents | 3951d420556c |
| children | 3aa293be0e8d |
| rev | line source |
|---|---|
| 2980 | 1 /* |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19394
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
| 2980 | 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. | |
| 2980 | 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/>. | |
| 2980 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "error.h" | |
|
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20832
diff
changeset
|
28 #include "ovl.h" |
| 2980 | 29 #include "pager.h" |
| 30 #include "ov.h" | |
| 3770 | 31 #include "pt-bp.h" |
| 2980 | 32 #include "pt-colon.h" |
| 33 #include "pt-walk.h" | |
| 34 | |
| 35 // Colon expressions. | |
| 36 | |
| 37 tree_colon_expression * | |
| 38 tree_colon_expression::append (tree_expression *t) | |
| 39 { | |
| 40 tree_colon_expression *retval = 0; | |
| 41 | |
| 42 if (op_base) | |
| 43 { | |
| 44 if (op_limit) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
45 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
46 if (op_increment) |
|
20428
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19749
diff
changeset
|
47 error ("invalid colon expression"); |
| 2980 | 48 |
|
20832
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20586
diff
changeset
|
49 // Stupid syntax: |
|
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20586
diff
changeset
|
50 // |
|
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20586
diff
changeset
|
51 // base : limit |
|
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20586
diff
changeset
|
52 // base : increment : limit |
|
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20586
diff
changeset
|
53 |
|
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20586
diff
changeset
|
54 op_increment = op_limit; |
|
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20586
diff
changeset
|
55 op_limit = t; |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
56 } |
| 2980 | 57 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
58 op_limit = t; |
| 2980 | 59 |
| 60 retval = this; | |
| 61 } | |
| 62 else | |
|
20428
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19749
diff
changeset
|
63 error ("invalid colon expression"); |
| 2980 | 64 |
| 65 return retval; | |
| 66 } | |
| 67 | |
| 68 octave_value_list | |
| 69 tree_colon_expression::rvalue (int nargout) | |
| 70 { | |
| 71 if (nargout > 1) | |
| 72 error ("invalid number of output arguments for colon expression"); | |
| 73 | |
|
20832
3951d420556c
eliminate return statements after calls to error
John W. Eaton <jwe@octave.org>
parents:
20586
diff
changeset
|
74 return rvalue1 (nargout); |
| 2980 | 75 } |
| 76 | |
| 77 octave_value | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8213
diff
changeset
|
78 tree_colon_expression::rvalue1 (int) |
| 2980 | 79 { |
| 80 octave_value retval; | |
| 81 | |
|
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20428
diff
changeset
|
82 if (! op_base || ! op_limit) |
| 2980 | 83 return retval; |
| 84 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8213
diff
changeset
|
85 octave_value ov_base = op_base->rvalue1 (); |
| 2980 | 86 |
|
20586
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
87 octave_value ov_limit = op_limit->rvalue1 (); |
| 2980 | 88 |
|
20586
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
89 if (ov_base.is_object () || ov_limit.is_object ()) |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
90 { |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
91 octave_value_list tmp1; |
|
8213
d5e08881bba8
Add overloading of the colon operator
David Bateman <dbateman@free.fr>
parents:
8011
diff
changeset
|
92 |
|
20586
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
93 if (op_increment) |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
94 { |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
95 octave_value ov_increment = op_increment->rvalue1 (); |
|
8213
d5e08881bba8
Add overloading of the colon operator
David Bateman <dbateman@free.fr>
parents:
8011
diff
changeset
|
96 |
|
20586
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
97 tmp1(2) = ov_limit; |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
98 tmp1(1) = ov_increment; |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
99 tmp1(0) = ov_base; |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
100 } |
| 5347 | 101 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
102 { |
|
20586
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
103 tmp1(1) = ov_limit; |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
104 tmp1(0) = ov_base; |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
105 } |
| 2980 | 106 |
|
20586
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
107 octave_value fcn = symbol_table::find_function ("colon", tmp1); |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
108 |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
109 if (fcn.is_defined ()) |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
110 { |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
111 octave_value_list tmp2 = fcn.do_multi_index_op (1, tmp1); |
| 2980 | 112 |
|
20586
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
113 retval = tmp2 (0); |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
114 } |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
115 else |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
116 error ("can not find overloaded colon function"); |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
117 } |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
118 else |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
119 { |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
120 octave_value ov_increment = 1.0; |
| 5347 | 121 |
|
20586
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
122 if (op_increment) |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
123 ov_increment = op_increment->rvalue1 (); |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
124 |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
125 retval = do_colon_op (ov_base, ov_increment, ov_limit, |
|
22618d5fb6ad
eliminate remaining uses of error_state in parse-tree files
John W. Eaton <jwe@octave.org>
parents:
20555
diff
changeset
|
126 is_for_cmd_expr ()); |
| 2980 | 127 } |
| 128 | |
| 129 return retval; | |
| 130 } | |
| 131 | |
| 132 void | |
| 5347 | 133 tree_colon_expression::eval_error (const std::string& s) const |
| 2980 | 134 { |
|
20428
7ac907da9fba
Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents:
19749
diff
changeset
|
135 error ("%s", s.c_str ()); |
| 2980 | 136 } |
| 137 | |
| 5066 | 138 int |
| 139 tree_colon_expression::line (void) const | |
| 140 { | |
| 141 return (op_base ? op_base->line () | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
142 : (op_increment ? op_increment->line () |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
143 : (op_limit ? op_limit->line () |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
144 : -1))); |
| 5066 | 145 } |
| 146 | |
| 147 int | |
| 148 tree_colon_expression::column (void) const | |
| 149 { | |
| 150 return (op_base ? op_base->column () | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
151 : (op_increment ? op_increment->column () |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
152 : (op_limit ? op_limit->column () |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
153 : -1))); |
| 5066 | 154 } |
| 155 | |
| 5861 | 156 tree_expression * |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
157 tree_colon_expression::dup (symbol_table::scope_id scope, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
158 symbol_table::context_id context) const |
| 5861 | 159 { |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
160 tree_colon_expression *new_ce = new |
|
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
161 tree_colon_expression (op_base ? op_base->dup (scope, context) : 0, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
162 op_limit ? op_limit->dup (scope, context) : 0, |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
163 op_increment ? op_increment->dup (scope, context) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
164 : 0, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
165 line (), column ()); |
| 5861 | 166 |
| 167 new_ce->copy_base (*new_ce); | |
| 168 | |
| 169 return new_ce; | |
| 170 } | |
| 171 | |
| 2980 | 172 void |
| 173 tree_colon_expression::accept (tree_walker& tw) | |
| 174 { | |
| 175 tw.visit_colon_expression (*this); | |
| 176 } |