Changeset 299cfe9 in tol

Timestamp:

Apr 3, 2009, 2:41:06 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

589249e

Parents:

a4edbdf

Message:

Fixes #673

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

Location:

tol/btol/bgrammar

Files:

• class.cpp (modified) (16 diffs)
• nameblock.cpp (modified) (1 diff)
• spfuninst.cpp (modified) (1 diff)
• tol_bclass.h (modified) (1 diff)

tol/btol/bgrammar/class.cpp

@@ -196 +196 @@
 //--------------------------------------------------------------------
 { 
-  return(definition_.HasName()); 
+  return(definition_.HasName()!=0); 
 }
 
@@ -215 +215 @@
 : isGood_      (true),
   tree_        (NULL),   
-  parentHash_  (new BClassByNameHash),
-  ascentHash_  (new BClassByNameHash),
-  mbrDecHash_  (new BMemberByNameHash),
-  mbrDefHash_  (new BMemberByNameHash),
-  memberHash_  (new BMbrNumByNameHash),
+  parentHash_  (NULL),
+  ascentHash_  (NULL),
+  mbrDecHash_  (NULL),
+  mbrDefHash_  (NULL),
+  memberHash_  (NULL),
   lastPosition_(0)
 {
-  //Reset hash_map's
-  SetEmptyKey  ((*parentHash_), NULL);
-  SetEmptyKey  ((*ascentHash_), NULL);
-  SetEmptyKey  ((*mbrDecHash_), NULL);
-  SetEmptyKey  ((*mbrDefHash_), NULL);
-  SetEmptyKey  ((*memberHash_), NULL);
-  SetDeletedKey((*mbrDecHash_), name_del_key());
-  SetDeletedKey((*mbrDefHash_), name_del_key());
-  SetDeletedKey((*memberHash_), name_del_key());
 }
 
@@ -252 +243 @@
 //--------------------------------------------------------------------
 {
+  DestroyAll();
+}
+
+//--------------------------------------------------------------------
+void BMemberOwner::DestroyAll()
+//--------------------------------------------------------------------
+{
+  DestroyMemberStore();
+  DestroyParentHashes();
+  DESTROY(tree_);
+}
+
+//--------------------------------------------------------------------
+void BMemberOwner::CreateMemberHashes()
+//--------------------------------------------------------------------
+{
+  //Reset hash_map's
+  mbrDecHash_  = new BMemberByNameHash;
+  mbrDefHash_  = new BMemberByNameHash;
+  memberHash_  = new BMbrNumByNameHash;
+  SetEmptyKey  ((*mbrDecHash_), NULL);
+  SetEmptyKey  ((*mbrDefHash_), NULL);
+  SetEmptyKey  ((*memberHash_), NULL);
+  SetDeletedKey((*mbrDecHash_), name_del_key());
+  SetDeletedKey((*mbrDefHash_), name_del_key());
+  SetDeletedKey((*memberHash_), name_del_key());
+}
+
+//--------------------------------------------------------------------
+void BMemberOwner::CreateParentHashes()
+//--------------------------------------------------------------------
+{
+  //Reset hash_map's
+  parentHash_  = new BClassByNameHash;
+  ascentHash_  = new BClassByNameHash;
+  SetEmptyKey  ((*parentHash_), NULL);
+  SetEmptyKey  ((*ascentHash_), NULL);
+}
+
+//--------------------------------------------------------------------
+  void BMemberOwner::Copy(const BMemberOwner& mbrOwn)
+//--------------------------------------------------------------------
+{
   int n=0;
-  DestroyMemberStore();
-//Std(BText("\n")+Name()+"::~BClass()");
-  //Frees parent classes
-  BClassByNameHash::const_iterator iterC;
-  if(parentHash_)
-  {
-    BClassByNameHash& par = *parentHash_;
+  if(!mbrOwn.isGood_) 
+  {
+    Error(I2("FATAL: Cannot copy corrupted BMemberOwner  ",
+             "FATAL: No se puede copiar un BMemberOwner corrupto"));
+    return; 
+  }
+  DestroyAll();
+
+  tree_ = (mbrOwn.tree_)?mbrOwn.tree_->duplicate():NULL;
+
+  if(mbrOwn.parentHash_)
+  {
+    CreateParentHashes();
+    BClassByNameHash::const_iterator iterC;
+    BClassByNameHash& par = *(mbrOwn.parentHash_);
     for(iterC=par.begin(); iterC!=par.end(); iterC++, n++)
     {
-      BClass* parent = iterC->second;
-      parent->DecNRefs();
-      DESTROY(parent);
-    };
-    delete parentHash_; 
-  }
-  if(ascentHash_) { delete ascentHash_; }
-
-  //Destroy parsed tree
-  DESTROY(tree_);
+      AddParent(iterC->second);
+    }
+  }
+  if(mbrOwn.memberHash_)
+  {
+    BMbrNumByNameHash::const_iterator iterM;
+    BMbrNumByNameHash& mbr = *(mbrOwn.memberHash_);
+    for(iterM=mbr.begin(); iterM!=mbr.end(); iterM++, n++)
+    {
+      AddMember(iterM->second->member_);
+    }
+  }
+  lastPosition_ = mbrOwn.lastPosition_;
 }
 
@@ -306 +351 @@
   mbrDefHash_ = NULL;
   memberHash_ = NULL;
+}
+
+//--------------------------------------------------------------------
+  void BMemberOwner::DestroyParentHashes()
+//--------------------------------------------------------------------
+{
+  if(parentHash_)
+  {
+    int n=0;
+    BClassByNameHash::const_iterator iterC;
+    BClassByNameHash& par = *parentHash_;
+    for(iterC=par.begin(); iterC!=par.end(); iterC++, n++)
+    {
+      BClass* parent = iterC->second;
+      parent->DecNRefs();
+      DESTROY(parent);
+    };
+    delete parentHash_; 
+  }
+  if(ascentHash_) { delete ascentHash_; }
+}
+
+//--------------------------------------------------------------------
+  void BMemberOwner::PutTree(List* tree)
+//--------------------------------------------------------------------
+{
+  tree_ = tree;
 }
 
@@ -335 +407 @@
 
 //--------------------------------------------------------------------
-  void BMemberOwner::Copy(const BMemberOwner& mbrOwn)
-//--------------------------------------------------------------------
-{
-  isGood_      = mbrOwn.isGood_;
-  tree_        = (mbrOwn.tree_)?mbrOwn.tree_->duplicate():NULL;
-  parentHash_  = new BClassByNameHash (*mbrOwn.parentHash_);
-  ascentHash_  = new BClassByNameHash (*mbrOwn.ascentHash_);
-  mbrDecHash_  = new BMemberByNameHash(*mbrOwn.mbrDecHash_);
-  mbrDefHash_  = new BMemberByNameHash(*mbrOwn.mbrDefHash_);
-  memberHash_  = new BMbrNumByNameHash(*mbrOwn.memberHash_);
-  lastPosition_ = mbrOwn. lastPosition_;
-}
-
-//--------------------------------------------------------------------
-  void BMemberOwner::PutTree(List* tree)
-//--------------------------------------------------------------------
-{
-  tree_ = tree;
-}
-
-//--------------------------------------------------------------------
   bool BMemberOwner::InheritesFrom(const BText& name) const
 //! True if inherites from a Class called as given name
 //--------------------------------------------------------------------
 {
-  if(!isGood_) { return(false); }
+  if(!isGood_ || !ascentHash_) { return(false); }
   BClassByNameHash::const_iterator found = ascentHash_->find(name);
   return(found!=ascentHash_->end());
@@ -377 +428 @@
 //--------------------------------------------------------------------
 {
-  if(!isGood_) { return(NULL); }
+  if(!isGood_ || !memberHash_) { return(NULL); }
   BMbrNumByNameHash::const_iterator found;
   found = memberHash_->find(name);
@@ -398 +449 @@
 //--------------------------------------------------------------------
 {
-  if(!isGood_) { return(NULL); }
+  if(!isGood_ || !memberHash_) { return(NULL); }
   BMemberByNameHash::const_iterator found;
   found = mbrDefHash_->find(declaration);
@@ -410 +461 @@
 //--------------------------------------------------------------------
 {
-  if(!isGood_) { return(NULL); }
+  if(!isGood_ || !memberHash_) { return(NULL); }
   BMemberByNameHash::const_iterator found;
   found = mbrDecHash_->find(declaration);
@@ -423 +474 @@
 {
   if(!isGood_) { return(false); }
+  if(!memberHash_) { CreateMemberHashes(); }
   BMbrNum* newMbrNum = new BMbrNum;
   newMbrNum->member_ = newMember;
@@ -521 +573 @@
   if(!isGood_) { return(false); }
   if(!parent) { return(true); }
+  if(!parentHash_) { CreateParentHashes(); }
 //Std(BText("\n")+Name()+"::AddParent("+parent->Name()+")");
   bool ok = true;
@@ -568 +621 @@
 {
   if(!isGood_) { return(false); }
+  if(!parentHash_) { CreateParentHashes(); }
   int n;
   bool ok = true;
@@ -583 +637 @@
 //--------------------------------------------------------------------
 {
-  if(!isGood_) { return(false); }
+  if(!isGood_ ) { return(false); }
+  if(!memberHash_) { CreateMemberHashes(); }
   bool ok = true;
   BMember* mbr = NULL;
@@ -595 +650 @@
       while(ok && lst)
       {
-        if(ok = lst->car()->IsListClass())
+        if(ok = lst->car()->IsListClass()!=0)
         {
           mbr = new BMember(this, (List*)lst->car());
@@ -619 +674 @@
         while(ok && lst)
         {
-          if(ok = lst->car()->IsListClass())
+          if(ok = lst->car()->IsListClass()!=0)
           {
             mbr = new BMember(this, (List*)lst->car());
@@ -658 +713 @@
   BMemberOwner()
 {
+  CreateMemberHashes();
+  CreateParentHashes();
 }
 
@@ -668 +725 @@
 {
   PutTree(tree_);
+  CreateMemberHashes();
+  CreateParentHashes();
   //Adds object to language searchers
   BGrammar::AddObject(this);

tol/btol/bgrammar/nameblock.cpp

@@ -162 +162 @@
 //--------------------------------------------------------------------
 {
-  Copy(ns);
+  BMemberOwner::Copy(ns);
   PutName(ns.Name());
+  localName_ = ns.LocalName();
   owner_     = NULL;
-  set_       = ns.Set();
   father_    = ns.Father();
-  public_    = ns.Public();
-  private_   = ns.Private();
-  localName_ = ns.LocalName();
-  //VBR: La copia de NameBlock tiene un problema si los miembros
-  //referenciados en ambos son los mismos, ¿cuál es su padre?
+  Fill(ns.Set());
+  Build();
   return(*this);
 }
+
 
 //--------------------------------------------------------------------

tol/btol/bgrammar/spfuninst.cpp

@@ -867 +867 @@
                     BUserTimeSerieDo* s1 = (BUserTimeSerieDo*)result;
                     BUserTimeSerieDo* s2 = (BUserTimeSerieDo*)val;
-                    s1->PutContens(s2);
-#ifdef __USE_TC__
-                } else if(type==GraCSeries()) {
-                    BUserCTimeSeriesDo* s1 = (BUserCTimeSeriesDo*)result;
-                    BUserCTimeSeriesDo* s2 = (BUserCTimeSeriesDo*)val;
-                    s1->PutContens(s2);
-#endif /* __USE_TC__ */
-    } else if(type==GraNameBlock())  {
+                    s1->PutContens(s2); }
+    else if(type==GraNameBlock())  {
+/*
       Error(I2("Cannot apply PutValue (nor :=) to NameBlock variables",
         "No se puede aplicar la función PutValue (ni :=) a variables NameBlock"));
       result = NULL;
-                } else {
+*/
+                    ((BUserNameBlock*)(result))->PutContens(((BUserNameBlock*)(val))->Contens());
+    }
+#ifdef __USE_TC__
+                else if(type==GraCSeries()) {
+                    BUserCTimeSeriesDo* s1 = (BUserCTimeSeriesDo*)result;
+                    BUserCTimeSeriesDo* s2 = (BUserCTimeSeriesDo*)val;
+                    s1->PutContens(s2); }
+#endif /* __USE_TC__ */
+                else {
                     TestResult(_name_,NIL,tre,NIL,BTRUE,
                                I2("Incompatible types: ",

tol/btol/bgrammar/tol_bclass.h

@@ -113 +113 @@
  ~BMemberOwner();
 
+  void CreateMemberHashes();
+  void CreateParentHashes();
   void DestroyMemberStore();
+  void DestroyParentHashes();
+  void DestroyAll();
   const BMemberOwner& operator = (const BMemberOwner& mbrOwn) 
   {