Mercurial > octave

changeset 20943:42319d289714

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Eliminate ANY_ALL macro in data.cc * data.cc (Fany, Fall): Replace macro call used just twice with actual expansion of code.
author Rik <rik@octave.org>
date Fri, 18 Dec 2015 17:17:24 -0800
parents 7832c351a6f5
children 9d9270e2f98f
files libinterp/corefcn/data.cc
diffstat 1 files changed, 24 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc	Fri Dec 18 16:21:05 2015 -0800
+++ b/libinterp/corefcn/data.cc	Fri Dec 18 17:17:24 2015 -0800
@@ -88,21 +88,6 @@
   error (fmt, idx.c_str (), msg.c_str ());
 }
 
-#define ANY_ALL(FCN) \
- \
-  int nargin = args.length (); \
- \
-  if (nargin < 1 || nargin > 2) \
-    print_usage (); \
- \
-  int dim = (nargin == 1 ? -1 : args(1).int_value (#FCN ": DIM must be an integer") - 1); \
- \
-  if (dim >= -1) \
-    return octave_value (args(0).FCN (dim)); \
-  else \
-    error (#FCN ": invalid dimension argument = %d", dim + 1); \
- \
-
 DEFUN (all, args, ,
        "-*- texinfo -*-\n\
 @deftypefn  {} {} all (@var{x})\n\
@@ -126,7 +111,18 @@
 @seealso{any}\n\
 @end deftypefn")
 {
-  ANY_ALL (all);
+  int nargin = args.length ();
+
+  if (nargin < 1 || nargin > 2)
+    print_usage ();
+
+  int dim = (nargin == 1 ? -1
+                         : args(1).int_value ("all: DIM must be an integer")-1);
+
+  if (dim < -1)
+    error ("all: invalid dimension argument = %d", dim + 1);
+
+  return ovl (args(0).all (dim));
 }
 
 /*
@@ -180,7 +176,18 @@
 @seealso{all}\n\
 @end deftypefn")
 {
-  ANY_ALL (any);
+  int nargin = args.length ();
+
+  if (nargin < 1 || nargin > 2)
+    print_usage ();
+
+  int dim = (nargin == 1 ? -1
+                         : args(1).int_value ("any: DIM must be an integer")-1);
+
+  if (dim < -1)
+    error ("any: invalid dimension argument = %d", dim + 1);
+
+  return ovl (args(0).any (dim));
 }
 
 /*