Attempt to create classdef object before calling loadobj method (bug #67414).

* libinterp/octave-value/ov-classdef.cc (octave_classdef::loadobj): If a
classdef implements a loadobj method, try to create an object from the stored
properties before calling the loadobj method. Pass the stored properties as
structure if creating an object would loose information from the property map.
* test/classdef-load-save/classdef-load-save-text.tst,
test/classdef-load-save/classdef-load-save-v6.tst,
test/classdef-load-save/classdef-load-save-v7.tst: Mark tests as fixed.

Author: mmuetzel

libinterp/octave-value/ov-classdef.cc

@@ -154,7 +154,7 @@ octave_classdef::loadobj (std::vector<std::tuple<octave_map, uint32_t, bool>>& m
       if (! in_obj_cache || prop_map.nfields () > 0)
         {
           // Default behaviour of loading is triggered if loadobj is not static
-          if (meth.ok () && meth.is_static ())
+          if (meth.ok () && meth.is_static () && prop_map.nfields () > 0)
             {
               octave_value ov;
               if (std::get<bool> (m[n]))
@@ -163,7 +163,49 @@ octave_classdef::loadobj (std::vector<std::tuple<octave_map, uint32_t, bool>>& m
                   ov = (meth.execute (octave_value_list (any), 1))(0);
                 }
               else
-                ov = (meth.execute (octave_value_list (prop_map), 1))(0);
+                {
+                  // create object from saved properties
+                  octave::cdef_object new_object;
+                  if (in_obj_cache)
+                    new_object = ovc.classdef_object_value ()->m_object;
+                  else
+                    new_object = scalar_obj.copy ();
+
+                  bool props_changed = false;
+                  string_vector fnames = prop_map.fieldnames ();
+                  string_vector sv = map_keys ();
+                  for (octave_idx_type i = 0; i < prop_map.nfields (); i++)
+                    {
+                      octave_idx_type j;
+                      for (j = 0; j < sv.numel (); j++)
+                        {
+                          if (sv[j] == fnames(i))
+                            {
+                              new_object.set_property (0, sv[j], prop_map.contents (fnames(i)).xelem (0));
+                              break;
+                            }
+                        }
+                      if (j == sv.numel ())
+                        {
+                          // properties have been renamed or deleted
+                          props_changed = true;
+                          break;
+                        }
+                    }
+
+                  if (props_changed)
+                    // attempting to create the object failed
+                    // call loadobj with struct
+                    ov = (meth.execute (octave_value_list (prop_map), 1))(0);
+                  else
+                    {
+                      if (! in_obj_cache)
+                        ovc = octave::to_ov (new_object);
+
+                      // pass object to loadobj
+                      ov = (meth.execute (octave_value_list (ovc), 1))(0);
+                    }
+                }
 
               if (! ov.is_defined ())
                 {

test/classdef-load-save/classdef-load-save-text.tst

@@ -173,7 +173,7 @@
 
 ## No constructor, ConstructOnLoad = false, loadobj is defined, no saveobj
 ## Class definition changes between saving and loading the object
-%!test <67414>
+%!test <*67414>
 %! clear classes;
 %! obj = loadobj_changed_class ();
 %! obj.a = 0;

test/classdef-load-save/classdef-load-save-v6.tst

@@ -173,7 +173,7 @@
 
 ## No constructor, ConstructOnLoad = false, loadobj is defined, no saveobj
 ## Class definition changes between saving and loading the object
-%!test <67414>
+%!test <*67414>
 %! clear classes;
 %! obj = loadobj_changed_class ();
 %! obj.a = 0;

test/classdef-load-save/classdef-load-save-v7.tst

@@ -173,7 +173,7 @@
 
 ## No constructor, ConstructOnLoad = false, loadobj is defined, no saveobj
 ## Class definition changes between saving and loading the object
-%!testif HAVE_ZLIB  <67414>
+%!testif HAVE_ZLIB  <*67414>
 %! clear classes;
 %! obj = loadobj_changed_class ();
 %! obj.a = 0;