Mercurial > octave-nkf

diff libinterp/corefcn/daspk.cc @ 20588:4bed806ee3d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more simple uses of error_state * daspk.cc, dassl.cc, dot.cc, luinc.cc, sylvester.cc, variables.cc, __eigs__.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2015 20:21:55 -0400
parents 7ac907da9fba
children
line wrap: on
line diff
--- a/libinterp/corefcn/daspk.cc	Mon Oct 05 19:29:36 2015 -0400
+++ b/libinterp/corefcn/daspk.cc	Mon Oct 05 20:21:55 2015 -0400
@@ -364,31 +364,28 @@
                   {
                     string_vector tmp = f_arg.all_strings ();
 
-                    if (! error_state)
+                    fcn_name = unique_symbol_name ("__daspk_fcn__");
+                    fname = "function y = ";
+                    fname.append (fcn_name);
+                    fname.append (" (x, xdot, t) y = ");
+                    daspk_fcn = extract_function (tmp(0), "daspk", fcn_name,
+                                                  fname, "; endfunction");
+
+                    if (daspk_fcn)
                       {
-                        fcn_name = unique_symbol_name ("__daspk_fcn__");
-                        fname = "function y = ";
-                        fname.append (fcn_name);
-                        fname.append (" (x, xdot, t) y = ");
-                        daspk_fcn = extract_function (tmp(0), "daspk", fcn_name,
-                                                      fname, "; endfunction");
+                        jac_name = unique_symbol_name ("__daspk_jac__");
+                        jname = "function jac = ";
+                        jname.append (jac_name);
+                        jname.append (" (x, xdot, t, cj) jac = ");
+                        daspk_jac = extract_function (tmp(1), "daspk",
+                                                      jac_name, jname,
+                                                      "; endfunction");
 
-                        if (daspk_fcn)
+                        if (!daspk_jac)
                           {
-                            jac_name = unique_symbol_name ("__daspk_jac__");
-                            jname = "function jac = ";
-                            jname.append (jac_name);
-                            jname.append (" (x, xdot, t, cj) jac = ");
-                            daspk_jac = extract_function (tmp(1), "daspk",
-                                                          jac_name, jname,
-                                                          "; endfunction");
-
-                            if (!daspk_jac)
-                              {
-                                if (fcn_name.length ())
-                                  clear_function (fcn_name);
-                                daspk_fcn = 0;
-                              }
+                            if (fcn_name.length ())
+                              clear_function (fcn_name);
+                            daspk_fcn = 0;
                           }
                       }
                   }
@@ -451,26 +448,23 @@
       if (jac_name.length ())
         clear_function (jac_name);
 
-      if (! error_state)
-        {
-          std::string msg = dae.error_message ();
+      std::string msg = dae.error_message ();
 
-          retval(3) = msg;
-          retval(2) = static_cast<double> (dae.integration_state ());
+      retval(3) = msg;
+      retval(2) = static_cast<double> (dae.integration_state ());
 
-          if (dae.integration_ok ())
-            {
-              retval(1) = deriv_output;
-              retval(0) = output;
-            }
-          else
-            {
-              retval(1) = Matrix ();
-              retval(0) = Matrix ();
+      if (dae.integration_ok ())
+        {
+          retval(1) = deriv_output;
+          retval(0) = output;
+        }
+      else
+        {
+          retval(1) = Matrix ();
+          retval(0) = Matrix ();
 
-              if (nargout < 3)
-                error ("daspk: %s", msg.c_str ());
-            }
+          if (nargout < 3)
+            error ("daspk: %s", msg.c_str ());
         }
     }
   else