Mercurial > octave-nkf
diff libinterp/operators/op-int.h @ 18212:cda4bd2fd0c0
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 |
line wrap: on
line diff
--- a/libinterp/operators/op-int.h Fri Jan 03 17:33:46 2014 -0500 +++ b/libinterp/operators/op-int.h Fri Jan 03 20:55:33 2014 -0500 @@ -1160,7 +1160,10 @@ #define OCTAVE_INSTALL_INT_NULL_ASSIGN_OPS(TYPE) \ INSTALL_ASSIGNOP (op_asn_eq, octave_ ## TYPE ## _matrix, octave_null_matrix, TYPE ## null_assign) \ INSTALL_ASSIGNOP (op_asn_eq, octave_ ## TYPE ## _matrix, octave_null_str, TYPE ## null_assign) \ - INSTALL_ASSIGNOP (op_asn_eq, octave_ ## TYPE ## _matrix, octave_null_sq_str, TYPE ## null_assign) + INSTALL_ASSIGNOP (op_asn_eq, octave_ ## TYPE ## _matrix, octave_null_sq_str, TYPE ## null_assign) \ + INSTALL_ASSIGNCONV (octave_ ## TYPE ## _scalar, octave_null_matrix, octave_ ## TYPE ## _matrix) \ + INSTALL_ASSIGNCONV (octave_## TYPE ## _scalar, octave_null_str, octave_ ## TYPE ## _matrix) \ + INSTALL_ASSIGNCONV (octave_## TYPE ## _scalar, octave_null_sq_str, octave_ ## TYPE ## _matrix) #define OCTAVE_INSTALL_INT_OPS(TYPE) \ OCTAVE_INSTALL_SS_INT_OPS (TYPE) \