Mercurial > octave

changeset 30046:b3717fd85e49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. * build-aux/mk-opts.pl: Rename member variable to "m_reset" used by all *-opts.in files. * DAEFunc.h, DASPK-opts.in, DASPK.cc, DASPK.h, DASRT-opts.in, DASRT.cc, DASRT.h, DASSL-opts.in, DASSL.cc, DASSL.h, LSODE-opts.in, LSODE.cc, LSODE.h: use "m_" prefix for member variables ODE/DAE classes.
author Rik <rik@octave.org>
date Wed, 25 Aug 2021 15:38:23 -0700
parents 849bd0f1129c
children 02e28f7e4d04
files build-aux/mk-opts.pl liboctave/numeric/DAEFunc.h liboctave/numeric/DASPK-opts.in liboctave/numeric/DASPK.cc liboctave/numeric/DASPK.h liboctave/numeric/DASRT-opts.in liboctave/numeric/DASRT.cc liboctave/numeric/DASRT.h liboctave/numeric/DASSL-opts.in liboctave/numeric/DASSL.cc liboctave/numeric/DASSL.h liboctave/numeric/LSODE-opts.in liboctave/numeric/LSODE.cc liboctave/numeric/LSODE.h
diffstat 14 files changed, 290 insertions(+), 288 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/mk-opts.pl	Wed Aug 25 14:40:16 2021 -0700
+++ b/build-aux/mk-opts.pl	Wed Aug 25 15:38:23 2021 -0700
@@ -336,7 +336,7 @@
       print "${pfx}$OPTVAR[$i] = ${var}.$OPTVAR[$i];\n";
     }
 
-  print "${pfx}reset = ${var}.reset;\n";
+  print "${pfx}m_reset = ${var}.m_reset;\n";
 }
 
 ## To silence GCC warnings, we create an initialization list even
@@ -353,7 +353,7 @@
       print "${prefix}$OPTVAR[$i] (),\n";
     }
 
-  print "${prefix}reset ()\n";
+  print "${prefix}m_reset ()\n";
 }
 
 sub emit_copy_ctor_init_list
@@ -367,7 +367,7 @@
       print "${prefix}$OPTVAR[$i] ($var.$OPTVAR[$i]),\n";
     }
 
-  print "${prefix}reset ($var.reset)\n";
+  print "${prefix}m_reset ($var.m_reset)\n";
 }
 
 sub emit_opt_class_header
@@ -441,7 +441,7 @@
         }
     }
 
-  print "      reset = true;\n",
+  print "      m_reset = true;\n",
         "    }\n";
 
   ## For backward compatibility and because set_options is probably
@@ -460,7 +460,7 @@
         {
           emit_set_decl ($i);
 
-          print "\n    { $OPTVAR[$i] = $SET_EXPR[$i]; reset = true; }\n";
+          print "\n    { $OPTVAR[$i] = $SET_EXPR[$i]; m_reset = true; }\n";
         }
       elsif ($SET_BODY[$i])
         {
@@ -470,7 +470,7 @@
           chomp ($s);
           $s = '  ' . $s;
           $s =~ s/\n/\n  /g;
-          print "\n    {\n$s\n      reset = true;\n    }\n";
+          print "\n    {\n$s\n      m_reset = true;\n    }\n";
         }
       elsif ($SET_CODE[$i])
         {
@@ -494,7 +494,7 @@
       print "  $TYPE[$i] $OPTVAR[$i];\n";
     }
 
-  print "\nprotected:\n\n  bool reset;\n};\n\n#endif\n";
+  print "\nprotected:\n\n  bool m_reset;\n};\n\n#endif\n";
 }
 
 sub emit_set_decl
--- a/liboctave/numeric/DAEFunc.h	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DAEFunc.h	Wed Aug 25 15:38:23 2021 -0700
@@ -49,59 +49,59 @@
                                 double t, double cj);
 
   DAEFunc (void)
-    : fun (nullptr), jac (nullptr), reset (true) { }
+    : m_fun (nullptr), m_jac (nullptr), m_reset (true) { }
 
   DAEFunc (DAERHSFunc f)
-    : fun (f), jac (nullptr), reset (true) { }
+    : m_fun (f), m_jac (nullptr), m_reset (true) { }
 
   DAEFunc (DAERHSFunc f, DAEJacFunc j)
-    : fun (f), jac (j), reset (true) { }
+    : m_fun (f), m_jac (j), m_reset (true) { }
 
   DAEFunc (const DAEFunc& a)
-    : fun (a.fun), jac (a.jac), reset (a.reset) { }
+    : m_fun (a.m_fun), m_jac (a.m_jac), m_reset (a.m_reset) { }
 
   DAEFunc& operator = (const DAEFunc& a)
   {
     if (this != &a)
       {
-        fun = a.fun;
-        jac = a.jac;
-        reset = a.reset;
+        m_fun = a.m_fun;
+        m_jac = a.m_jac;
+        m_reset = a.m_reset;
       }
     return *this;
   }
 
   virtual ~DAEFunc (void) = default;
 
-  DAERHSFunc function (void) const { return fun; }
+  DAERHSFunc function (void) const { return m_fun; }
 
   DAEFunc& set_function (DAERHSFunc f)
   {
-    fun = f;
-    reset = true;
+    m_fun = f;
+    m_reset = true;
     return *this;
   }
 
-  DAEJacFunc jacobian_function (void) const { return jac; }
+  DAEJacFunc jacobian_function (void) const { return m_jac; }
 
   DAEFunc& set_jacobian_function (DAEJacFunc j)
   {
-    jac = j;
-    reset = true;
+    m_jac = j;
+    m_reset = true;
     return *this;
   }
 
 protected:
 
-  DAERHSFunc fun;
-  DAEJacFunc jac;
+  DAERHSFunc m_fun;
+  DAEJacFunc m_jac;
 
   // This variable is TRUE when this object is constructed, and also
   // after any internal data has changed.  Derived classes may use
   // this information (and change it) to know when to (re)initialize
   // their own internal data related to this object.
 
-  bool reset;
+  bool m_reset;
 };
 
 #endif
--- a/liboctave/numeric/DASPK-opts.in	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASPK-opts.in	Wed Aug 25 15:38:23 2021 -0700
@@ -46,11 +46,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = (val > 0.0) ? val : ::sqrt (std::numeric_limits<double>::epsilon ());
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
@@ -82,11 +82,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = (val > 0.0) ? val : ::sqrt (std::numeric_limits<double>::epsilon ());
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
@@ -234,11 +234,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = val;
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
@@ -303,11 +303,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = val;
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
--- a/liboctave/numeric/DASPK.cc	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASPK.cc	Wed Aug 25 15:38:23 2021 -0700
@@ -144,30 +144,30 @@
 
   ColumnVector retval;
 
-  if (! initialized || restart || DAEFunc::reset || DASPK_options::reset)
+  if (! m_initialized || restart || DAEFunc::m_reset || DASPK_options::m_reset)
     {
       integration_error = false;
 
-      initialized = true;
+      m_initialized = true;
 
-      info.resize (dim_vector (20, 1));
+      m_info.resize (dim_vector (20, 1));
 
       for (F77_INT i = 0; i < 20; i++)
-        info(i) = 0;
+        m_info(i) = 0;
 
       F77_INT n = octave::to_f77_int (size ());
 
       nn = n;
 
-      info(0) = 0;
+      m_info(0) = 0;
 
       if (stop_time_set)
         {
-          rwork(0) = stop_time;
-          info(3) = 1;
+          m_rwork(0) = stop_time;
+          m_info(3) = 1;
         }
       else
-        info(3) = 0;
+        m_info(3) = 0;
 
       // DAEFunc
 
@@ -200,42 +200,42 @@
           return retval;
         }
 
-      info(4) = (user_jac ? 1 : 0);
+      m_info(4) = (user_jac ? 1 : 0);
 
-      DAEFunc::reset = false;
+      DAEFunc::m_reset = false;
 
       octave_idx_type eiq = enforce_inequality_constraints ();
       octave_idx_type ccic = compute_consistent_initial_condition ();
       octave_idx_type eavfet = exclude_algebraic_variables_from_error_test ();
 
-      liw = 40 + n;
+      m_liw = 40 + n;
       if (eiq == 1 || eiq == 3)
-        liw += n;
+        m_liw += n;
       if (ccic == 1 || eavfet == 1)
-        liw += n;
+        m_liw += n;
 
-      lrw = 50 + 9*n + n*n;
+      m_lrw = 50 + 9*n + n*n;
       if (eavfet == 1)
-        lrw += n;
+        m_lrw += n;
 
-      iwork.resize (dim_vector (liw, 1));
-      rwork.resize (dim_vector (lrw, 1));
+      m_iwork.resize (dim_vector (m_liw, 1));
+      m_rwork.resize (dim_vector (m_lrw, 1));
 
       // DASPK_options
 
-      abs_tol = absolute_tolerance ();
-      rel_tol = relative_tolerance ();
+      m_abs_tol = absolute_tolerance ();
+      m_rel_tol = relative_tolerance ();
 
-      F77_INT abs_tol_len = octave::to_f77_int (abs_tol.numel ());
-      F77_INT rel_tol_len = octave::to_f77_int (rel_tol.numel ());
+      F77_INT abs_tol_len = octave::to_f77_int (m_abs_tol.numel ());
+      F77_INT rel_tol_len = octave::to_f77_int (m_rel_tol.numel ());
 
       if (abs_tol_len == 1 && rel_tol_len == 1)
         {
-          info(1) = 0;
+          m_info(1) = 0;
         }
       else if (abs_tol_len == n && rel_tol_len == n)
         {
-          info(1) = 1;
+          m_info(1) = 1;
         }
       else
         {
@@ -250,28 +250,28 @@
       double hmax = maximum_step_size ();
       if (hmax >= 0.0)
         {
-          rwork(1) = hmax;
-          info(6) = 1;
+          m_rwork(1) = hmax;
+          m_info(6) = 1;
         }
       else
-        info(6) = 0;
+        m_info(6) = 0;
 
       double h0 = initial_step_size ();
       if (h0 >= 0.0)
         {
-          rwork(2) = h0;
-          info(7) = 1;
+          m_rwork(2) = h0;
+          m_info(7) = 1;
         }
       else
-        info(7) = 0;
+        m_info(7) = 0;
 
       octave_idx_type maxord = maximum_order ();
       if (maxord >= 0)
         {
           if (maxord > 0 && maxord < 6)
             {
-              info(8) = 1;
-              iwork(2) = octave::to_f77_int (maxord);
+              m_info(8) = 1;
+              m_iwork(2) = octave::to_f77_int (maxord);
             }
           else
             {
@@ -305,7 +305,7 @@
                         integration_error = true;
                         return retval;
                       }
-                    iwork(40+i) = val;
+                    m_iwork(40+i) = val;
                   }
               }
             else
@@ -321,7 +321,7 @@
 
         case 0:
         case 2:
-          info(9) = octave::to_f77_int (eiq);
+          m_info(9) = octave::to_f77_int (eiq);
           break;
 
         default:
@@ -355,7 +355,7 @@
                        "%" OCTAVE_IDX_TYPE_FORMAT, eiq);
 
                   for (F77_INT i = 0; i < n; i++)
-                    iwork(lid+i) = (av(i) ? -1 : 1);
+                    m_iwork(lid+i) = (av(i) ? -1 : 1);
                 }
               else
                 {
@@ -375,12 +375,12 @@
               return retval;
             }
 
-          info(10) = octave::to_f77_int (ccic);
+          m_info(10) = octave::to_f77_int (ccic);
         }
 
       if (eavfet)
         {
-          info(15) = 1;
+          m_info(15) = 1;
 
           // FIXME: this code is duplicated above.
 
@@ -401,7 +401,7 @@
                    eiq);
 
               for (F77_INT i = 0; i < n; i++)
-                iwork(lid+i) = (av(i) ? -1 : 1);
+                m_iwork(lid+i) = (av(i) ? -1 : 1);
             }
         }
 
@@ -411,13 +411,13 @@
 
           if (ich.numel () == 6)
             {
-              iwork(31) = octave::to_f77_int (octave::math::nint_big (ich(0)));
-              iwork(32) = octave::to_f77_int (octave::math::nint_big (ich(1)));
-              iwork(33) = octave::to_f77_int (octave::math::nint_big (ich(2)));
-              iwork(34) = octave::to_f77_int (octave::math::nint_big (ich(3)));
+              m_iwork(31) = octave::to_f77_int (octave::math::nint_big (ich(0)));
+              m_iwork(32) = octave::to_f77_int (octave::math::nint_big (ich(1)));
+              m_iwork(33) = octave::to_f77_int (octave::math::nint_big (ich(2)));
+              m_iwork(34) = octave::to_f77_int (octave::math::nint_big (ich(3)));
 
-              rwork(13) = ich(4);
-              rwork(14) = ich(5);
+              m_rwork(13) = ich(4);
+              m_rwork(14) = ich(5);
             }
           else
             {
@@ -428,7 +428,7 @@
               return retval;
             }
 
-          info(16) = 1;
+          m_info(16) = 1;
         }
 
       octave_idx_type pici = print_initial_condition_info ();
@@ -437,7 +437,7 @@
         case 0:
         case 1:
         case 2:
-          info(17) = octave::to_f77_int (pici);
+          m_info(17) = octave::to_f77_int (pici);
           break;
 
         default:
@@ -449,7 +449,7 @@
           break;
         }
 
-      DASPK_options::reset = false;
+      DASPK_options::m_reset = false;
 
       restart = false;
     }
@@ -457,13 +457,13 @@
   double *px = x.fortran_vec ();
   double *pxdot = xdot.fortran_vec ();
 
-  F77_INT *pinfo = info.fortran_vec ();
+  F77_INT *pinfo = m_info.fortran_vec ();
 
-  double *prel_tol = rel_tol.fortran_vec ();
-  double *pabs_tol = abs_tol.fortran_vec ();
+  double *prel_tol = m_rel_tol.fortran_vec ();
+  double *pabs_tol = m_abs_tol.fortran_vec ();
 
-  double *prwork = rwork.fortran_vec ();
-  F77_INT *piwork = iwork.fortran_vec ();
+  double *prwork = m_rwork.fortran_vec ();
+  F77_INT *piwork = m_iwork.fortran_vec ();
 
   double *dummy = nullptr;
   F77_INT *idummy = nullptr;
@@ -471,8 +471,8 @@
   F77_INT tmp_istate = octave::to_f77_int (istate);
 
   F77_XFCN (ddaspk, DDASPK, (ddaspk_f, nn, t, px, pxdot, tout, pinfo,
-                             prel_tol, pabs_tol, tmp_istate, prwork, lrw,
-                             piwork, liw, dummy, idummy, ddaspk_j,
+                             prel_tol, pabs_tol, tmp_istate, prwork, m_lrw,
+                             piwork, m_liw, dummy, idummy, ddaspk_j,
                              ddaspk_psol));
 
   istate = tmp_istate;
--- a/liboctave/numeric/DASPK.h	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASPK.h	Wed Aug 25 15:38:23 2021 -0700
@@ -42,18 +42,19 @@
 public:
 
   DASPK (void)
-    : DAE (), DASPK_options (), initialized (false), liw (0), lrw (0),
-      info (), iwork (), rwork (), abs_tol (), rel_tol () { }
+    : DAE (), DASPK_options (), m_initialized (false), m_liw (0), m_lrw (0),
+      m_info (), m_iwork (), m_rwork (), m_abs_tol (), m_rel_tol () { }
 
   DASPK (const ColumnVector& s, double tm, DAEFunc& f)
-    : DAE (s, tm, f), DASPK_options (), initialized (false), liw (0),
-      lrw (0), info (), iwork (), rwork (), abs_tol (), rel_tol () { }
+    : DAE (s, tm, f), DASPK_options (), m_initialized (false), m_liw (0),
+      m_lrw (0), m_info (), m_iwork (), m_rwork (), m_abs_tol (), m_rel_tol ()
+  { }
 
   DASPK (const ColumnVector& s, const ColumnVector& deriv,
          double tm, DAEFunc& f)
-    : DAE (s, deriv, tm, f), DASPK_options (), initialized (false),
-      liw (0), lrw (0), info (), iwork (), rwork (), abs_tol (),
-      rel_tol () { }
+    : DAE (s, deriv, tm, f), DASPK_options (), m_initialized (false),
+      m_liw (0), m_lrw (0), m_info (), m_iwork (), m_rwork (), m_abs_tol (),
+      m_rel_tol () { }
 
   ~DASPK (void) = default;
 
@@ -72,18 +73,18 @@
 
 private:
 
-  bool initialized;
+  bool m_initialized;
 
-  octave_f77_int_type liw;
-  octave_f77_int_type lrw;
+  octave_f77_int_type m_liw;
+  octave_f77_int_type m_lrw;
 
-  Array<octave_f77_int_type> info;
-  Array<octave_f77_int_type> iwork;
+  Array<octave_f77_int_type> m_info;
+  Array<octave_f77_int_type> m_iwork;
 
-  Array<double> rwork;
+  Array<double> m_rwork;
 
-  Array<double> abs_tol;
-  Array<double> rel_tol;
+  Array<double> m_abs_tol;
+  Array<double> m_rel_tol;
 };
 
 #endif
--- a/liboctave/numeric/DASRT-opts.in	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASRT-opts.in	Wed Aug 25 15:38:23 2021 -0700
@@ -46,11 +46,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = (val > 0.0) ? val : ::sqrt (std::numeric_limits<double>::epsilon ());
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
@@ -82,11 +82,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = (val > 0.0) ? val : ::sqrt (std::numeric_limits<double>::epsilon ());
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
--- a/liboctave/numeric/DASRT.cc	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASRT.cc	Wed Aug 25 15:38:23 2021 -0700
@@ -119,7 +119,7 @@
 
 static F77_INT
 ddasrt_g (const F77_INT& neq, const double& t, const double *state,
-          const F77_INT& ng, double *gout, double *, F77_INT *)
+          const F77_INT& m_ng, double *gout, double *, F77_INT *)
 {
   F77_INT n = neq;
 
@@ -129,7 +129,7 @@
 
   ColumnVector tmp_fval = (*user_csub) (tmp_state, t);
 
-  for (F77_INT i = 0; i < ng; i++)
+  for (F77_INT i = 0; i < m_ng; i++)
     gout[i] = tmp_fval(i);
 
   return 0;
@@ -142,17 +142,17 @@
   // call, or if anything about the problem has changed, we should
   // start completely fresh.
 
-  if (! initialized || restart
-      || DAEFunc::reset || DAERTFunc::reset || DASRT_options::reset)
+  if (! m_initialized || restart
+      || DAEFunc::m_reset || DAERTFunc::m_reset || DASRT_options::m_reset)
     {
       integration_error = false;
 
-      initialized = true;
+      m_initialized = true;
 
-      info.resize (dim_vector (15, 1));
+      m_info.resize (dim_vector (15, 1));
 
       for (F77_INT i = 0; i < 15; i++)
-        info(i) = 0;
+        m_info(i) = 0;
 
       F77_INT n = octave::to_f77_int (size ());
 
@@ -165,18 +165,18 @@
       if (user_csub)
         {
           ColumnVector tmp = (*user_csub) (x, t);
-          ng = octave::to_f77_int (tmp.numel ());
+          m_ng = octave::to_f77_int (tmp.numel ());
         }
       else
-        ng = 0;
+        m_ng = 0;
 
       F77_INT maxord = octave::to_f77_int (maximum_order ());
       if (maxord >= 0)
         {
           if (maxord > 0 && maxord < 6)
             {
-              info(8) = 1;
-              iwork(2) = maxord;
+              m_info(8) = 1;
+              m_iwork(2) = maxord;
             }
           else
             {
@@ -187,21 +187,21 @@
             }
         }
 
-      liw = 21 + n;
-      lrw = 50 + 9*n + n*n + 3*ng;
+      m_liw = 21 + n;
+      m_lrw = 50 + 9*n + n*n + 3*m_ng;
 
-      iwork.resize (dim_vector (liw, 1));
-      rwork.resize (dim_vector (lrw, 1));
+      m_iwork.resize (dim_vector (m_liw, 1));
+      m_rwork.resize (dim_vector (m_lrw, 1));
 
-      info(0) = 0;
+      m_info(0) = 0;
 
       if (stop_time_set)
         {
-          info(3) = 1;
-          rwork(0) = stop_time;
+          m_info(3) = 1;
+          m_rwork(0) = stop_time;
         }
       else
-        info(3) = 0;
+        m_info(3) = 0;
 
       restart = false;
 
@@ -234,56 +234,56 @@
           return;
         }
 
-      info(4) = (user_jsub ? 1 : 0);
+      m_info(4) = (user_jsub ? 1 : 0);
 
-      DAEFunc::reset = false;
+      DAEFunc::m_reset = false;
 
-      jroot.resize (dim_vector (ng, 1), 1);
+      m_jroot.resize (dim_vector (m_ng, 1), 1);
 
-      DAERTFunc::reset = false;
+      DAERTFunc::m_reset = false;
 
       // DASRT_options
 
       double mss = maximum_step_size ();
       if (mss >= 0.0)
         {
-          rwork(1) = mss;
-          info(6) = 1;
+          m_rwork(1) = mss;
+          m_info(6) = 1;
         }
       else
-        info(6) = 0;
+        m_info(6) = 0;
 
       double iss = initial_step_size ();
       if (iss >= 0.0)
         {
-          rwork(2) = iss;
-          info(7) = 1;
+          m_rwork(2) = iss;
+          m_info(7) = 1;
         }
       else
-        info(7) = 0;
+        m_info(7) = 0;
 
       F77_INT sl = octave::to_f77_int (step_limit ());
       if (sl >= 0)
         {
-          info(11) = 1;
-          iwork(20) = sl;
+          m_info(11) = 1;
+          m_iwork(20) = sl;
         }
       else
-        info(11) = 0;
+        m_info(11) = 0;
 
-      abs_tol = absolute_tolerance ();
-      rel_tol = relative_tolerance ();
+      m_abs_tol = absolute_tolerance ();
+      m_rel_tol = relative_tolerance ();
 
-      F77_INT abs_tol_len = octave::to_f77_int (abs_tol.numel ());
-      F77_INT rel_tol_len = octave::to_f77_int (rel_tol.numel ());
+      F77_INT abs_tol_len = octave::to_f77_int (m_abs_tol.numel ());
+      F77_INT rel_tol_len = octave::to_f77_int (m_rel_tol.numel ());
 
       if (abs_tol_len == 1 && rel_tol_len == 1)
         {
-          info.elem (1) = 0;
+          m_info.elem (1) = 0;
         }
       else if (abs_tol_len == n && rel_tol_len == n)
         {
-          info.elem (1) = 1;
+          m_info.elem (1) = 1;
         }
       else
         {
@@ -294,21 +294,21 @@
           return;
         }
 
-      DASRT_options::reset = false;
+      DASRT_options::m_reset = false;
     }
 
   double *px = x.fortran_vec ();
   double *pxdot = xdot.fortran_vec ();
 
-  F77_INT *pinfo = info.fortran_vec ();
+  F77_INT *pinfo = m_info.fortran_vec ();
 
-  double *prel_tol = rel_tol.fortran_vec ();
-  double *pabs_tol = abs_tol.fortran_vec ();
+  double *prel_tol = m_rel_tol.fortran_vec ();
+  double *pabs_tol = m_abs_tol.fortran_vec ();
 
-  double *prwork = rwork.fortran_vec ();
-  F77_INT *piwork = iwork.fortran_vec ();
+  double *prwork = m_rwork.fortran_vec ();
+  F77_INT *piwork = m_iwork.fortran_vec ();
 
-  F77_INT *pjroot = jroot.fortran_vec ();
+  F77_INT *pjroot = m_jroot.fortran_vec ();
 
   double *dummy = nullptr;
   F77_INT *idummy = nullptr;
@@ -316,9 +316,9 @@
   F77_INT tmp_istate = octave::to_f77_int (istate);
 
   F77_XFCN (ddasrt, DDASRT, (ddasrt_f, nn, t, px, pxdot, tout, pinfo,
-                             prel_tol, pabs_tol, tmp_istate, prwork, lrw,
-                             piwork, liw, dummy, idummy, ddasrt_j,
-                             ddasrt_g, ng, pjroot));
+                             prel_tol, pabs_tol, tmp_istate, prwork, m_lrw,
+                             piwork, m_liw, dummy, idummy, ddasrt_j,
+                             ddasrt_g, m_ng, pjroot));
 
   istate = tmp_istate;
 
--- a/liboctave/numeric/DASRT.h	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASRT.h	Wed Aug 25 15:38:23 2021 -0700
@@ -79,22 +79,22 @@
 public:
 
   DASRT (void)
-    : DAERT (), DASRT_options (), initialized (false),
-      liw (0), lrw (0), ng (0), info (), iwork (), jroot (), rwork (),
-      abs_tol (), rel_tol ()
+    : DAERT (), DASRT_options (), m_initialized (false),
+      m_liw (0), m_lrw (0), m_ng (0), m_info (), m_iwork (), m_jroot (),
+      m_rwork (), m_abs_tol (), m_rel_tol ()
   { }
 
   DASRT (const ColumnVector& s, double tm, DAERTFunc& f)
-    : DAERT (s, tm, f), DASRT_options (), initialized (false),
-      liw (0), lrw (0), ng (0), info (), iwork (), jroot (), rwork (),
-      abs_tol (), rel_tol ()
+    : DAERT (s, tm, f), DASRT_options (), m_initialized (false),
+      m_liw (0), m_lrw (0), m_ng (0), m_info (), m_iwork (), m_jroot (),
+      m_rwork (), m_abs_tol (), m_rel_tol ()
   { }
 
   DASRT (const ColumnVector& s, const ColumnVector& deriv,
          double tm, DAERTFunc& f)
-    : DAERT (s, deriv, tm, f), DASRT_options (), initialized (false),
-      liw (0), lrw (0), ng (0), info (), iwork (), jroot (), rwork (),
-      abs_tol (), rel_tol ()
+    : DAERT (s, deriv, tm, f), DASRT_options (), m_initialized (false),
+      m_liw (0), m_lrw (0), m_ng (0), m_info (), m_iwork (), m_jroot (),
+      m_rwork (), m_abs_tol (), m_rel_tol ()
   { }
 
   ~DASRT (void) = default;
@@ -108,21 +108,21 @@
 
 private:
 
-  bool initialized;
+  bool m_initialized;
 
-  octave_f77_int_type liw;
-  octave_f77_int_type lrw;
+  octave_f77_int_type m_liw;
+  octave_f77_int_type m_lrw;
 
-  octave_f77_int_type ng;
+  octave_f77_int_type m_ng;
 
-  Array<octave_f77_int_type> info;
-  Array<octave_f77_int_type> iwork;
-  Array<octave_f77_int_type> jroot;
+  Array<octave_f77_int_type> m_info;
+  Array<octave_f77_int_type> m_iwork;
+  Array<octave_f77_int_type> m_jroot;
 
-  Array<double> rwork;
+  Array<double> m_rwork;
 
-  Array<double> abs_tol;
-  Array<double> rel_tol;
+  Array<double> m_abs_tol;
+  Array<double> m_rel_tol;
 
   void integrate (double t);
 };
--- a/liboctave/numeric/DASSL-opts.in	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASSL-opts.in	Wed Aug 25 15:38:23 2021 -0700
@@ -46,11 +46,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = (val > 0.0) ? val : ::sqrt (std::numeric_limits<double>::epsilon ());
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
@@ -82,11 +82,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = (val > 0.0) ? val : ::sqrt (std::numeric_limits<double>::epsilon ());
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
--- a/liboctave/numeric/DASSL.cc	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASSL.cc	Wed Aug 25 15:38:23 2021 -0700
@@ -125,36 +125,36 @@
 {
   ColumnVector retval;
 
-  if (! initialized || restart || DAEFunc::reset || DASSL_options::reset)
+  if (! m_initialized || restart || DAEFunc::m_reset || DASSL_options::m_reset)
     {
       integration_error = false;
 
-      initialized = true;
+      m_initialized = true;
 
-      info.resize (dim_vector (15, 1));
+      m_info.resize (dim_vector (15, 1));
 
       for (F77_INT i = 0; i < 15; i++)
-        info(i) = 0;
+        m_info(i) = 0;
 
       F77_INT n = octave::to_f77_int (size ());
 
-      liw = 21 + n;
-      lrw = 40 + 9*n + n*n;
+      m_liw = 21 + n;
+      m_lrw = 40 + 9*n + n*n;
 
       nn = n;
 
-      iwork.resize (dim_vector (liw, 1));
-      rwork.resize (dim_vector (lrw, 1));
+      m_iwork.resize (dim_vector (m_liw, 1));
+      m_rwork.resize (dim_vector (m_lrw, 1));
 
-      info(0) = 0;
+      m_info(0) = 0;
 
       if (stop_time_set)
         {
-          rwork(0) = stop_time;
-          info(3) = 1;
+          m_rwork(0) = stop_time;
+          m_info(3) = 1;
         }
       else
-        info(3) = 0;
+        m_info(3) = 0;
 
       restart = false;
 
@@ -187,47 +187,47 @@
           return retval;
         }
 
-      info(4) = (user_jac ? 1 : 0);
+      m_info(4) = (user_jac ? 1 : 0);
 
-      DAEFunc::reset = false;
+      DAEFunc::m_reset = false;
 
       // DASSL_options
 
       double hmax = maximum_step_size ();
       if (hmax >= 0.0)
         {
-          rwork(1) = hmax;
-          info(6) = 1;
+          m_rwork(1) = hmax;
+          m_info(6) = 1;
         }
       else
-        info(6) = 0;
+        m_info(6) = 0;
 
       double h0 = initial_step_size ();
       if (h0 >= 0.0)
         {
-          rwork(2) = h0;
-          info(7) = 1;
+          m_rwork(2) = h0;
+          m_info(7) = 1;
         }
       else
-        info(7) = 0;
+        m_info(7) = 0;
 
       F77_INT sl = octave::to_f77_int (step_limit ());
 
       if (sl >= 0)
         {
-          info(11) = 1;
-          iwork(20) = sl;
+          m_info(11) = 1;
+          m_iwork(20) = sl;
         }
       else
-        info(11) = 0;
+        m_info(11) = 0;
 
       F77_INT maxord = octave::to_f77_int (maximum_order ());
       if (maxord >= 0)
         {
           if (maxord > 0 && maxord < 6)
             {
-              info(8) = 1;
-              iwork(2) = maxord;
+              m_info(8) = 1;
+              m_iwork(2) = maxord;
             }
           else
             {
@@ -240,24 +240,24 @@
         }
 
       F77_INT enc = octave::to_f77_int (enforce_nonnegativity_constraints ());
-      info(9) = (enc ? 1 : 0);
+      m_info(9) = (enc ? 1 : 0);
 
       F77_INT ccic = octave::to_f77_int (compute_consistent_initial_condition ());
-      info(10) = (ccic ? 1 : 0);
+      m_info(10) = (ccic ? 1 : 0);
 
-      abs_tol = absolute_tolerance ();
-      rel_tol = relative_tolerance ();
+      m_abs_tol = absolute_tolerance ();
+      m_rel_tol = relative_tolerance ();
 
-      F77_INT abs_tol_len = octave::to_f77_int (abs_tol.numel ());
-      F77_INT rel_tol_len = octave::to_f77_int (rel_tol.numel ());
+      F77_INT abs_tol_len = octave::to_f77_int (m_abs_tol.numel ());
+      F77_INT rel_tol_len = octave::to_f77_int (m_rel_tol.numel ());
 
       if (abs_tol_len == 1 && rel_tol_len == 1)
         {
-          info(1) = 0;
+          m_info(1) = 0;
         }
       else if (abs_tol_len == n && rel_tol_len == n)
         {
-          info(1) = 1;
+          m_info(1) = 1;
         }
       else
         {
@@ -268,19 +268,19 @@
           return retval;
         }
 
-      DASSL_options::reset = false;
+      DASSL_options::m_reset = false;
     }
 
   double *px = x.fortran_vec ();
   double *pxdot = xdot.fortran_vec ();
 
-  F77_INT *pinfo = info.fortran_vec ();
+  F77_INT *pinfo = m_info.fortran_vec ();
 
-  double *prel_tol = rel_tol.fortran_vec ();
-  double *pabs_tol = abs_tol.fortran_vec ();
+  double *prel_tol = m_rel_tol.fortran_vec ();
+  double *pabs_tol = m_abs_tol.fortran_vec ();
 
-  double *prwork = rwork.fortran_vec ();
-  F77_INT *piwork = iwork.fortran_vec ();
+  double *prwork = m_rwork.fortran_vec ();
+  F77_INT *piwork = m_iwork.fortran_vec ();
 
   double *dummy = nullptr;
   F77_INT *idummy = nullptr;
@@ -288,8 +288,8 @@
   F77_INT tmp_istate = octave::to_f77_int (istate);
 
   F77_XFCN (ddassl, DDASSL, (ddassl_f, nn, t, px, pxdot, tout, pinfo,
-                             prel_tol, pabs_tol, tmp_istate, prwork, lrw,
-                             piwork, liw, dummy, idummy, ddassl_j));
+                             prel_tol, pabs_tol, tmp_istate, prwork, m_lrw,
+                             piwork, m_liw, dummy, idummy, ddassl_j));
 
   istate = tmp_istate;
 
--- a/liboctave/numeric/DASSL.h	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/DASSL.h	Wed Aug 25 15:38:23 2021 -0700
@@ -42,18 +42,19 @@
 public:
 
   DASSL (void)
-    : DAE (), DASSL_options (), initialized (false), liw (0), lrw (0),
-      info (), iwork (), rwork (), abs_tol (), rel_tol () { }
+    : DAE (), DASSL_options (), m_initialized (false), m_liw (0), m_lrw (0),
+      m_info (), m_iwork (), m_rwork (), m_abs_tol (), m_rel_tol () { }
 
   DASSL (const ColumnVector& s, double tm, DAEFunc& f)
-    : DAE (s, tm, f), DASSL_options (), initialized (false), liw (0),
-      lrw (0), info (), iwork (), rwork (), abs_tol (), rel_tol () { }
+    : DAE (s, tm, f), DASSL_options (), m_initialized (false), m_liw (0),
+      m_lrw (0), m_info (), m_iwork (), m_rwork (), m_abs_tol (), m_rel_tol ()
+  { }
 
   DASSL (const ColumnVector& s, const ColumnVector& deriv,
          double tm, DAEFunc& f)
-    : DAE (s, deriv, tm, f), DASSL_options (), initialized (false),
-      liw (0), lrw (0), info (), iwork (), rwork (), abs_tol (),
-      rel_tol () { }
+    : DAE (s, deriv, tm, f), DASSL_options (), m_initialized (false),
+      m_liw (0), m_lrw (0), m_info (), m_iwork (), m_rwork (), m_abs_tol (),
+      m_rel_tol () { }
 
   ~DASSL (void) = default;
 
@@ -72,18 +73,18 @@
 
 private:
 
-  bool initialized;
+  bool m_initialized;
 
-  octave_f77_int_type liw;
-  octave_f77_int_type lrw;
+  octave_f77_int_type m_liw;
+  octave_f77_int_type m_lrw;
 
-  Array<octave_f77_int_type> info;
-  Array<octave_f77_int_type> iwork;
+  Array<octave_f77_int_type> m_info;
+  Array<octave_f77_int_type> m_iwork;
 
-  Array<double> rwork;
+  Array<double> m_rwork;
 
-  Array<double> abs_tol;
-  Array<double> rel_tol;
+  Array<double> m_abs_tol;
+  Array<double> m_rel_tol;
 };
 
 #endif
--- a/liboctave/numeric/LSODE-opts.in	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/LSODE-opts.in	Wed Aug 25 15:38:23 2021 -0700
@@ -45,11 +45,11 @@
       {
         $OPTVAR.resize (dim_vector (1, 1));
         $OPTVAR(0) = (val > 0.0) ? val : ::sqrt (std::numeric_limits<double>::epsilon ());
-        reset = true;
+        m_reset = true;
       }
 
     void set_$OPT (const $TYPE& val)
-      { $OPTVAR = val; reset = true; }
+      { $OPTVAR = val; m_reset = true; }
   END_SET_CODE
 END_OPTION
 
--- a/liboctave/numeric/LSODE.cc	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/LSODE.cc	Wed Aug 25 15:38:23 2021 -0700
@@ -105,11 +105,11 @@
 
   static F77_INT nn = 0;
 
-  if (! initialized || restart || ODEFunc::reset || LSODE_options::reset)
+  if (! m_initialized || restart || ODEFunc::reset || LSODE_options::m_reset)
     {
       integration_error = false;
 
-      initialized = true;
+      m_initialized = true;
 
       istate = 1;
 
@@ -124,32 +124,32 @@
           max_maxord = 5;
 
           if (jac)
-            method_flag = 21;
+            m_method_flag = 21;
           else
-            method_flag = 22;
+            m_method_flag = 22;
 
-          liw = 20 + n;
-          lrw = 22 + n * (9 + n);
+          m_liw = 20 + n;
+          m_lrw = 22 + n * (9 + n);
         }
       else
         {
           max_maxord = 12;
 
-          method_flag = 10;
+          m_method_flag = 10;
 
-          liw = 20;
-          lrw = 22 + 16 * n;
+          m_liw = 20;
+          m_lrw = 22 + 16 * n;
         }
 
-      iwork.resize (dim_vector (liw, 1));
+      m_iwork.resize (dim_vector (m_liw, 1));
 
       for (F77_INT i = 4; i < 9; i++)
-        iwork(i) = 0;
+        m_iwork(i) = 0;
 
-      rwork.resize (dim_vector (lrw, 1));
+      m_rwork.resize (dim_vector (m_lrw, 1));
 
       for (F77_INT i = 4; i < 9; i++)
-        rwork(i) = 0;
+        m_rwork(i) = 0;
 
       octave_idx_type maxord = maximum_order ();
 
@@ -157,8 +157,8 @@
         {
           if (maxord > 0 && maxord <= max_maxord)
             {
-              iwork(4) = octave::to_f77_int (maxord);
-              iopt = 1;
+              m_iwork(4) = octave::to_f77_int (maxord);
+              m_iopt = 1;
             }
           else
             {
@@ -172,13 +172,13 @@
 
       if (stop_time_set)
         {
-          itask = 4;
-          rwork(0) = stop_time;
-          iopt = 1;
+          m_itask = 4;
+          m_rwork(0) = stop_time;
+          m_iopt = 1;
         }
       else
         {
-          itask = 1;
+          m_itask = 1;
         }
 
       restart = false;
@@ -210,15 +210,15 @@
 
       // LSODE_options
 
-      rel_tol = relative_tolerance ();
-      abs_tol = absolute_tolerance ();
+      m_rel_tol = relative_tolerance ();
+      m_abs_tol = absolute_tolerance ();
 
-      F77_INT abs_tol_len = octave::to_f77_int (abs_tol.numel ());
+      F77_INT abs_tol_len = octave::to_f77_int (m_abs_tol.numel ());
 
       if (abs_tol_len == 1)
-        itol = 1;
+        m_itol = 1;
       else if (abs_tol_len == n)
-        itol = 2;
+        m_itol = 2;
       else
         {
           // FIXME: Should this be a warning?
@@ -232,46 +232,46 @@
       double iss = initial_step_size ();
       if (iss >= 0.0)
         {
-          rwork(4) = iss;
-          iopt = 1;
+          m_rwork(4) = iss;
+          m_iopt = 1;
         }
 
       double maxss = maximum_step_size ();
       if (maxss >= 0.0)
         {
-          rwork(5) = maxss;
-          iopt = 1;
+          m_rwork(5) = maxss;
+          m_iopt = 1;
         }
 
       double minss = minimum_step_size ();
       if (minss >= 0.0)
         {
-          rwork(6) = minss;
-          iopt = 1;
+          m_rwork(6) = minss;
+          m_iopt = 1;
         }
 
       F77_INT sl = octave::to_f77_int (step_limit ());
       if (sl > 0)
         {
-          iwork(5) = sl;
-          iopt = 1;
+          m_iwork(5) = sl;
+          m_iopt = 1;
         }
 
-      LSODE_options::reset = false;
+      LSODE_options::m_reset = false;
     }
 
   double *px = x.fortran_vec ();
 
-  double *pabs_tol = abs_tol.fortran_vec ();
+  double *pabs_tol = m_abs_tol.fortran_vec ();
 
-  F77_INT *piwork = iwork.fortran_vec ();
-  double *prwork = rwork.fortran_vec ();
+  F77_INT *piwork = m_iwork.fortran_vec ();
+  double *prwork = m_rwork.fortran_vec ();
 
   F77_INT tmp_istate = octave::to_f77_int (istate);
 
-  F77_XFCN (dlsode, DLSODE, (lsode_f, nn, px, t, tout, itol, rel_tol,
-                             pabs_tol, itask, tmp_istate, iopt, prwork, lrw,
-                             piwork, liw, lsode_j, method_flag));
+  F77_XFCN (dlsode, DLSODE, (lsode_f, nn, px, t, tout, m_itol, m_rel_tol,
+                             pabs_tol, m_itask, tmp_istate, m_iopt, prwork,
+                             m_lrw, piwork, m_liw, lsode_j, m_method_flag));
 
   istate = tmp_istate;
 
--- a/liboctave/numeric/LSODE.h	Wed Aug 25 14:40:16 2021 -0700
+++ b/liboctave/numeric/LSODE.h	Wed Aug 25 15:38:23 2021 -0700
@@ -40,14 +40,14 @@
 public:
 
   LSODE (void)
-    : ODE (), LSODE_options (), initialized (false), method_flag (0),
-      itask (0), iopt (0), itol (0), liw (0), lrw (0),
-      iwork (), rwork (), rel_tol (0.0), abs_tol () { }
+    : ODE (), LSODE_options (), m_initialized (false), m_method_flag (0),
+      m_itask (0), m_iopt (0), m_itol (0), m_liw (0), m_lrw (0),
+      m_iwork (), m_rwork (), m_rel_tol (0.0), m_abs_tol () { }
 
   LSODE (const ColumnVector& s, double tm, const ODEFunc& f)
-    : ODE (s, tm, f), LSODE_options (), initialized (false), method_flag (0),
-      itask (0), iopt (0), itol (0), liw (0), lrw (0),
-      iwork (), rwork (), rel_tol (0.0), abs_tol () { }
+    : ODE (s, tm, f), LSODE_options (), m_initialized (false),
+      m_method_flag (0), m_itask (0), m_iopt (0), m_itol (0), m_liw (0),
+      m_lrw (0), m_iwork (), m_rwork (), m_rel_tol (0.0), m_abs_tol () { }
 
   ~LSODE (void) = default;
 
@@ -61,22 +61,22 @@
 
 private:
 
-  bool initialized;
+  bool m_initialized;
 
-  octave_f77_int_type method_flag;
-  octave_f77_int_type itask;
-  octave_f77_int_type iopt;
-  octave_f77_int_type itol;
+  octave_f77_int_type m_method_flag;
+  octave_f77_int_type m_itask;
+  octave_f77_int_type m_iopt;
+  octave_f77_int_type m_itol;
 
-  octave_f77_int_type liw;
-  octave_f77_int_type lrw;
+  octave_f77_int_type m_liw;
+  octave_f77_int_type m_lrw;
 
-  Array<octave_f77_int_type> iwork;
-  Array<double> rwork;
+  Array<octave_f77_int_type> m_iwork;
+  Array<double> m_rwork;
 
-  double rel_tol;
+  double m_rel_tol;
 
-  Array<double> abs_tol;
+  Array<double> m_abs_tol;
 };
 
 #endif