Changeset 2483c6d in tol

Timestamp:

May 31, 2011, 10:52:09 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

4344840

Parents:

04637383

Message:

Fixed #1227

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3596 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/bgrammar/nameblock.cpp (modified) (1 diff)

tol/btol/bgrammar/nameblock.cpp

@@ -1592 +1592 @@
   contens_.PrepareStore(members.Card());
   const BClass* cls = nb.Class();
-  for(i=1; i<=members.Card(); i++)
-  {
-    BSyntaxObject* mbr = members[i];
+  int nu_members_instance =(cls)?cls->member_.Size():0;
+  int nu_members_non_instance = members.Card();
+  int nu_members = nu_members_instance + nu_members_non_instance;
+  for(i=1; i<=nu_members; i++)
+  {
+    BSyntaxObject* mbr = NULL;
+    if(i<=nu_members_instance) 
+    {
+      BMember* clsMbr = cls->member_[i-1]->member_;
+      if(clsMbr->static_) 
+      { 
+        continue; 
+      }
+      else if(clsMbr->method_) 
+      { 
+        mbr = clsMbr->method_; 
+      }
+      else if(clsMbr->name_[0]!='_')
+      { 
+        mbr = nb.PublicMember(clsMbr->name_); 
+      }
+      else if(clsMbr->name_[1]=='.')
+      {
+        mbr = nb.PrivateMember(clsMbr->name_);
+      }
+    }
+    else
+    {
+      mbr = members[i-nu_members_instance];
+      if(cls && mbr && cls->FindMember(mbr->Name())) { mbr = NULL; }
+    }
     if(!mbr) { continue; }
     const BText& name = mbr->Name();