Mercurial > hg > octave-nkf
diff src/ov.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:24:59 -0500 |
parents | fd0a3ac60b0e |
children | d08901c05c1b |
line wrap: on
line diff
--- a/src/ov.cc +++ b/src/ov.cc @@ -1177,7 +1177,7 @@ delete rep; rep = tmp; - } + } } octave_value @@ -1215,7 +1215,7 @@ octave_value octave_value::next_subsref (const std::string& type, const std::list<octave_value_list>& idx, - size_t skip) + size_t skip) { if (! error_state && idx.size () > skip) { @@ -1231,7 +1231,7 @@ octave_value_list octave_value::next_subsref (int nargout, const std::string& type, const std::list<octave_value_list>& idx, - size_t skip) + size_t skip) { if (! error_state && idx.size () > skip) { @@ -1247,7 +1247,7 @@ octave_value octave_value::next_subsref (bool auto_add, const std::string& type, const std::list<octave_value_list>& idx, - size_t skip) + size_t skip) { if (! error_state && idx.size () > skip) { @@ -1352,7 +1352,7 @@ else if (is_defined ()) { octave_value_typeinfo::assign_op_fcn f = 0; - + // Only attempt to operate in-place if this variable is unshared. if (rep->count == 1) { @@ -1533,7 +1533,7 @@ octave_value::column_vector_value (bool force_string_conv, bool frc_vec_conv) const { - return ColumnVector (vector_value (force_string_conv, + return ColumnVector (vector_value (force_string_conv, frc_vec_conv)); } @@ -1541,7 +1541,7 @@ octave_value::complex_column_vector_value (bool force_string_conv, bool frc_vec_conv) const { - return ComplexColumnVector (complex_vector_value (force_string_conv, + return ComplexColumnVector (complex_vector_value (force_string_conv, frc_vec_conv)); } @@ -1549,7 +1549,7 @@ octave_value::row_vector_value (bool force_string_conv, bool frc_vec_conv) const { - return RowVector (vector_value (force_string_conv, + return RowVector (vector_value (force_string_conv, frc_vec_conv)); } @@ -1557,7 +1557,7 @@ octave_value::complex_row_vector_value (bool force_string_conv, bool frc_vec_conv) const { - return ComplexRowVector (complex_vector_value (force_string_conv, + return ComplexRowVector (complex_vector_value (force_string_conv, frc_vec_conv)); } @@ -1615,7 +1615,7 @@ else retval = array_value (force_string_conv); } - else + else { const NDArray a = array_value (force_string_conv); if (! error_state) @@ -1691,7 +1691,7 @@ else retval = array_value (force_string_conv); } - else + else { const NDArray a = array_value (force_string_conv); if (! error_state) @@ -1744,7 +1744,7 @@ octave_value::float_column_vector_value (bool force_string_conv, bool frc_vec_conv) const { - return FloatColumnVector (float_vector_value (force_string_conv, + return FloatColumnVector (float_vector_value (force_string_conv, frc_vec_conv)); } @@ -1752,7 +1752,7 @@ octave_value::float_complex_column_vector_value (bool force_string_conv, bool frc_vec_conv) const { - return FloatComplexColumnVector (float_complex_vector_value (force_string_conv, + return FloatComplexColumnVector (float_complex_vector_value (force_string_conv, frc_vec_conv)); } @@ -1760,7 +1760,7 @@ octave_value::float_row_vector_value (bool force_string_conv, bool frc_vec_conv) const { - return FloatRowVector (float_vector_value (force_string_conv, + return FloatRowVector (float_vector_value (force_string_conv, frc_vec_conv)); } @@ -1768,7 +1768,7 @@ octave_value::float_complex_row_vector_value (bool force_string_conv, bool frc_vec_conv) const { - return FloatComplexRowVector (float_complex_vector_value (force_string_conv, + return FloatComplexRowVector (float_complex_vector_value (force_string_conv, frc_vec_conv)); } @@ -1800,7 +1800,7 @@ type_name (), "complex vector")); } -octave_value +octave_value octave_value::storable_value (void) const { octave_value retval = *this; @@ -1812,8 +1812,8 @@ return retval; } -void -octave_value::make_storable_value (void) +void +octave_value::make_storable_value (void) { if (is_null_value ()) { @@ -1873,7 +1873,7 @@ { gripe_library_execution_error (); } - } + } else gripe_binary_op (octave_value::binary_op_as_string (op), v1.class_name (), v2.class_name ()); @@ -2120,7 +2120,7 @@ { gripe_library_execution_error (); } - } + } else retval = decompose_binary_op (op, v1, v2); } @@ -2161,7 +2161,7 @@ } octave_value -do_cat_op (const octave_value& v1, const octave_value& v2, +do_cat_op (const octave_value& v1, const octave_value& v2, const Array<octave_idx_type>& ra_idx) { octave_value retval; @@ -2364,7 +2364,7 @@ if (is_undefined ()) { std::string op_str = unary_op_as_string (op); - error ("in x%s or %sx, x must be defined first", + error ("in x%s or %sx, x must be defined first", op_str.c_str (), op_str.c_str ()); return *this; } @@ -2515,7 +2515,7 @@ return binop; } -octave_value::binary_op +octave_value::binary_op octave_value::op_eq_to_binary_op (assign_op op) { binary_op binop = unknown_binary_op;