Mercurial > octave-nkf

diff libinterp/corefcn/besselj.cc @ 20591:0650b8431037

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more simple uses of error_state * besselj.cc, bitfcns.cc, utils.cc, chol.cc, ov-java.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2015 21:37:03 -0400
parents b2100e1659ac
children
line wrap: on
line diff
--- a/libinterp/corefcn/besselj.cc	Mon Oct 05 21:13:12 2015 -0400
+++ b/libinterp/corefcn/besselj.cc	Mon Oct 05 21:37:03 2015 -0400
@@ -616,54 +616,51 @@
             error ("airy: K must be an integer value");
         }
 
-      if (! error_state)
-        {
-          int idx = nargin == 1 ? 0 : 1;
+      int idx = nargin == 1 ? 0 : 1;
 
-          if (args(idx).is_single_type ())
-            {
-              FloatComplexNDArray z = args(idx).float_complex_array_value ();
-
-              if (! error_state)
-                {
-                  Array<octave_idx_type> ierr;
-                  octave_value result;
+      if (args(idx).is_single_type ())
+        {
+          FloatComplexNDArray z = args(idx).float_complex_array_value ();
 
-                  if (kind > 1)
-                    result = biry (z, kind == 3, scale, ierr);
-                  else
-                    result = airy (z, kind == 1, scale, ierr);
+          if (! error_state)
+            {
+              Array<octave_idx_type> ierr;
+              octave_value result;
 
-                  if (nargout > 1)
-                    retval(1) = NDArray (ierr);
+              if (kind > 1)
+                result = biry (z, kind == 3, scale, ierr);
+              else
+                result = airy (z, kind == 1, scale, ierr);
 
-                  retval(0) = result;
-                }
-              else
-                error ("airy: Z must be a complex matrix");
+              if (nargout > 1)
+                retval(1) = NDArray (ierr);
+
+              retval(0) = result;
             }
           else
-            {
-              ComplexNDArray z = args(idx).complex_array_value ();
+            error ("airy: Z must be a complex matrix");
+        }
+      else
+        {
+          ComplexNDArray z = args(idx).complex_array_value ();
 
-              if (! error_state)
-                {
-                  Array<octave_idx_type> ierr;
-                  octave_value result;
+          if (! error_state)
+            {
+              Array<octave_idx_type> ierr;
+              octave_value result;
 
-                  if (kind > 1)
-                    result = biry (z, kind == 3, scale, ierr);
-                  else
-                    result = airy (z, kind == 1, scale, ierr);
+              if (kind > 1)
+                result = biry (z, kind == 3, scale, ierr);
+              else
+                result = airy (z, kind == 1, scale, ierr);
 
-                  if (nargout > 1)
-                    retval(1) = NDArray (ierr);
+              if (nargout > 1)
+                retval(1) = NDArray (ierr);
 
-                  retval(0) = result;
-                }
-              else
-                error ("airy: Z must be a complex matrix");
+              retval(0) = result;
             }
+          else
+            error ("airy: Z must be a complex matrix");
         }
     }
   else