Mercurial > hg > octave-nkf
view test/for.tst @ 18484:bcd71a2531d3
Support disp/display overloading in classdef
* ov-classdef.h (octave_classdef::print, octave_classdef::print_raw):
Move definition to C++ file.
(octave_classdef::print_as_scalar): Removed method.
(octave_classdef::print_name_tag, octave_classdef::print_with_name):
New methods.
* ov-classdef.cc (octave_classdef::print): Moved from header.
(octave_classdef::print_raw): Likewise. Call overloaded disp, if
defined and not called from builtin.
(octave_classdef::print_name_tag): New method.
(octave_classdef::print_with_name): New method, calls overloaded
"display" if defined.
* pr-output.cc (octave_print_internal(std::ostream, bool): Avoid
compilation warning.
(Frats, Fdisp, Ffdisp): Allow to call non-const octave_value::print.
* ov.h (octave_value::print): Make non-const.
* ov-base.h (octave_base_value::print): Likewise.
* ov-base.cc (octave_base_value::print): Likewise.
* ov-base-diag.h (octave_base_diag::print): Likewise.
* ov-base-diag.cc (octave_base_diag::print): Likewise.
* ov-base-mat.h (octave_base_matrix::print): Likewise.
* ov-base-mat.cc (octave_base_matrix::print): Likewise.
* ov-base-scalar.h (octave_base_scalar::print): Likewise.
* ov-base-scalar.cc (octave_base_scalar::print): Likewise.
* ov-base-sparse.h (octave_base_sparse::print): Likewise.
* ov-base-sparse.cc (octave_base_sparse::print): Likewise.
* ov-cell.h (octave_cell::print): Likewise.
* ov-cell.cc (octave_cell::print): Likewise.
* ov-class.h (octave_class::print): Likewise.
* ov-class.cc (octave_class::print): Likewise.
* ov-colon.h (octave_magic_colon::print): Likewise.
* ov-colon.cc (octave_magic_colon::print): Likewise.
* ov-fcn-handle.h (octave_fcn_handle::print): Likewise.
* ov-fcn-handle.cc (octave_fcn_handle::print): Likewise.
* ov-fcn-inline.h (octave_fcn_inline::print): Likewise.
* ov-fcn-inline.cc (octave_fcn_inline::print): Likewise.
* ov-java.h (octave_java::print): Likewise.
* ov-java.cc (octave_java::print): Likewise.
* ov-lazy-idx.h (octave_lazy_index::print): Likewise.
* ov-oncleanup.h (octave_oncleanup::print): Likewise.
* ov-oncleanup.cc (octave_oncleanup::print): Likewise.
* ov-perm.h (octave_perm_matrix::print): Likewise.
* ov-perm.cc (octave_perm_matrix::print): Likewise.
* ov-range.h (octave_range::print): Likewise.
* ov-range.cc (octave_range::print): Likewise.
* ov-struct.h (octave_struct::print, octave_scalar_struct): Likewise.
* ov-struct.cc (octave_struct::print, octave_scalar_struct): Likewise.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Fri, 31 Jan 2014 11:41:19 -0500 |
parents | d63878346099 |
children | 4197fc428c7d |
line wrap: on
line source
## Copyright (C) 2006-2013 John W. Eaton ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. %!test %! for i = 1 %! __printf_assert__ ("%d", i); %! end # "end" is part of test, check not using "endfor" %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1")); %!test %! for i = 1:4 %! __printf_assert__ ("%d", i); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1234")); %!test %! for i = [1,2,3,4] %! __printf_assert__ ("%d", i); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1234")); %!test %! for i = [1,2;3,4] %! __printf_assert__ ("%d", i(1,1)); %! __printf_assert__ ("%d", i(2,1)); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1324")); %!test %! for i = I %! __printf_assert__ ("%d", imag (i)); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1")); %!test %! for i = [1,2,3,4]*I %! __printf_assert__ ("%d", imag (i)); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1234")); %!test %! for i = [1,2;3,4]*I %! __printf_assert__ ("%d", imag (i(1,1))); %! __printf_assert__ ("%d", imag (i(2,1))); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1324")); %!test %! for i = [1,2,3,4] %! if (i > 2) %! break; %! endif %! __printf_assert__ ("%d", i); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("12")); %!test %! for i = [1,2,3,4] %! if (i < 3) %! continue; %! endif %! __printf_assert__ ("%d", i); %! endfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("34")); %!test %! a = [1,3;2,4]; %! j = 0; %! for i = cat (3, a, 4 + a) %! assert (i, [1;2] + 2*j++) %! endfor %!test %! a = {1,3;2,4}; %! j = 0; %! for i = cat (3, a, cellfun (@(x) 4 + x, a, "UniformOutput", 0)) %! assert (i, {1 + 2*j; 2 + 2*j++}) %! endfor ## test parsing of single-quoted character string appearing at the ## beginning of a for loop %!test %! for i = 1:5 %! 'foo'; %! endfor %! assert (i, 5); %!test %! parfor i = 1 %! __printf_assert__ ("%d", i); %! end # "end" is part of test, check not using "endparfor" %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1")); %!test %! parfor i = 1:4 %! __printf_assert__ ("%d", i); %! endparfor %! __printf_assert__ ("\n"); %! assert (__prog_output_assert__ ("1234"));