Mercurial > octave-nkf
changeset 3797:7f5eeace12b3
[project @ 2001-02-14 05:50:36 by jwe]
| author | jwe |
|---|---|
| date | Wed, 14 Feb 2001 05:50:38 +0000 |
| parents | c34164f566f6 |
| children | 6065668133b1 |
| files | ChangeLog src/ChangeLog src/OPERATORS/op-b-b.cc src/data.cc src/load-save.cc test/octave.test/string/dec2hex-1.m |
| diffstat | 6 files changed, 31 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 14 00:17:54 2001 +0000 +++ b/ChangeLog Wed Feb 14 05:50:38 2001 +0000 @@ -1,3 +1,8 @@ +2001-02-10 Mumit Khan <khan@nanotech.wisc.edu> + + * test/octave.test/string/dec2hex-1.m: Don't assume hex format + produces lower case letters. + 2001-02-07 John W. Eaton <jwe@bevo.che.wisc.edu> * acconfig.h: Merge contents of config.h.bot.
--- a/src/ChangeLog Wed Feb 14 00:17:54 2001 +0000 +++ b/src/ChangeLog Wed Feb 14 05:50:38 2001 +0000 @@ -1,3 +1,12 @@ +2001-02-09 Cai Jianming <caijianming@yahoo.co.uk> + + * data.cc (DATA_REDUCTION): Undo previous change. + +2001-02-13 Matthew W. Roberts <matt@nephi.tamu.edu> + + * load-save.cc (Fload): Accept -4 as an alias for -v4 and -mat4-binary. + (Fsave): Likewise. + 2001-02-13 John W. Eaton <jwe@bevo.che.wisc.edu> * lex.l (lexical_feedbac::init):
--- a/src/OPERATORS/op-b-b.cc Wed Feb 14 00:17:54 2001 +0000 +++ b/src/OPERATORS/op-b-b.cc Wed Feb 14 05:50:38 2001 +0000 @@ -49,6 +49,18 @@ DEFBINOP_OP (eq, bool, bool, ==) DEFBINOP_OP (ne, bool, bool, !=) +BINOPDECL (el_and, a1, a2) +{ + CAST_BINOP_ARGS (const octave_bool&, const octave_bool&); + return octave_value (v1.bool_value () && v2.bool_value ()); +} + +BINOPDECL (el_or, a1, a2) +{ + CAST_BINOP_ARGS (const octave_bool&, const octave_bool&); + return octave_value (v1.bool_value () || v2.bool_value ()); +} + void install_b_b_ops (void) { @@ -58,6 +70,8 @@ INSTALL_BINOP (op_eq, octave_bool, octave_bool, eq); INSTALL_BINOP (op_ne, octave_bool, octave_bool, ne); + INSTALL_BINOP (op_el_and, octave_bool, octave_bool, el_and); + INSTALL_BINOP (op_el_or, octave_bool, octave_bool, el_or); } /*
--- a/src/data.cc Wed Feb 14 00:17:54 2001 +0000 +++ b/src/data.cc Wed Feb 14 05:50:38 2001 +0000 @@ -263,9 +263,6 @@ \ int dim = (nargin == 1 ? 0 : args(1).int_value (true) - 1); \ \ - if (dim == -1) \ - dim = 0; \ - \ if (! error_state) \ { \ if (dim == 0 || dim == 1) \
--- a/src/load-save.cc Wed Feb 14 00:17:54 2001 +0000 +++ b/src/load-save.cc Wed Feb 14 05:50:38 2001 +0000 @@ -3197,7 +3197,7 @@ { format = LS_MAT5_BINARY; } - else if (argv[i] == "-mat4-binary" || argv[i] == "-4") + else if (argv[i] == "-mat4-binary" || argv[i] == "-4" || argv[i] == "-v4") { format = LS_MAT_BINARY; } @@ -5016,7 +5016,7 @@ { format = LS_MAT5_BINARY; } - else if (argv[i] == "-mat4-binary" || argv[i] == "-4") + else if (argv[i] == "-mat4-binary" || argv[i] == "-4" || argv[i] == "-v4") { format = LS_MAT_BINARY; }