Mercurial > octave-nkf
changeset 9505:a321a1c227c8
make ifelse an alias or merge
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sat, 08 Aug 2009 08:41:18 +0200 |
| parents | 941e16338677 |
| children | 4562a9a730ae |
| files | src/ChangeLog src/data.cc |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Aug 07 13:46:28 2009 -0400 +++ b/src/ChangeLog Sat Aug 08 08:41:18 2009 +0200 @@ -1,3 +1,7 @@ +2009-08-08 Jaroslav Hajek <highegg@gmail.com> + + * data.cc (Fifelse): Rename to Fmerge, alias to Fifelse. + 2009-08-06 Jaroslav Hajek <highegg@gmail.com> * OPERATORS/op-dm-template.cc, OPERATORS/op-pm-template.cc:
--- a/src/data.cc Fri Aug 07 13:46:28 2009 -0400 +++ b/src/data.cc Sat Aug 08 08:41:18 2009 +0200 @@ -6060,9 +6060,10 @@ fval.INTX ## _array_value ()); \ } -DEFUN (ifelse, args, , +DEFUN (merge, args, , "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} ifelse (@var{mask}, @var{tval}, @var{fval})\n\ +@deftypefn {Built-in Function} {} merge (@var{mask}, @var{tval}, @var{fval})\n\ +@deftypefnx {Built-in Function} {} ifelse (@var{mask}, @var{tval}, @var{fval})\n\ Merges elements of @var{true_val} and @var{false_val}, depending on the value of\n\ @var{mask}. If @var{mask} is a logical scalar, the other two arguments can be\n\ arbitrary values. Otherwise, @var{mask} must be a logical array, and @var{tval},\n\ @@ -6154,6 +6155,8 @@ return retval; } +DEFALIAS (ifelse, merge); + #undef MAKE_INT_BRANCH /*