ecere/com/instance: Fixed confusion with private member

- When a private member was declared before a public property with the same name

diff --git a/compiler/bootstrap/ecere/bootstrap/instance.c b/compiler/bootstrap/ecere/bootstrap/instance.c
index 98a2047..0cea2ae 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/instance.c
+++ b/compiler/bootstrap/ecere/bootstrap/instance.c
@@ -4053,10 +4053,14 @@ while(*curMember && ((*curMember)->memberAccess == 2))
 else
 while(*curMember && (*curMember)->name)
 {
-struct __ecereNameSpace__ecere__com__DataMember * dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, (*curMember)->name, (((void *)0)), (((void *)0)), (((void *)0)));
+struct __ecereNameSpace__ecere__com__DataMember * dataMember = (((void *)0));
 
+if(((*curMember)->memberAccess != 2))
+{
+dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, (*curMember)->name, (((void *)0)), (((void *)0)), (((void *)0)));
 if(!dataMember)
 dataMember = (struct __ecereNameSpace__ecere__com__DataMember *)__ecereNameSpace__ecere__com__eClass_FindProperty(_class, (*curMember)->name, (((void *)0)));
+}
 if(dataMember && dataMember->memberAccess != 2 && dataMember->id >= 0)
 {
 *curMember = dataMember;

diff --git a/ecere/src/com/instance.ec b/ecere/src/com/instance.ec
index 5dd172c..ce30d12 100644 (file)
--- a/ecere/src/com/instance.ec
+++ b/ecere/src/com/instance.ec
@@ -4968,8 +4968,12 @@ public dllexport void eClass_FindNextMember(Class _class, Class * curClass, Data
          else
             while(*curMember && (*curMember).name)      // ADDED THIS HERE for eComPacket packet { Connect, 0, { ECOMMUNICATOR_PROTOCOL_VERSION } };
             {
-               DataMember dataMember = eClass_FindDataMember(_class, curMember->name, null, null, null);
-               if(!dataMember) dataMember = (DataMember)eClass_FindProperty(_class, curMember->name, null);
+               DataMember dataMember = null;
+               if(((*curMember).memberAccess != privateAccess))
+               {
+                  dataMember = eClass_FindDataMember(_class, curMember->name, null, null, null);
+                  if(!dataMember) dataMember = (DataMember)eClass_FindProperty(_class, curMember->name, null);
+               }
                if(dataMember && dataMember.memberAccess != privateAccess && dataMember.id >= 0) // Skip _vTbl, _refCount and _class in Instance
                {
                   *curMember = dataMember;