Changeset 814548d in tol

Timestamp:

Mar 24, 2011, 3:35:30 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

76b1443f

Parents:

72a07d0

Message:

In InheritesFrom a class inherites from itself

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

File:

• tol/btol/bgrammar/class.cpp (modified) (6 diffs)

tol/btol/bgrammar/class.cpp

@@ -666 +666 @@
 //--------------------------------------------------------------------
 {
-  if(!isGood_ || !ascentHash_) { return(false); }
+  if(!isGood_ || !ascentHash_ || !name.HasName()) { return(false); }
+  if(name==getName()) { return(true); }
   BClassByNameHash::const_iterator found = ascentHash_->find(name);
   return(found!=ascentHash_->end());
@@ -676 +677 @@
 //--------------------------------------------------------------------
 {
+  if(!parent) { return(false); }
+  if(this==parent) { return(true); }
   return(InheritesFrom(parent->getFullNameRef()));
 //return(InheritesFrom(parent->Name()));
@@ -1121 +1124 @@
   BClassByNameHash& par = *(parentHash_);
   bool ok = true;
+  for(iterC=par.begin(); iterC!=par.end(); iterC++)
+  {
+    BClass* parent = iterC->second;
+    ok &= parent->DestroyInstance(instance);
+  }
   if(__destroy)
   {
@@ -1130 +1138 @@
     BSyntaxObject* result = dstryr->Evaluator(args);
     if(!result) { ok = false; }
-    else { ok = (bool)Real(result); }
+    else { ok = Real(result)!=0.0; }
     dstryr->PutNameBlock(old);
     DESTROY(result); 
   }
-  for(iterC=par.begin(); iterC!=par.end(); iterC++)
-  {
-    BClass* parent = iterC->second;
-    ok &= parent->DestroyInstance(instance);
-  }
   return(ok);
 }
@@ -1152 +1155 @@
 //--------------------------------------------------------------------
 {
-  return(BParser::Unparse(tree_,"","\n"));
+//return(BParser::Unparse(tree_,"","\n"));
+  BText dump;
+  dump+="\n///////////////////////////////////////////////////////////////////////////////\n";  
+  dump+=BText("Class ")+FullName()+"\n";
+  int n; 
+  if(parentHash_)
+  {
+    BClassByNameHash::const_iterator iterC;
+    BClassByNameHash& par = *(parentHash_);
+    n=0;
+    for(iterC=par.begin(); iterC!=par.end(); iterC++, n++)
+    {
+      if(iterC->second)
+      {
+        if(n) { dump+=", "; }
+        else  { dump+=": "; }
+        dump += iterC->second->FullName(); 
+        n++;
+      }
+    }
+  }
+  dump+="\n///////////////////////////////////////////////////////////////////////////////\n";  
+  if(ascentHash_)
+  {
+    BClassByNameHash::const_iterator iterC;
+    BClassByNameHash& par = *(ascentHash_);
+    n=0;
+    for(iterC=par.begin(); iterC!=par.end(); iterC++, n++)
+    {
+      if(!n)
+      {
+        dump+="\n/*\n";  
+        dump += BText("Inherites directly or indirectly from these classes:\n  "); 
+      }
+      if(iterC->second)
+      {
+        if(n) { dump+="\n  "; }
+        dump += iterC->second->FullName(); 
+        n++;
+      }
+    }
+    dump+="\n*/  \n";  
+  }  
+  dump += BText("{\n  "); 
+  if(memberHash_)
+  {
+    BMbrNumByNameHash::const_iterator iterM;
+    BMbrNumByNameHash& mbr = *(memberHash_);
+    n=0;
+    for(iterM=mbr.begin(); iterM!=mbr.end(); iterM++, n++)
+    {
+      if(iterM->second)
+      {
+        const BMember* mbr = iterM->second->member_;
+        if(!mbr) { continue; }
+        const BText& name = mbr->name_;
+        if((name[0]=='_')&&(name[1]!='.')) { continue; }
+        if(name.BeginWith("_.autodoc.member.")) { continue; }
+        if(n) { dump+=";\n"; }
+        BSyntaxObject* adm = FindStaticMember(BText("_.autodoc.member.")+name, false);
+        dump+="\n/* ////////////////////////////////////////////////////////////////////////////\n";  
+        dump += 
+          BText((mbr->isStatic_)?"Static":"Non static")+ " "+
+          BText((mbr->isMethod_)?"method":"member")+ 
+          " defined at " + ((BClass*)(mbr->parent_))->FullName()+"\n";
+        if(adm) { dump+=Text(adm); } 
+        dump+="\n//////////////////////////////////////////////////////////////////////////// */\n"; 
+        dump+=mbr->declaration_;
+        if(mbr->definition_.HasName() && !(mbr->isMethod_))
+        {
+          dump+=BText(" = ")+ mbr->definition_;
+        } 
+        n++;
+      }
+    }
+  }
+  dump += BText("\n};\n"); 
+  return(dump);
 }
 //--------------------------------------------------------------------
@@ -1583 +1663 @@
 
 //--------------------------------------------------------------------
-BSyntaxObject* BClass::FindStaticMemeber(const BText& memberName, bool fullAccess) const
+BSyntaxObject* BClass::FindStaticMember(const BText& memberName, bool fullAccess) const
 //--------------------------------------------------------------------
 {