Mercurial > octave-nkf

comparison libinterp/operators/op-b-b.cc @ 18212:cda4bd2fd0c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix null matrix assignment to indexed integer and logical values (bug #35921) * op-int.h (OCTAVE_INSTALL_INT_NULL_ASSIGN_OPS): Install asignment conversions for null matrix assignments to scalars. * op-b-b.cc (install_b_b_ops): Likewise. * null-assign.tst: New test.
author John W. Eaton <jwe@octave.org>
date Fri, 03 Jan 2014 20:55:33 -0500
parents d63878346099
children 4197fc428c7d
comparison
equal deleted inserted replaced
18211:775e7874b38d 18212:cda4bd2fd0c0
31 #include "ov-bool-mat.h" 31 #include "ov-bool-mat.h"
32 #include "ov-scalar.h" 32 #include "ov-scalar.h"
33 #include "ov-float.h" 33 #include "ov-float.h"
34 #include "ov-re-mat.h" 34 #include "ov-re-mat.h"
35 #include "ov-typeinfo.h" 35 #include "ov-typeinfo.h"
36 #include "ov-null-mat.h"
36 #include "ops.h" 37 #include "ops.h"
37 #include "xdiv.h" 38 #include "xdiv.h"
38 #include "xpow.h" 39 #include "xpow.h"
39 40
40 // bool unary ops. 41 // bool unary ops.
90 INSTALL_CATOP (octave_scalar, octave_bool, s_b); 91 INSTALL_CATOP (octave_scalar, octave_bool, s_b);
91 INSTALL_CATOP (octave_bool, octave_float_scalar, b_f); 92 INSTALL_CATOP (octave_bool, octave_float_scalar, b_f);
92 INSTALL_CATOP (octave_float_scalar, octave_bool, f_b); 93 INSTALL_CATOP (octave_float_scalar, octave_bool, f_b);
93 94
94 INSTALL_ASSIGNCONV (octave_bool, octave_bool, octave_bool_matrix); 95 INSTALL_ASSIGNCONV (octave_bool, octave_bool, octave_bool_matrix);
96
97 INSTALL_ASSIGNCONV (octave_bool, octave_null_matrix, octave_bool_matrix);
98 INSTALL_ASSIGNCONV (octave_bool, octave_null_str, octave_bool_matrix);
99 INSTALL_ASSIGNCONV (octave_bool, octave_null_sq_str, octave_bool_matrix);
95 } 100 }