Changeset a32a175 in tol

Timestamp:

Dec 23, 2009, 10:58:33 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4725fcb

Parents:

6a80a46

Message:

Fixes #824

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

Location:

tol/btol/bgrammar

Files:

• class.cpp (modified) (7 diffs)
• nameblock.cpp (modified) (3 diffs)
• tol_bclass.h (modified) (2 diffs)

tol/btol/bgrammar/class.cpp

@@ -37 +37 @@
 #include <tol/tol_bcodgra.h>
 #include <tol/tol_btxtgra.h>
+#include <tol/tol_bdatgra.h>
 
 
@@ -291 +292 @@
 //--------------------------------------------------------------------
 {
+  static BText __destroyDec = "Real __destroy(Real void)";
   if(!isStatic_ && !method_ && isMethod_ && definition_.HasName())
   {
@@ -304 +306 @@
       method_->IncNRefs(); 
       method_->PutMethod();
+      bool isDestroy = method_->Name()=="__destroy";
+      if(isDestroy) 
+      { 
+        if(Compact(declaration_)==__destroyDec)
+        {
+          cls->PutDestroy(method_); 
+        }
+        else
+        {
+          Error(I2("Wrong declaration of destroyer method of Class ",
+                   "Declaración errónea del método destructor de Class ")+
+                parent_->getName()+
+                "\n"+declaration_+"\n"+
+                I2(" should be ", " debería ser ")+__destroyDec+
+                "\n"+__destroyDec+"\n");
+        }  
+      }
       BUserCode* uCode = UCode(method_);
       uCode->Contens().Operator()->PutMethod();
@@ -314 +333 @@
                "Sintaxis incorrecta en declaración de método ")+
             BParser::Unparse(branch_,"","\n")+
-            I2(" of Class ", "de Class ")+parent_->getName());
+            I2(" of Class ", " de Class ")+parent_->getName());
       return(0);
     }
@@ -1000 +1019 @@
 : BSyntaxObject(),
   BMemberOwner(),
-  isDefined_(false)
+  isDefined_(false),
+  __destroy(NULL)
 {
   CreateMemberHashes();
@@ -1022 +1042 @@
   //Remove symbol from language searchers
   BGrammar::DelObject(this);
+}
+
+//--------------------------------------------------------------------
+  void BClass::PutDestroy(BSyntaxObject* destroy) 
+//--------------------------------------------------------------------
+{
+  if(!__destroy) { __destroy = destroy; }
 }
 
@@ -1438 +1465 @@
 }
 
+//--------------------------------------------------------------------
+  bool BClass::DestroyInstance(BNameBlock* instance)
+//--------------------------------------------------------------------
+{
+  BClassByNameHash::const_iterator iterC;
+  BClassByNameHash& par = *(parentHash_);
+  bool ok = true;
+  for(iterC=par.begin(); iterC!=par.end(); iterC++)
+  {
+    BClass* parent = iterC->second;
+    ok &= parent->DestroyInstance(instance);
+  }
+  if(__destroy)
+  {
+    BUserFunCode* ufc= (BUserFunCode*)__destroy;
+    BUserFunction* dstryr = (BUserFunction*)ufc->Contens().Operator();
+    BList* args = NCons(new BContensDat(0.0));
+    const BNameBlock* old = dstryr->NameBlock();
+    dstryr->PutNameBlock(instance);
+    BSyntaxObject* result = dstryr->Evaluator(args);
+    if(!result) { ok = false; }
+    else { ok = (bool)Real(result); }
+    dstryr->PutNameBlock(old);
+    DESTROY(result); 
+  }
+  return(ok);
+}

tol/btol/bgrammar/nameblock.cpp

@@ -168 +168 @@
 {
   int n;
+  if(class_)
+  {
+    class_->DestroyInstance(this);
+    class_->DecNRefs();
+    DESTROY(class_);
+  }
   owner_ = NULL;
   for(n=1; n<=set_.Card(); n++)
@@ -177 +183 @@
   set_.Delete();
   father_ = NULL;
-  if(class_)
-  {
-    class_->DecNRefs();
-    DESTROY(class_);
-  }
   if(requiredPackages_)
   {
@@ -187 +188 @@
     requiredPackages_ = NULL;
   }
-
 }
 

tol/btol/bgrammar/tol_bclass.h

@@ -185 +185 @@
   static const BClass* currentClassBuildingInstance_;
   static const BClass* currentStatic_;
+  BSyntaxObject* __destroy;
   // Constructors and destructors: bgrammar\class.cpp
   BClass(const BText& name);
@@ -200 +201 @@
 
   bool CheckAutoDoc();
-
+  void PutDestroy(BSyntaxObject* destroy);
+  bool DestroyInstance(BNameBlock* instance);
   //! Evaluates a parsed tree with a Class declaration
   static BClass* PredeclareClass(const BText&name, BClass*&old, bool &ok);