Mercurial > hg > octave-nkf

diff src/ov-class.cc @ 13874:c1b754d93572

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy parent class info when performing operations on class objects * ov.h (octave_value::octave_value (const Octave_map&, const std::string&, const std::list<std::string>&)): Don't provide default value for parent_list argument. Change all callers that used only two arguments. * ov-class.h (octave_class::octave_class (const octave_map&, const std::string&, const std::list<std::string>&)): Likewise.
author John W. Eaton <jwe@octave.org>
date Thu, 17 Nov 2011 04:01:04 -0500
parents 0bbe319bf26b
children 72c96de7a403
line wrap: on
line diff
--- a/src/ov-class.cc
+++ b/src/ov-class.cc
@@ -515,7 +515,7 @@
               }
             else
               retval(0) = octave_value (map.index (idx.front ()),
-                                        class_name ());
+                                        c_name, parent_list);
           }
           break;
 
@@ -591,8 +591,8 @@
       else
         {
           if (type.length () == 1 && type[0] == '(')
-            retval(0) = octave_value (map.index (idx.front ()), class_name (),
-                                      parent_class_name_list ());
+            retval(0) = octave_value (map.index (idx.front ()), c_name,
+                                      parent_list);
           else
             gripe_invalid_index1 ();
         }
@@ -993,7 +993,7 @@
   if (meth.is_defined ())
     {
       octave_value_list args;
-      args(0) = octave_value (new octave_class (map, c_name));
+      args(0) = octave_value (new octave_class (map, c_name, parent_list));
 
       octave_value_list tmp = feval (meth.function_value (), args, 1);
 
@@ -1123,7 +1123,7 @@
   if (meth.is_defined ())
     {
       octave_value_list args;
-      args(0) = octave_value (new octave_class (map, c_name));
+      args(0) = octave_value (new octave_class (map, c_name, parent_list));
 
       octave_value_list tmp = feval (meth.function_value (), args, 1);
 
@@ -1954,7 +1954,9 @@
                   if (! error_state)
                     {
                       if (nargin == 2)
-                        retval = octave_value (new octave_class (m, id));
+                        retval
+                          = octave_value (new octave_class
+                                          (m, id, std::list<std::string> ()));
                       else
                         {
                           octave_value_list parents = args.slice (2, nargin-2);