Mercurial > hg > octave-avbm

comparison src/DLD-FUNCTIONS/typecast.cc @ 9689:34d6f005db4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate is_string argument from octave_value character array constructors
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2009 00:11:07 -0400
parents e4b383a0effa
children 09da0bd91412
comparison
equal deleted inserted replaced
9688:90abfd8a2895 9689:34d6f005db4b
186 std::string numclass = args(1).string_value (); 186 std::string numclass = args(1).string_value ();
187 187
188 if (error_state || numclass.size () == 0) 188 if (error_state || numclass.size () == 0)
189 ; 189 ;
190 else if (numclass == "char") 190 else if (numclass == "char")
191 retval = octave_value (reinterpret_copy<charNDArray> (data, byte_size, old_dims), true); 191 retval = octave_value (reinterpret_copy<charNDArray> (data, byte_size, old_dims), array.is_dq_string () ? '"' : '\'');
192 else if (numclass[0] == 'i') 192 else if (numclass[0] == 'i')
193 { 193 {
194 if (numclass == "int8") 194 if (numclass == "int8")
195 retval = reinterpret_copy<int8NDArray> (data, byte_size, old_dims); 195 retval = reinterpret_copy<int8NDArray> (data, byte_size, old_dims);
196 else if (numclass == "int16") 196 else if (numclass == "int16")
302 std::string numclass = args(1).string_value (); 302 std::string numclass = args(1).string_value ();
303 303
304 if (error_state || numclass.size () == 0) 304 if (error_state || numclass.size () == 0)
305 ; 305 ;
306 else if (numclass == "char") 306 else if (numclass == "char")
307 retval = octave_value (do_bitpack<charNDArray> (bitp), true); 307 retval = octave_value (do_bitpack<charNDArray> (bitp), '\'');
308 else if (numclass[0] == 'i') 308 else if (numclass[0] == 'i')
309 { 309 {
310 if (numclass == "int8") 310 if (numclass == "int8")
311 retval = do_bitpack<int8NDArray> (bitp); 311 retval = do_bitpack<int8NDArray> (bitp);
312 else if (numclass == "int16") 312 else if (numclass == "int16")