Changeset fe9f3eb in tol

Timestamp:

Sep 11, 2009, 2:44:28 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a5e46b1

Parents:

949a266

Message:

New method DeepMember of class instances searches members also on the owner of the class

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

File:

• tol/btol/bgrammar/nameblock.cpp (modified) (5 diffs)

tol/btol/bgrammar/nameblock.cpp

@@ -859 +859 @@
 
 //--------------------------------------------------------------------
+  BSyntaxObject* BNameBlock::DeepMember(const BText& memberName) const
+//--------------------------------------------------------------------
+{
+  BSyntaxObject* result = NULL;
+  result = Member(memberName);
+  if(!result && Class())
+  {
+    BSyntaxObject* met = Class()->FindMethod(memberName,true);
+    if(met) 
+    { 
+      met->PutNameBlock(this);
+      if(met->Mode()==BOBJECTMODE)
+      {
+        BUserCode* uCode = UCode(met);
+        uCode->Contens().Operator()->PutNameBlock(this);
+      }
+      result = met; 
+    }
+    if(!result && Class()->NameBlock())
+    {
+      result = Class()->NameBlock()->DeepMember(memberName);
+    }  
+  }
+/*
+  if(!result && Father())
+  {
+    if(memberName=="g")
+      printf("");
+    result = Father()->DeepMember(memberName);
+  }
+*/
+  if(result && (result->Mode()==BSTRUCTMODE))
+  {
+    BStruct* bstr = (BStruct*)result;
+    result = bstr->Function();
+  }
+  return(result);
+}
+
+//--------------------------------------------------------------------
+  BSyntaxObject* BNameBlock::LocalMember(const BText& memberName)
+//--------------------------------------------------------------------
+{
+  BSyntaxObject* result = NULL;
+  const BNameBlock* cns = BNameBlock::Current();
+  if(cns) { result = cns->DeepMember(memberName); }
+  return(result);
+}
+
+/*
+//--------------------------------------------------------------------
   BSyntaxObject* BNameBlock::LocalMember(const BText& memberName)
 //--------------------------------------------------------------------
@@ -866 +917 @@
   while(!result && cns)
   {
-/* */
     if(cns->Class())
     {
@@ -881 +931 @@
       } 
     }
-/* */
     if(!result)
     {
@@ -899 +948 @@
   return(result);
 }
+/* */
 
 //--------------------------------------------------------------------
@@ -1037 +1087 @@
     if(!dsc.HasName())
     {
-      BSyntaxObject* autodoc = Member(BText("_.autodoc.member.")+Name());
+      BText autodocName = BText("_.autodoc.member.")+Name();
+      BSyntaxObject* autodoc = NULL;
+      if(class_)
+      {
+        autodoc = class_->FindStaticMemeber(autodocName,-1);
+      }
+      else
+      {
+        autodoc = Member(autodocName);
+      }
       if(autodoc && autodoc->Grammar()==GraText())
       {