Mercurial > octave-nkf
changeset 3799:36fe147645b6
[project @ 2001-02-18 19:06:24 by jwe]
| author | jwe |
|---|---|
| date | Sun, 18 Feb 2001 19:06:24 +0000 |
| parents | 6065668133b1 |
| children | 115cbfcd067e |
| files | src/ChangeLog src/OPERATORS/op-s-s.cc |
| diffstat | 2 files changed, 6 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 14 06:05:29 2001 +0000 +++ b/src/ChangeLog Sun Feb 18 19:06:24 2001 +0000 @@ -1,3 +1,7 @@ +2001-02-18 John W. Eaton <jwe@bevo.che.wisc.edu> + + * OPERATORS/op-s-s.cc (el_or, el_and): Return bool value. + 2001-02-14 John W. Eaton <jwe@bevo.che.wisc.edu> * pt-binop.cc (tree_boolean_expression::rvalue):
--- a/src/OPERATORS/op-s-s.cc Wed Feb 14 06:05:29 2001 +0000 +++ b/src/OPERATORS/op-s-s.cc Sun Feb 18 19:06:24 2001 +0000 @@ -114,23 +114,8 @@ return octave_value (v2.double_value () / d); } -DEFBINOP (el_and, scalar, scalar) -{ - CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); - - double result = v1.double_value () && v2.double_value (); - - return octave_value (result); -} - -DEFBINOP (el_or, scalar, scalar) -{ - CAST_BINOP_ARGS (const octave_scalar&, const octave_scalar&); - - double result = v1.double_value () || v2.double_value (); - - return octave_value (result); -} +DEFBINOP_OP (el_and, scalar, scalar, &&) +DEFBINOP_OP (el_or, scalar, scalar, ||) DEFCONV (matrix_conv, scalar, matrix) {