Changeset fe52ab1 in tol

Timestamp:

Mar 23, 2011, 9:34:07 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

b6a9243

Parents:

3a849c8

Message:

Fixes #1133
Struct creator function must be destroyed at user code level

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

File:

• tol/btol/bgrammar/str.cpp (modified) (4 diffs)

tol/btol/bgrammar/str.cpp

@@ -36 +36 @@
 #include <tol/tol_bsymboltable.h>
 #include <tol/tol_bsetgra.h>
+#include <tol/tol_bcodgra.h>
 #include <tol/tol_bnameblock.h>
 #include <tol/tol_bclass.h>
@@ -318 +319 @@
   if(function_) 
   {
-          function_->DecNRefs();
-  //VBR: This line is added to catch possible errors during a quarentine period
-#   ifndef NDEBUG
-    if(!System() && !function_->NRefs())
-    {
-      Warning(BText("\nStruct creator cannot be destroyed due to it is "
-              "already referenced ")+function_->NRefs()+ " times\n");
-    }
-#   endif
+    function_->DecNRefs();
     BGrammar::DelObject(function_);
-          DESTROY(function_);
+    BUserFunCode* uCode = function_->GetCode();
+          DESTROY(uCode);
   }
   BGrammar::DelObject(this);
@@ -633 +627 @@
 {
     BText dump = "Struct ";
-    dump += FullName() + " = {";
+    dump += FullName() + " {\n  ";
     if(field_->HasValue())
     {
@@ -640 +634 @@
         for(n=0; n<field_->Size(); n++)
         {
-            if(arg.HasName()) { arg += ", "; }
+            if(arg.HasName()) { arg += ", \n"; }
             arg += (*field_)[n].Dump() ;
         }
         dump += arg;
     }
-    dump += "}";
+    dump += "\n};";
     return(dump);
 }