Mercurial > jwe > octave

changeset 26857:ab97008be411 jwe-anon-fcn

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use m_ for member variables in function handle and inline function classes * ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h: Use "m_" prefix for member variable names in octave_fcn_handle and octave_fcn_inline classes.
author John W. Eaton <jwe@octave.org>
date Wed, 06 Mar 2019 07:05:49 +0000
parents 98f34c841f89
children 156bd21bf6bd
files libinterp/octave-value/ov-fcn-handle.cc libinterp/octave-value/ov-fcn-handle.h libinterp/octave-value/ov-fcn-inline.cc libinterp/octave-value/ov-fcn-inline.h
diffstat 4 files changed, 145 insertions(+), 145 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave-value/ov-fcn-handle.cc	Tue Mar 05 17:31:03 2019 -0800
+++ b/libinterp/octave-value/ov-fcn-handle.cc	Wed Mar 06 07:05:49 2019 +0000
@@ -85,17 +85,17 @@
 octave_fcn_handle::octave_fcn_handle (const octave::symbol_scope& scope,
                                       const octave_value& f,
                                       const std::string& n)
-  : fcn (f), nm (n), m_scope (scope), m_is_nested (false),
+  : m_fcn (f), m_name (n), m_scope (scope), m_is_nested (false),
     m_closure_frames (nullptr)
 {
-  octave_user_function *uf = fcn.user_function_value (true);
+  octave_user_function *uf = m_fcn.user_function_value (true);
 
-  if (uf && nm != anonymous)
+  if (uf && m_name != anonymous)
     {
       octave::symbol_scope uf_scope = uf->scope ();
 
       if (uf_scope)
-        uf_scope.cache_name (nm);
+        uf_scope.cache_name (m_name);
     }
 
   if (uf && uf->is_nested_function () && ! uf->is_subfunction ())
@@ -104,17 +104,17 @@
 
 octave_fcn_handle::octave_fcn_handle (const octave_value& f,
                                       const std::string& n)
-  : fcn (f), nm (n), m_scope (), m_is_nested (false),
+  : m_fcn (f), m_name (n), m_scope (), m_is_nested (false),
     m_closure_frames (nullptr)
 {
-  octave_user_function *uf = fcn.user_function_value (true);
+  octave_user_function *uf = m_fcn.user_function_value (true);
 
-  if (uf && nm != anonymous)
+  if (uf && m_name != anonymous)
     {
       octave::symbol_scope uf_scope = uf->scope ();
 
       if (uf_scope)
-        uf_scope.cache_name (nm);
+        uf_scope.cache_name (m_name);
     }
 
   if (uf && uf->is_nested_function () && ! uf->is_subfunction ())
@@ -180,18 +180,18 @@
 octave_value_list
 octave_fcn_handle::call (int nargout, const octave_value_list& args)
 {
-  octave_value fcn_to_call = fcn;
+  octave_value fcn_to_call = m_fcn;
 
   if (! fcn_to_call.is_defined ())
     {
       octave::symbol_table& symtab
         = octave::__get_symbol_table__ ("octave_fcn_handle::call");
 
-      fcn_to_call = symtab.find_function (nm, args, m_scope);
+      fcn_to_call = symtab.find_function (m_name, args, m_scope);
     }
 
   if (! fcn_to_call.is_defined ())
-    error ("%s: no longer valid function handle", nm.c_str ());
+    error ("%s: no longer valid function handle", m_name.c_str ());
 
   octave::stack_frame *closure_context = nullptr;
 
@@ -215,8 +215,8 @@
 
 octave_function * octave_fcn_handle::function_value (bool)
 {
-  if (fcn.is_defined ())
-    return fcn.function_value ();
+  if (m_fcn.is_defined ())
+    return m_fcn.function_value ();
 
   octave::symbol_table& symtab
     = octave::__get_symbol_table__ ("octave_fcn_handle::set_fcn");
@@ -224,7 +224,7 @@
   // Cache this value so that the pointer will be valid as long as the
   // function handle object is valid.
 
-  m_generic_fcn = symtab.find_function (nm, octave_value_list (), m_scope);
+  m_generic_fcn = symtab.find_function (m_name, octave_value_list (), m_scope);
 
   return (m_generic_fcn.is_defined ()
           ? m_generic_fcn.function_value () : nullptr);
@@ -232,8 +232,8 @@
 
 octave_user_function * octave_fcn_handle::user_function_value (bool)
 {
-  if (fcn.is_defined ())
-    return fcn.user_function_value ();
+  if (m_fcn.is_defined ())
+    return m_fcn.user_function_value ();
 
   octave::symbol_table& symtab
     = octave::__get_symbol_table__ ("octave_fcn_handle::set_fcn");
@@ -241,7 +241,7 @@
   // Cache this value so that the pointer will be valid as long as the
   // function handle object is valid.
 
-  m_generic_fcn = symtab.find_user_function (nm);
+  m_generic_fcn = symtab.find_user_function (m_name);
 
   return (m_generic_fcn.is_defined ()
           ? m_generic_fcn.user_function_value () : nullptr);
@@ -279,9 +279,9 @@
 octave_value
 octave_fcn_handle::workspace (void) const
 {
-  if (nm == anonymous)
+  if (m_name == anonymous)
     {
-      octave_user_function *fu = fcn.user_function_value ();
+      octave_user_function *fu = m_fcn.user_function_value ();
 
       octave_scalar_map ws;
 
@@ -327,10 +327,10 @@
 bool
 octave_fcn_handle::is_equal_to (const octave_fcn_handle& h) const
 {
-  if (fcn.is_defined () && h.fcn.is_defined ())
-    return fcn.is_copy_of (h.fcn);
-  else if (fcn.is_undefined () && h.fcn.is_undefined ())
-    return nm == h.nm;
+  if (m_fcn.is_defined () && h.m_fcn.is_defined ())
+    return m_fcn.is_copy_of (h.m_fcn);
+  else if (m_fcn.is_undefined () && h.m_fcn.is_undefined ())
+    return m_name == h.m_name;
   else
     return false;
 }
@@ -357,20 +357,20 @@
           std::string dir_name = str.substr (0, xpos);
 
           octave_value ov_fcn
-            = octave::load_fcn_from_file (str, dir_name, "", "", nm);
+            = octave::load_fcn_from_file (str, dir_name, "", "", m_name);
 
           if (ov_fcn.is_undefined ())
             error ("function handle points to non-existent function");
 
-          fcn = octave_value (new octave_fcn_handle (ov_fcn, nm));
+          m_fcn = octave_value (new octave_fcn_handle (ov_fcn, m_name));
         }
       else
         {
           // Next just search for it anywhere in the system path
           std::list<std::string> names;
-          names.push_back (nm + ".oct");
-          names.push_back (nm + ".mex");
-          names.push_back (nm + ".m");
+          names.push_back (m_name + ".oct");
+          names.push_back (m_name + ".mex");
+          names.push_back (m_name + ".m");
 
           octave::load_path& lp =
             octave::__get_load_path__ ("octave_fcn_handle::set_fcn");
@@ -384,12 +384,12 @@
           std::string dir_name = str.substr (0, xpos);
 
           octave_value ov_fcn
-            = octave::load_fcn_from_file (str, dir_name, "", "", nm);
+            = octave::load_fcn_from_file (str, dir_name, "", "", m_name);
 
           if (ov_fcn.is_undefined ())
             error ("function handle points to non-existent function");
 
-          fcn = octave_value (new octave_fcn_handle (ov_fcn, nm));
+          m_fcn = octave_value (new octave_fcn_handle (ov_fcn, m_name));
         }
     }
   else
@@ -401,21 +401,21 @@
           std::string dir_name = fpath.substr (0, xpos);
 
           octave_value ov_fcn
-            = octave::load_fcn_from_file (fpath, dir_name, "", "", nm);
+            = octave::load_fcn_from_file (fpath, dir_name, "", "", m_name);
 
           if (ov_fcn.is_undefined ())
             error ("function handle points to non-existent function");
 
-          fcn = octave_value (new octave_fcn_handle (ov_fcn, nm));
+          m_fcn = octave_value (new octave_fcn_handle (ov_fcn, m_name));
         }
       else
         {
           octave::symbol_table& symtab
             = octave::__get_symbol_table__ ("octave_fcn_handle::set_fcn");
 
-          fcn = symtab.find_function (nm);
+          m_fcn = symtab.find_function (m_name);
 
-          if (! fcn.is_function ())
+          if (! m_fcn.is_function ())
             error ("function handle points to non-existent function");
         }
     }
@@ -434,19 +434,19 @@
 bool
 octave_fcn_handle::save_ascii (std::ostream& os)
 {
-  if (nm == anonymous)
+  if (m_name == anonymous)
     {
-      if (fcn.is_undefined ())
+      if (m_fcn.is_undefined ())
         return false;
 
-      octave_user_function *f = fcn.user_function_value ();
+      octave_user_function *f = m_fcn.user_function_value ();
 
       octave_user_function::local_vars_map local_vars
         = f->local_var_init_vals ();
 
       size_t varlen = local_vars.size ();
 
-      os << nm << "\n";
+      os << m_name << "\n";
 
       print_raw (os, true);
       os << "\n";
@@ -470,7 +470,7 @@
       os << "# octaveroot: " << octave::config::octave_exec_home () << "\n";
       if (! fnm.empty ())
         os << "# path: " << fnm << "\n";
-      os << nm << "\n";
+      os << m_name << "\n";
     }
 
   return true;
@@ -494,16 +494,16 @@
 
       if (fh)
         {
-          fcn = fh->fcn;
+          m_fcn = fh->m_fcn;
 
-          octave_user_function *uf = fcn.user_function_value (true);
+          octave_user_function *uf = m_fcn.user_function_value (true);
 
           if (uf)
             {
               octave::symbol_scope uf_scope = uf->scope ();
 
               if (uf_scope)
-                uf_scope.cache_name (nm);
+                uf_scope.cache_name (m_name);
             }
         }
       else
@@ -535,9 +535,9 @@
       is.clear ();
     }
 
-  is >> nm;
+  is >> m_name;
 
-  if (nm == anonymous)
+  if (m_name == anonymous)
     {
       skip_preceeding_newline (is);
 
@@ -609,14 +609,14 @@
 bool
 octave_fcn_handle::save_binary (std::ostream& os, bool save_as_floats)
 {
-  if (nm == anonymous)
+  if (m_name == anonymous)
     {
       std::ostringstream nmbuf;
 
-      if (fcn.is_undefined ())
+      if (m_fcn.is_undefined ())
         return false;
 
-      octave_user_function *f = fcn.user_function_value ();
+      octave_user_function *f = m_fcn.user_function_value ();
 
       octave_user_function::local_vars_map local_vars
         = f->local_var_init_vals ();
@@ -624,9 +624,9 @@
       size_t varlen = local_vars.size ();
 
       if (varlen > 0)
-        nmbuf << nm << ' ' << varlen;
+        nmbuf << m_name << ' ' << varlen;
       else
-        nmbuf << nm;
+        nmbuf << m_name;
 
       std::string buf_str = nmbuf.str ();
       int32_t tmp = buf_str.length ();
@@ -657,7 +657,7 @@
       octave_function *f = function_value ();
       std::string fnm = (f ? f->fcn_file_name () : "");
 
-      nmbuf << nm << "\n" << octave::config::octave_exec_home () << "\n" << fnm;
+      nmbuf << m_name << "\n" << octave::config::octave_exec_home () << "\n" << fnm;
 
       std::string buf_str = nmbuf.str ();
       int32_t tmp = buf_str.length ();
@@ -685,22 +685,22 @@
   // effectively not reading over file end
   is.read (ctmp1, tmp);
   ctmp1[tmp] = 0;
-  nm = std::string (ctmp1);
+  m_name = std::string (ctmp1);
 
   if (! is)
     return false;
 
   size_t anl = anonymous.length ();
 
-  if (nm.length () >= anl && nm.substr (0, anl) == anonymous)
+  if (m_name.length () >= anl && m_name.substr (0, anl) == anonymous)
     {
       octave_idx_type len = 0;
 
-      if (nm.length () > anl)
+      if (m_name.length () > anl)
         {
-          std::istringstream nm_is (nm.substr (anl));
+          std::istringstream nm_is (m_name.substr (anl));
           nm_is >> len;
-          nm = nm.substr (0, anl);
+          m_name = m_name.substr (0, anl);
         }
 
       if (! is.read (reinterpret_cast<char *> (&tmp), 4))
@@ -757,13 +757,13 @@
       std::string octaveroot;
       std::string fpath;
 
-      if (nm.find_first_of ('\n') != std::string::npos)
+      if (m_name.find_first_of ('\n') != std::string::npos)
         {
-          size_t pos1 = nm.find_first_of ('\n');
-          size_t pos2 = nm.find_first_of ('\n', pos1 + 1);
-          octaveroot = nm.substr (pos1 + 1, pos2 - pos1 - 1);
-          fpath = nm.substr (pos2 + 1);
-          nm = nm.substr (0, pos1);
+          size_t pos1 = m_name.find_first_of ('\n');
+          size_t pos2 = m_name.find_first_of ('\n', pos1 + 1);
+          octaveroot = m_name.substr (pos1 + 1, pos2 - pos1 - 1);
+          fpath = m_name.substr (pos2 + 1);
+          m_name = m_name.substr (0, pos1);
         }
 
       success = set_fcn (octaveroot, fpath);
@@ -795,7 +795,7 @@
 
   // attach the type of the variable
   type_hid = H5Tcopy (H5T_C_S1);
-  H5Tset_size (type_hid, nm.length () + 1);
+  H5Tset_size (type_hid, m_name.length () + 1);
   if (type_hid < 0)
     {
       H5Gclose (group_hid);
@@ -822,7 +822,7 @@
 #endif
   if (data_hid < 0
       || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
-                   octave_H5P_DEFAULT, nm.c_str ()) < 0)
+                   octave_H5P_DEFAULT, m_name.c_str ()) < 0)
     {
       H5Sclose (space_hid);
       H5Tclose (type_hid);
@@ -831,7 +831,7 @@
     }
   H5Dclose (data_hid);
 
-  if (nm == anonymous)
+  if (m_name == anonymous)
     {
       std::ostringstream buf;
       print_raw (buf, true);
@@ -866,7 +866,7 @@
 
       H5Dclose (data_hid);
 
-      octave_user_function *f = fcn.user_function_value ();
+      octave_user_function *f = m_fcn.user_function_value ();
 
       octave_user_function::local_vars_map local_vars
                      = f->local_var_init_vals ();
@@ -1100,9 +1100,9 @@
     }
   H5Tclose (st_id);
   H5Dclose (data_hid);
-  nm = nm_tmp;
+  m_name = nm_tmp;
 
-  if (nm == anonymous)
+  if (m_name == anonymous)
     {
 #if defined (HAVE_HDF5_18)
       data_hid = H5Dopen (group_hid, "fcn", octave_H5P_DEFAULT);
@@ -1461,14 +1461,14 @@
 {
   bool printed = false;
 
-  if (nm == anonymous)
+  if (m_name == anonymous)
     {
       octave::tree_print_code tpc (os);
 
       // FCN is const because this member function is, so we can't
       // use it to call user_function_value, so we make a copy first.
 
-      octave_value ftmp = fcn;
+      octave_value ftmp = m_fcn;
 
       octave_user_function *f = ftmp.user_function_value ();
 
@@ -1504,7 +1504,7 @@
     }
 
   if (! printed)
-    octave_print_internal (os, '@' + nm, pr_as_read_syntax,
+    octave_print_internal (os, '@' + m_name, pr_as_read_syntax,
                            current_print_indent_level ());
 }
 
--- a/libinterp/octave-value/ov-fcn-handle.h	Tue Mar 05 17:31:03 2019 -0800
+++ b/libinterp/octave-value/ov-fcn-handle.h	Wed Mar 06 07:05:49 2019 +0000
@@ -57,16 +57,16 @@
   static const std::string anonymous;
 
   octave_fcn_handle (void)
-    : fcn (), nm (), m_scope (), m_is_nested (false),
+    : m_fcn (), m_name (), m_scope (), m_is_nested (false),
       m_closure_frames (nullptr)
   { }
 
   octave_fcn_handle (const octave::symbol_scope& scope, const std::string& n)
-    : fcn (), nm (n), m_scope (scope), m_is_nested (false),
+    : m_fcn (), m_name (n), m_scope (scope), m_is_nested (false),
       m_closure_frames (nullptr)
   {
-    if (! nm.empty () && nm[0] == '@')
-      nm = nm.substr (1);
+    if (! m_name.empty () && m_name[0] == '@')
+      m_name = m_name.substr (1);
   }
 
   octave_fcn_handle (const octave::symbol_scope& scope,
@@ -111,9 +111,9 @@
 
   octave_fcn_handle * fcn_handle_value (bool = false) { return this; }
 
-  octave_value fcn_val (void) const { return fcn; }
+  octave_value fcn_val (void) const { return m_fcn; }
 
-  std::string fcn_name (void) const { return nm; }
+  std::string fcn_name (void) const { return m_name; }
 
   void push_closure_context (octave::tree_evaluator& tw);
 
@@ -141,7 +141,7 @@
   void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
 
   // Simple function handles are printed without a newline.
-  bool print_as_scalar (void) const { return nm != anonymous; }
+  bool print_as_scalar (void) const { return m_name != anonymous; }
 
 private:
 
@@ -155,7 +155,7 @@
   // anonymous functions and some other special cases).  Otherwise, we
   // perform dynamic lookup based on the name of the function we are
   // handling and the scope where the funtion handle object was created.
-  octave_value fcn;
+  octave_value m_fcn;
 
   // The function we would find without considering argument types.  We
   // cache this value so that the function_value and user_function_value
@@ -163,7 +163,7 @@
   octave_value m_generic_fcn;
 
   // The name of the handle, not including the "@".
-  std::string nm;
+  std::string m_name;
 
   // The scope where this object was defined.
   octave::symbol_scope m_scope;
@@ -184,7 +184,7 @@
 namespace octave
 {
   extern octave_value
-  make_fcn_handle (interpreter& interp, const std::string& nm);
+  make_fcn_handle (interpreter& interp, const std::string& name);
 }
 
 #endif
--- a/libinterp/octave-value/ov-fcn-inline.cc	Tue Mar 05 17:31:03 2019 -0800
+++ b/libinterp/octave-value/ov-fcn-inline.cc	Wed Mar 06 07:05:49 2019 +0000
@@ -64,7 +64,7 @@
 octave_fcn_inline::octave_fcn_inline (const std::string& f,
                                       const string_vector& a,
                                       const std::string& n)
-  : octave_fcn_handle (n), iftext (f), ifargs (a)
+  : octave_fcn_handle (n), m_text (f), m_args (a)
 {
   // Form a string representing the function.
 
@@ -72,15 +72,15 @@
 
   buf << "@(";
 
-  for (int i = 0; i < ifargs.numel (); i++)
+  for (int i = 0; i < m_args.numel (); i++)
     {
       if (i > 0)
         buf << ", ";
 
-      buf << ifargs(i);
+      buf << m_args(i);
     }
 
-  buf << ") " << iftext;
+  buf << ") " << m_text;
 
   octave::interpreter& interp
     = octave::__get_interpreter__ ("octave_fcn_inline::octave_fcn_inline");
@@ -95,9 +95,9 @@
 
       if (fh)
         {
-          fcn = fh->fcn_val ();
+          m_fcn = fh->fcn_val ();
 
-          octave_user_function *uf = fcn.user_function_value ();
+          octave_user_function *uf = m_fcn.user_function_value ();
 
           if (uf)
             {
@@ -119,7 +119,7 @@
         }
     }
 
-  if (fcn.is_undefined ())
+  if (m_fcn.is_undefined ())
     error ("inline: unable to define function");
 }
 
@@ -152,15 +152,15 @@
 bool
 octave_fcn_inline::save_ascii (std::ostream& os)
 {
-  os << "# nargs: " <<  ifargs.numel () << "\n";
-  for (int i = 0; i < ifargs.numel (); i++)
-    os << ifargs(i) << "\n";
-  if (nm.length () < 1)
+  os << "# nargs: " <<  m_args.numel () << "\n";
+  for (int i = 0; i < m_args.numel (); i++)
+    os << m_args(i) << "\n";
+  if (m_name.length () < 1)
     // Write an invalid value to flag empty fcn handle name.
     os << "0\n";
   else
-    os << nm << "\n";
-  os << iftext << "\n";
+    os << m_name << "\n";
+  os << m_text << "\n";
   return true;
 }
 
@@ -170,12 +170,12 @@
   int nargs;
   if (extract_keyword (is, "nargs", nargs, true))
     {
-      ifargs.resize (nargs);
+      m_args.resize (nargs);
       for (int i = 0; i < nargs; i++)
-        is >> ifargs(i);
-      is >> nm;
-      if (nm == "0")
-        nm = "";
+        is >> m_args(i);
+      is >> m_name;
+      if (m_name == "0")
+        m_name = "";
 
       skip_preceeding_newline (is);
 
@@ -189,10 +189,10 @@
           buf = read_until_newline (is, true);
         }
 
-      iftext = buf;
+      m_text = buf;
 
-      octave_fcn_inline tmp (iftext, ifargs, nm);
-      fcn = tmp.fcn;
+      octave_fcn_inline tmp (m_text, m_args, m_name);
+      m_fcn = tmp.m_fcn;
 
       return true;
     }
@@ -203,20 +203,20 @@
 bool
 octave_fcn_inline::save_binary (std::ostream& os, bool)
 {
-  int32_t tmp = ifargs.numel ();
+  int32_t tmp = m_args.numel ();
   os.write (reinterpret_cast<char *> (&tmp), 4);
-  for (int i = 0; i < ifargs.numel (); i++)
+  for (int i = 0; i < m_args.numel (); i++)
     {
-      tmp = ifargs(i).length ();
+      tmp = m_args(i).length ();
       os.write (reinterpret_cast<char *> (&tmp), 4);
-      os.write (ifargs(i).c_str (), ifargs(i).length ());
+      os.write (m_args(i).c_str (), m_args(i).length ());
     }
-  tmp = nm.length ();
+  tmp = m_name.length ();
   os.write (reinterpret_cast<char *> (&tmp), 4);
-  os.write (nm.c_str (), nm.length ());
-  tmp = iftext.length ();
+  os.write (m_name.c_str (), m_name.length ());
+  tmp = m_text.length ();
   os.write (reinterpret_cast<char *> (&tmp), 4);
-  os.write (iftext.c_str (), iftext.length ());
+  os.write (m_text.c_str (), m_text.length ());
   return true;
 }
 
@@ -235,7 +235,7 @@
   else
     {
       int32_t tmp;
-      ifargs.resize (nargs);
+      m_args.resize (nargs);
       for (int i = 0; i < nargs; i++)
         {
           if (! is.read (reinterpret_cast<char *> (&tmp), 4))
@@ -245,7 +245,7 @@
 
           OCTAVE_LOCAL_BUFFER (char, ctmp, tmp+1);
           is.read (ctmp, tmp);
-          ifargs(i) = std::string (ctmp);
+          m_args(i) = std::string (ctmp);
 
           if (! is)
             return false;
@@ -258,7 +258,7 @@
 
       OCTAVE_LOCAL_BUFFER (char, ctmp1, tmp+1);
       is.read (ctmp1, tmp);
-      nm = std::string (ctmp1);
+      m_name = std::string (ctmp1);
 
       if (! is)
         return false;
@@ -270,13 +270,13 @@
 
       OCTAVE_LOCAL_BUFFER (char, ctmp2, tmp+1);
       is.read (ctmp2, tmp);
-      iftext = std::string (ctmp2);
+      m_text = std::string (ctmp2);
 
       if (! is)
         return false;
 
-      octave_fcn_inline ftmp (iftext, ifargs, nm);
-      fcn = ftmp.fcn;
+      octave_fcn_inline ftmp (m_text, m_args, m_name);
+      m_fcn = ftmp.m_fcn;
     }
   return true;
 }
@@ -300,9 +300,9 @@
   if (group_hid < 0) return false;
 
   size_t len = 0;
-  for (int i = 0; i < ifargs.numel (); i++)
-    if (len < ifargs(i).length ())
-      len = ifargs(i).length ();
+  for (int i = 0; i < m_args.numel (); i++)
+    if (len < m_args(i).length ())
+      len = m_args(i).length ();
 
   hid_t space_hid, data_hid, type_hid;
   space_hid = data_hid = type_hid = -1;
@@ -313,7 +313,7 @@
   OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2);
 
   // Octave uses column-major, while HDF5 uses row-major ordering
-  hdims[1] = ifargs.numel ();
+  hdims[1] = m_args.numel ();
   hdims[0] = len + 1;
 
   space_hid = H5Screate_simple (2, hdims, nullptr);
@@ -336,15 +336,15 @@
       return false;
     }
 
-  OCTAVE_LOCAL_BUFFER (char, s, ifargs.numel () * (len + 1));
+  OCTAVE_LOCAL_BUFFER (char, s, m_args.numel () * (len + 1));
 
   // Save the args as a null teminated list
-  for (int i = 0; i < ifargs.numel (); i++)
+  for (int i = 0; i < m_args.numel (); i++)
     {
-      const char *cptr = ifargs(i).c_str ();
-      for (size_t j = 0; j < ifargs(i).length (); j++)
+      const char *cptr = m_args(i).c_str ();
+      for (size_t j = 0; j < m_args(i).length (); j++)
         s[i*(len+1)+j] = *cptr++;
-      s[ifargs(i).length ()] = '\0';
+      s[m_args(i).length ()] = '\0';
     }
 
   retval = H5Dwrite (data_hid, H5T_NATIVE_CHAR, octave_H5S_ALL, octave_H5S_ALL,
@@ -361,7 +361,7 @@
 
   // attach the type of the variable
   type_hid = H5Tcopy (H5T_C_S1);
-  H5Tset_size (type_hid, nm.length () + 1);
+  H5Tset_size (type_hid, m_name.length () + 1);
   if (type_hid < 0)
     {
       H5Gclose (group_hid);
@@ -385,7 +385,7 @@
 #endif
   if (data_hid < 0
       || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
-                   octave_H5P_DEFAULT, nm.c_str ()) < 0)
+                   octave_H5P_DEFAULT, m_name.c_str ()) < 0)
     {
       H5Sclose (space_hid);
       H5Tclose (type_hid);
@@ -395,7 +395,7 @@
   H5Dclose (data_hid);
 
   // attach the type of the variable
-  H5Tset_size (type_hid, iftext.length () + 1);
+  H5Tset_size (type_hid, m_text.length () + 1);
   if (type_hid < 0)
     {
       H5Gclose (group_hid);
@@ -411,7 +411,7 @@
 #endif
   if (data_hid < 0
       || H5Dwrite (data_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
-                   octave_H5P_DEFAULT, iftext.c_str ()) < 0)
+                   octave_H5P_DEFAULT, m_text.c_str ()) < 0)
     {
       H5Sclose (space_hid);
       H5Tclose (type_hid);
@@ -471,7 +471,7 @@
 
   H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
 
-  ifargs.resize (hdims[1]);
+  m_args.resize (hdims[1]);
 
   OCTAVE_LOCAL_BUFFER (char, s1, hdims[0] * hdims[1]);
 
@@ -488,7 +488,7 @@
   H5Sclose (space_hid);
 
   for (size_t i = 0; i < hdims[1]; i++)
-    ifargs(i) = std::string (s1 + i*hdims[0]);
+    m_args(i) = std::string (s1 + i*hdims[0]);
 
 #if defined (HAVE_HDF5_18)
   data_hid = H5Dopen (group_hid, "nm", octave_H5P_DEFAULT);
@@ -551,7 +551,7 @@
     }
   H5Tclose (st_id);
   H5Dclose (data_hid);
-  nm = nm_tmp;
+  m_name = nm_tmp;
 
 #if defined (HAVE_HDF5_18)
   data_hid = H5Dopen (group_hid, "iftext", octave_H5P_DEFAULT);
@@ -614,10 +614,10 @@
     }
   H5Tclose (st_id);
   H5Dclose (data_hid);
-  iftext = iftext_tmp;
+  m_text = iftext_tmp;
 
-  octave_fcn_inline ftmp (iftext, ifargs, nm);
-  fcn = ftmp.fcn;
+  octave_fcn_inline ftmp (m_text, m_args, m_name);
+  m_fcn = ftmp.m_fcn;
 
   return true;
 
@@ -643,20 +643,20 @@
 {
   std::ostringstream buf;
 
-  if (nm.empty ())
+  if (m_name.empty ())
     buf << "f(";
   else
-    buf << nm << '(';
+    buf << m_name << '(';
 
-  for (int i = 0; i < ifargs.numel (); i++)
+  for (int i = 0; i < m_args.numel (); i++)
     {
       if (i)
         buf << ", ";
 
-      buf << ifargs(i);
+      buf << m_args(i);
     }
 
-  buf << ") = " << iftext;
+  buf << ") = " << m_text;
 
   octave_print_internal (os, buf.str (), pr_as_read_syntax,
                          current_print_indent_level ());
--- a/libinterp/octave-value/ov-fcn-inline.h	Tue Mar 05 17:31:03 2019 -0800
+++ b/libinterp/octave-value/ov-fcn-inline.h	Wed Mar 06 07:05:49 2019 +0000
@@ -43,13 +43,13 @@
 public:
 
   octave_fcn_inline (void)
-    : octave_fcn_handle (), iftext (), ifargs () { }
+    : octave_fcn_handle (), m_text (), m_args () { }
 
   octave_fcn_inline (const std::string& f, const string_vector& a,
                      const std::string& n = "");
 
   octave_fcn_inline (const octave_fcn_inline& fi)
-    : octave_fcn_handle (fi), iftext (fi.iftext), ifargs (fi.ifargs) { }
+    : octave_fcn_handle (fi), m_text (fi.m_text), m_args (fi.m_args) { }
 
   ~octave_fcn_inline (void) = default;
 
@@ -62,9 +62,9 @@
 
   octave_fcn_inline * fcn_inline_value (bool = false) { return this; }
 
-  std::string fcn_text (void) const { return iftext; }
+  std::string fcn_text (void) const { return m_text; }
 
-  string_vector fcn_arg_names (void) const { return ifargs; }
+  string_vector fcn_arg_names (void) const { return m_args; }
 
   octave_value convert_to_str_internal (bool, bool, char) const;
 
@@ -92,10 +92,10 @@
   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 
   // The expression of an inline function.
-  std::string iftext;
+  std::string m_text;
 
   // The args of an inline function.
-  string_vector ifargs;
+  string_vector m_args;
 };
 
 #endif