Mercurial > hg > octave-max
comparison src/oct-obj.h @ 10659:8baff2aceabc
fix slicing value lists with name tags (bug #29960)
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Wed, 26 May 2010 12:03:45 +0200 |
parents | 12884915a8e4 |
children | fd0a3ac60b0e |
comparison
equal
deleted
inserted
replaced
10658:c66a4657d764 | 10659:8baff2aceabc |
---|---|
123 octave_value_list& append (const octave_value_list& lst); | 123 octave_value_list& append (const octave_value_list& lst); |
124 | 124 |
125 octave_value_list& reverse (void); | 125 octave_value_list& reverse (void); |
126 | 126 |
127 octave_value_list | 127 octave_value_list |
128 slice (octave_idx_type offset, octave_idx_type len) const | 128 slice (octave_idx_type offset, octave_idx_type len, bool tags = false) const |
129 { return data.index (idx_vector (offset, offset + len)); } | 129 { |
130 octave_value_list retval (data.linear_slice (offset, offset + len)); | |
131 if (tags && len > 0 && names.length () > 0) | |
132 retval.names = names.linear_slice (offset, std::min (len, names.length ())); | |
133 | |
134 return retval; | |
135 } | |
130 | 136 |
131 octave_value_list | 137 octave_value_list |
132 splice (octave_idx_type offset, octave_idx_type len, | 138 splice (octave_idx_type offset, octave_idx_type len, |
133 const octave_value_list& lst = octave_value_list ()) const; | 139 const octave_value_list& lst = octave_value_list ()) const; |
134 | 140 |