Mercurial > octave-nkf
changeset 9475:983de84e4bf3
rename merge -> ifelse
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Thu, 30 Jul 2009 21:14:04 +0200 |
| parents | 25ed2d6aacf6 |
| children | d9b25c5b8ee5 |
| files | src/ChangeLog src/data.cc |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 30 11:52:58 2009 -0400 +++ b/src/ChangeLog Thu Jul 30 21:14:04 2009 +0200 @@ -1,3 +1,7 @@ +2009-07-30 Jaroslav Hajek <highegg@gmail.com> + + * data.cc (Fmerge): Rename to Fifelse. + 2009-07-30 David Grundberg <individ@acc.umu.se> * symtab.h (symbol_table::parent_scope): Remove.
--- a/src/data.cc Thu Jul 30 11:52:58 2009 -0400 +++ b/src/data.cc Thu Jul 30 21:14:04 2009 +0200 @@ -6060,9 +6060,9 @@ fval.INTX ## _array_value ()); \ } -DEFUN (merge, args, , +DEFUN (ifelse, args, , "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} merge (@var{mask}, @var{tval}, @var{fval})\n\ +@deftypefn {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\