Changeset e5448d2 in tol

Timestamp:

Nov 15, 2010, 3:53:22 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f8fc37e

Parents:

d4a11e1

Message:

Refs #887
Avoiding the use of generic calling to IncNRefs and DecNRefs by means of a more sophisticated method.
BOisLoader creates a Bist* localDependencies_ to save orphan objets like time series dating, structs of sets and classes of nameblocks, when new argument addToLocalDependencies of ReadNextObject is true.
This list is passed to the returned set in new member BSet::oisLocalDependencies_ in order to be cleaned by the destructor of these returned set.

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

Location:

tol

Files:

• OIS/oisloader.cpp (modified) (12 diffs)
• OIS/tol_oisloader.h (modified) (2 diffs)
• btol/set_type/set.cpp (modified) (4 diffs)
• btol/set_type/tol_bset.h (modified) (2 diffs)

tol/OIS/oisloader.cpp

@@ -104 +104 @@
   oisHasPriorityOnConflict_(true),
   lostSource_(false),
-  tolSources_()
+  tolSources_(),
+  localDependencies_(NULL)
 {  
 }
@@ -724 +725 @@
 
 //--------------------------------------------------------------------
-  BSyntaxObject* BOisLoader::ReadNextObject()
+  BSyntaxObject* BOisLoader::ReadNextObject(bool addToLocalDependencies)
 //--------------------------------------------------------------------
 {
@@ -752 +753 @@
     if(mode==BOBJECTMODE) 
     { 
-      return(gra->FindOperand(name,false)); 
+      result = gra->FindOperand(name,false); 
     }
     else if((mode==BBUILTINFUNMODE)||(mode==BUSERFUNMODE))
     { 
-      return(gra->FindOperator(name)); 
+      result = gra->FindOperator(name); 
     }
     else if(mode==BSTRUCTMODE) 
     { 
-      return(FindStruct(name)); 
+      result = FindStruct(name); 
     }
     else if(mode==BCLASSMODE) 
     { 
-      return(FindClass(name,-1)); 
+      result = FindClass(name,-1); 
     }
     else 
     { 
-      return(NullError("FATAL in BOisLoader::ReadNextObject()"));
+      result = NullError("FATAL in BOisLoader::ReadNextObject()");
     }
   }
@@ -817 +818 @@
         str->PutFunction(new BNewStruct(*str));
       }
-      return(readed_[found].PutObject(str));
+      result = str;
     }
     else if(mode==BCLASSMODE) 
@@ -825 +826 @@
       Ensure(Read(*cls,object_));
     //Std(BText("\nBOisLoader::ReadNextObject Reading Class ")+cls->Name()+" "+cls->FullName());
-      return(readed_[found].PutObject(cls));
+      result = cls;
     }
     else
@@ -1049 +1050 @@
           { 
             object_->SetPos(offset);
-            BSyntaxObject* r = ReadNextObject(); 
+            //CALL ReadNextObject 
+            BSyntaxObject* r = ReadNextObject(true); 
             if(!r || (r->Mode()!=BSTRUCTMODE)) 
             { 
@@ -1075 +1077 @@
             ERead(offset, set_);
             object_->SetPos(offset);
-            r = ReadNextObject();
+            //CALL ReadNextObject
+            r = ReadNextObject(false);
             if(!r) 
             { 
@@ -1163 +1166 @@
           { 
             object_->SetPos(offset);
-            BSyntaxObject* r = ReadNextObject(); 
+            //CALL ReadNextObject
+            BSyntaxObject* r = ReadNextObject(true); 
             if(!r || (r->Mode()!=BSTRUCTMODE)) 
             { 
@@ -1204 +1208 @@
             ERead(offset, set_);
             object_->SetPos(offset);
-            r = ReadNextObject();
+            //CALL ReadNextObject
+            r = ReadNextObject(false);
             if(!r) 
             { 
@@ -1287 +1292 @@
           {
             object_->SetPos(offset);
-            BSyntaxObject* r = ReadNextObject();
+            //CALL ReadNextObject
+            BSyntaxObject* r = ReadNextObject(true);
             if(!r || (r->Grammar()!=GraTimeSet())) 
             { 
@@ -1424 +1430 @@
       result->PutDescription(description); 
     }
-    return(readed_[found].PutObject(result));
-  }
+  }
+  if(result)
+  {
+    result = readed_[found].PutObject(result);
+    if(addToLocalDependencies) 
+    {
+      localDependencies_ = Cons(result, localDependencies_);
+    }
+  }
+  return(result);
 }
 
@@ -1580 +1594 @@
     Ensure(SearchOffsetInHierarchy(partial));
     object_->GetPos();
-
-
-    data_ = ReadNextObject();
+    //CALL ReadNextObject
+    localDependencies_ = NULL;
+    data_ = ReadNextObject(false);
     ok = (data_!=NULL);
+    if(ok)
+    {
+      BSet& set = Set(data_);
+      set.PutOisLocalDependencies(localDependencies_);
+    }
   }
   Close();

tol/OIS/tol_oisloader.h

@@ -79 +79 @@
   BArray<BOffsetObject> readed_;
   BArray<BTOLDependency> tolSources_;
+  BList* localDependencies_;
   BSyntaxObject* data_;
   BText curHrchyPartialPath_;
@@ -145 +146 @@
   bool   SearchOffsetInHierarchy(const BSet* partial);
 
-  BSyntaxObject* ReadNextObject();
+  BSyntaxObject* ReadNextObject(bool addToLocalDependencies);
   BSyntaxObject* PutVariableName(BSyntaxObject* result, 
                                  const BText& name,

tol/btol/set_type/set.cpp

@@ -47 +47 @@
 : sourcePath_(NULL), struct_(NIL), subType_(Generic), array_(0),
   indexByName_(NULL),
-  nameBlock_(NULL)
+  nameBlock_(NULL),
+  oisLocalDependencies_(NULL)
 {
 }
@@ -60 +61 @@
 : sourcePath_(NULL), struct_(NIL), subType_(Generic), array_(0),
   indexByName_(NULL),
-  nameBlock_(NULL)
+  nameBlock_(NULL),
+  oisLocalDependencies_(NULL)
 { 
   Copy(set);
@@ -74 +76 @@
 : sourcePath_(NULL), struct_(NIL), subType_(Generic), array_(0),
   indexByName_(NULL),
-  nameBlock_(NULL)
+  nameBlock_(NULL),
+  oisLocalDependencies_(NULL)
 { 
   RobStruct(arg,str,sub); 
@@ -88 +91 @@
 {
   Delete();
+  DESTROY(oisLocalDependencies_);
 }
 

tol/btol/set_type/tol_bset.h

@@ -90 +90 @@
   BObjByIdxNameHash* indexByName_;
   const BNameBlock* nameBlock_;
-
+  BList* oisLocalDependencies_;
   static BText          orderError_;
   static BCode          order_;
@@ -150 +150 @@
                                     BText& errMsg) const;
 
-  BBool   Includes(BSyntaxObject*) const;
+  void PutOisLocalDependencies(BList* dep)
+  {
+    dep = oisLocalDependencies_;
+  };
+
+  BBool Includes(BSyntaxObject*) const;
 
   int BinWrite(FILE*) const { return 0; }