Change ordering of classdef subsref to resolve to properties before methods (bug #67362).

* cdef-object.cc (cdef_object_scalar::subsref): On dot-indexing, attempt to
resolve to a property first before resolving to a method.
* etc/NEWS.11.md: Add note about change in behavior to NEWS file.
* test/classdef/@class_bug67362/class_bug67362.m,
test/classdef/@class_bug67362/shared_name.m: Add new files for test.
* test/classdef/classdef.tst: Add test that checks the behavior.
* test/classdef/module.mk: Add new files to dist tarball.

Author: kolmanthomas

etc/NEWS.11.md

@@ -32,6 +32,9 @@ Summary of important user-visible changes for version 11 (yyyy-mm-dd):
 - The `roots` function now accepts only a numeric argument.  Convert any
   non-numeric input to a numeric value with `double()`.
 
+- On dot-indexing of `classdef` objects, `subsref` now resolves to looking for
+  a property first, and if a property is not found, then it looks for a method.
+
 ### Graphical User Interface
 
 - The GUI now uses scalable SVG icons for beautiful display at any size.

libinterp/octave-value/cdef-object.cc

@@ -567,10 +567,29 @@ cdef_object_scalar::subsref (const std::string& type,
       {
         std::string name = (idx.front ())(0).string_value ();
 
-        cdef_method meth = cls.find_method (name);
+        cdef_property prop = cls.find_property (name);
 
-        if (meth.ok ())
+        if (prop.ok ())
           {
+            if (prop.is_constant ())
+              retval(0) = prop.get_value (true, "subsref");
+            else
+              {
+                m_count++;
+                retval(0) = prop.get_value (cdef_object (this),
+                                            true, "subsref");
+              }
+
+            skip = 1;
+          }
+
+        if (skip == 0)
+          {
+            cdef_method meth = cls.find_method (name);
+
+            if (! meth.ok ())
+              error ("subsref: unknown method or property: %s", name.c_str ());
+
             // If the method call is followed by another index operation,
             // the number of outputs of the call will be 1.
             int nargout_mtd = (type.length () > 2
@@ -600,24 +619,6 @@ cdef_object_scalar::subsref (const std::string& type,
               }
           }
 
-        if (skip == 0)
-          {
-            cdef_property prop = cls.find_property (name);
-
-            if (! prop.ok ())
-              error ("subsref: unknown method or property: %s", name.c_str ());
-
-            if (prop.is_constant ())
-              retval(0) = prop.get_value (true, "subsref");
-            else
-              {
-                m_count++;
-                retval(0) = prop.get_value (cdef_object (this),
-                                            true, "subsref");
-              }
-
-            skip = 1;
-          }
         break;
       }
 

test/classdef/@class_bug67362/class_bug67362.m

@@ -0,0 +1,15 @@
+classdef class_bug67362
+## Test class with property that shares the name with a method in a @folder
+
+  properties
+    shared_name = 42;  # property shares name with method in @folder
+  endproperties
+
+  methods
+
+    function obj = class_bug67362 ()
+    endfunction
+
+  endmethods
+
+endclassdef

test/classdef/@class_bug67362/shared_name.m

@@ -0,0 +1,6 @@
+function retval = shared_name (obj)
+## This method shares a name with a property.
+
+retval = 1;
+
+endfunction

test/classdef/classdef.tst

@@ -261,3 +261,8 @@
 
 %!error <cannot reshape scalar .* to .* array>
 %! reshape (value_class (), [3, 2]);
+
+## properties take precedence over methods with the same name
+%!test <*67362>
+%! obj = class_bug67362 ();
+%! assert (obj.shared_name, 42);

test/classdef/module.mk

@@ -1,6 +1,8 @@
 classdef_TEST_FILES = \
   %reldir%/@class_bug62802/amethod.m \
   %reldir%/@class_bug62802/class_bug62802.m \
+  %reldir%/@class_bug67362/class_bug67362.m \
+  %reldir%/@class_bug67362/shared_name.m \
   %reldir%/bug_60763.m \
   %reldir%/class_bug50011_1.m \
   %reldir%/class_bug50011_1A.m \