Changeset c02c817 in tol

Timestamp:

May 12, 2009, 8:10:21 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

9b4d7dc

Parents:

7046b67

Message:

Ensuring nameBlock_ is still assigned

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

File:

• tol/btol/set_type/set.cpp (modified) (5 diffs)

tol/btol/set_type/set.cpp

@@ -353 +353 @@
 //--------------------------------------------------------------------
 {
-  if(nameBlock_)
+  if(nameBlock_ && nameBlock_->EnsureIsAssigned())
   {
     Error(I2("Cannot access to NameBlock members with operator ",
@@ -483 +483 @@
 //--------------------------------------------------------------------
 {
-  if(nameBlock_)
+  if(nameBlock_ && nameBlock_->EnsureIsAssigned())
   {
     Error(I2("Cannot access to NameBlock members with operator ",
@@ -523 +523 @@
           }
   }
-  else if(nameBlock_)
+  else if(nameBlock_ && nameBlock_->EnsureIsAssigned())
   {
     Error(I2("Cannot access to NameBlock members with ",
@@ -556 +556 @@
   BText txt;
   BText end;
-  if(nameBlock_) { txt = "NameBlock [["; end = "]]"; } else 
+  if(nameBlock_&& nameBlock_->EnsureIsAssigned()) 
+  { 
+    txt = "NameBlock [["; end = "]]"; 
+  } else 
   if(Struct()) { txt = struct_->Name() + "("; end = ")"; }  
   else { txt = "[[ "; end = "]]"; }
@@ -958 +961 @@
 //--------------------------------------------------------------------
 {
-  if(!nameBlock_)
+  if(!nameBlock_ || !nameBlock_->EnsureIsAssigned())
   {
     errMsg = I2("Cannot access to member ",