Mercurial > octave

diff libinterp/octave-value/ov-classdef.cc @ 29466:7c8a70e4daad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use "m_" prefix for class members in a few more classes * ov-builtin.h, ov-builtin.cc, ov-class.h, ov-class.cc, ov-classdef.h, ov-classdef.cc, ov-usr-fcn.h, ov-usr-fcn.cc: Use "m_" prefix for class data members.
author John W. Eaton <jwe@octave.org>
date Sun, 28 Mar 2021 15:35:05 -0400
parents 7854d5752dd2
children aef11bb4e6d1
line wrap: on
line diff
--- a/libinterp/octave-value/ov-classdef.cc	Sat Mar 27 09:26:12 2021 +0100
+++ b/libinterp/octave-value/ov-classdef.cc	Sun Mar 28 15:35:05 2021 -0400
@@ -76,7 +76,7 @@
   size_t skip = 0;
   octave_value_list retval;
 
-  octave::cdef_class cls = object.get_class ();
+  octave::cdef_class cls = m_object.get_class ();
 
   if (! in_class_method (cls) && ! called_from_builtin ())
     {
@@ -99,7 +99,7 @@
 
   // At this point, the default subsref mechanism must be used.
 
-  retval = object.subsref (type, idx, nargout, skip, octave::cdef_class ());
+  retval = m_object.subsref (type, idx, nargout, skip, octave::cdef_class ());
 
   if (type.length () > skip && idx.size () > skip)
     retval = retval(0).next_subsref (nargout, type, idx, skip);
@@ -119,7 +119,7 @@
   // assignment with multi-level indexing.  AFAIK this is only used for internal
   // purpose (not sure we should even implement this).
 
-  octave::cdef_class cls = object.get_class ();
+  octave::cdef_class cls = m_object.get_class ();
 
   if (! in_class_method (cls))
     {
@@ -140,7 +140,7 @@
         }
     }
 
-  retval = object.subsref (type, idx, 1, skip, octave::cdef_class (), auto_add);
+  retval = m_object.subsref (type, idx, 1, skip, octave::cdef_class (), auto_add);
 
   if (type.length () > skip && idx.size () > skip)
     retval = retval(0).next_subsref (1, type, idx, skip);
@@ -155,7 +155,7 @@
 {
   octave_value retval;
 
-  octave::cdef_class cls = object.get_class ();
+  octave::cdef_class cls = m_object.get_class ();
 
   if (! in_class_method (cls) && ! called_from_builtin ())
     {
@@ -183,7 +183,7 @@
     }
 
   if (! retval.is_defined ())
-    retval = object.subsasgn (type, idx, rhs);
+    retval = m_object.subsasgn (type, idx, rhs);
 
   return retval;
 }
@@ -195,7 +195,7 @@
 {
   if (type.length () == 1 && type[0] == '(')
     {
-      object = object.make_array ();
+      m_object = m_object.make_array ();
 
       return subsasgn (type, idx, rhs);
     }
@@ -208,7 +208,7 @@
 Matrix
 octave_classdef::size (void)
 {
-  octave::cdef_class cls = object.get_class ();
+  octave::cdef_class cls = m_object.get_class ();
 
   if (! in_class_method (cls) && ! called_from_builtin ())
     {
@@ -236,7 +236,7 @@
 {
   octave_idx_type retval = -1;
 
-  octave::cdef_class cls = object.get_class ();
+  octave::cdef_class cls = m_object.get_class ();
 
   if (! in_class_method (cls) && ! called_from_builtin ())
     {
@@ -287,16 +287,16 @@
 void
 octave_classdef::print_raw (std::ostream& os, bool) const
 {
-  octave::cdef_class cls = object.get_class ();
+  octave::cdef_class cls = m_object.get_class ();
 
   if (cls.ok ())
     {
-      bool is_array = object.is_array ();
+      bool is_array = m_object.is_array ();
 
       increment_indent_level ();
 
       indent (os);
-      os << class_name () << " object";
+      os << class_name () << " m_object";
       if (is_array)
         os << " array";
       os << " with properties:";
@@ -357,7 +357,7 @@
             os << "  " << nm;
           else
             {
-              octave_value val = prop.get_value (object, false);
+              octave_value val = prop.get_value (m_object, false);
               dim_vector dims = val.dims ();
 
               os << std::setw (max_len+2) << nm << ": ";
@@ -383,7 +383,7 @@
   octave::cdef_class cls = octave::lookup_class (cls_name, false, false);
 
   if (cls.ok ())
-    return is_superclass (cls, object.get_class ());
+    return is_superclass (cls, m_object.get_class ());
 
   return false;
 }
@@ -405,13 +405,13 @@
 {
   bool retval = false;
 
-  if (object.is_method ())
+  if (m_object.is_method ())
     {
       if (cname.empty ())
         retval = true;
       else
         {
-          octave::cdef_method meth (object);
+          octave::cdef_method meth (m_object);
 
           return meth.is_defined_in_class (cname);
         }
@@ -424,13 +424,13 @@
 {
   bool retval = false;
 
-  if (object.is_class ())
+  if (m_object.is_class ())
     {
       if (cname.empty ())
         retval = true;
       else
         {
-          octave::cdef_class cls (object);
+          octave::cdef_class cls (m_object);
 
           if (cls.get_name () == cname)
             retval = true;
@@ -442,9 +442,9 @@
 
 std::string octave_classdef_meta::doc_string (const std::string& meth_name) const
 {
-  if (object.is_class ())
+  if (m_object.is_class ())
     {
-      octave::cdef_class cls (object);
+      octave::cdef_class cls (m_object);
 
       if (meth_name.empty ())
         return cls.doc_string ();