Mercurial > octave-nkf

annotate libinterp/parse-tree/pt-cell.cc @ 20595:c1a6c31ac29a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more simple uses of error_state * ov-classdef.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Oct 2015 00:20:02 -0400
parents 7ac907da9fba
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
1 /*
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
2
19731
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 19485
diff changeset
3 Copyright (C) 1999-2015 John W. Eaton
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
4
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
6
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6039
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6039
diff changeset
10 option) any later version.
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
11
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
15 for more details.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
16
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6039
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6039
diff changeset
19 <http://www.gnu.org/licenses/>.
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
20
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
21 */
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
22
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
23 #ifdef HAVE_CONFIG_H
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
24 #include <config.h>
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
25 #endif
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
26
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3353
diff changeset
27 #include <iostream>
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
28
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
29 #include "Cell.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
30 #include "oct-obj.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
31 #include "pt-arg-list.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
32 #include "pt-exp.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
33 #include "pt-cell.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
34 #include "pt-walk.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
35 #include "ov.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
36
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
37 octave_value
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents: 8588
diff changeset
38 tree_cell::rvalue1 (int)
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
39 {
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
40 octave_value retval;
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
41
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
42 octave_idx_type nr = length ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
43 octave_idx_type nc = -1;
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
44
4501
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe]
jwe
parents: 4233
diff changeset
45 Cell val;
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
46
19485
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
47 octave_idx_type i = 0;
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
48
4219
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe]
jwe
parents: 4192
diff changeset
49 for (iterator p = begin (); p != end (); p++)
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
50 {
4219
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe]
jwe
parents: 4192
diff changeset
51 tree_argument_list *elt = *p;
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
52
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
53 octave_value_list row = elt->convert_to_const_vector ();
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
54
8588
79845b1793cf optimize cell construction from a cs-list
Jaroslav Hajek <highegg@gmail.com>
parents: 7767
diff changeset
55 if (nr == 1)
79845b1793cf optimize cell construction from a cs-list
Jaroslav Hajek <highegg@gmail.com>
parents: 7767
diff changeset
56 // Optimize the single row case.
79845b1793cf optimize cell construction from a cs-list
Jaroslav Hajek <highegg@gmail.com>
parents: 7767
diff changeset
57 val = row.cell_value ();
79845b1793cf optimize cell construction from a cs-list
Jaroslav Hajek <highegg@gmail.com>
parents: 7767
diff changeset
58 else if (nc < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
59 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
60 nc = row.length ();
4501
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe]
jwe
parents: 4233
diff changeset
61
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
62 val = Cell (nr, nc);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
63 }
4501
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe]
jwe
parents: 4233
diff changeset
64 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
65 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
66 octave_idx_type this_nc = row.length ();
4501
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe]
jwe
parents: 4233
diff changeset
67
19485
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
68 if (this_nc != nc)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
69 {
19485
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
70 if (this_nc == 0)
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
71 continue; // blank line
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
72 else
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
73 {
20463
7ac907da9fba Use error() rather than ::error() unless explicitly required.
Rik <rik@octave.org>
parents: 19731
diff changeset
74 error ("number of columns must match");
19485
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
75 return retval;
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
76 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
77 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
78 }
4501
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe]
jwe
parents: 4233
diff changeset
79
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
80 for (octave_idx_type j = 0; j < nc; j++)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
81 val(i,j) = row(j);
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
82
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
83 i++;
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
84 }
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
85
19485
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
86 if (i < nr)
e5a78897be9e Allow empty comma-separated lists in cell { } constructor (bug #43113).
Rik <rik@octave.org>
parents: 17744
diff changeset
87 val.resize (dim_vector (i, nc)); // there were blank rows
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
88 retval = val;
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
89
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
90 return retval;
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
91 }
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
92
3556
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
93 octave_value_list
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
94 tree_cell::rvalue (int nargout)
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
95 {
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
96 octave_value_list retval;
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
97
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
98 if (nargout > 1)
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
99 error ("invalid number of output arguments for cell array");
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
100 else
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents: 8588
diff changeset
101 retval = rvalue1 (nargout);
3556
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
102
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
103 return retval;
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
104 }
0343ffea47ef [project @ 2000-02-03 04:07:55 by jwe]
jwe
parents: 3503
diff changeset
105
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5307
diff changeset
106 tree_expression *
7767
71f068b22fcc scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents: 7336
diff changeset
107 tree_cell::dup (symbol_table::scope_id scope,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
108 symbol_table::context_id context) const
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5307
diff changeset
109 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5307
diff changeset
110 tree_cell *new_cell = new tree_cell (0, line (), column ());
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5307
diff changeset
111
16237
70f465930546 rearrange class heirarchy for tree_cell and tree_matrix
John W. Eaton <jwe@octave.org>
parents: 15195
diff changeset
112 new_cell->copy_base (*this, scope, context);
5861
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5307
diff changeset
113
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5307
diff changeset
114 return new_cell;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5307
diff changeset
115 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe]
jwe
parents: 5307
diff changeset
116
3353
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
117 void
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
118 tree_cell::accept (tree_walker& tw)
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
119 {
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
120 tw.visit_cell (*this);
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe]
jwe
parents:
diff changeset
121 }