Changeset 851efc0 in tol

Timestamp:

Mar 26, 2012, 10:06:17 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4861493

Parents:

bb29eda

Message:

Fixes #1489 in 3.2

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

File:

• tol/btol/bgrammar/nameblock.cpp (modified) (7 diffs)

tol/btol/bgrammar/nameblock.cpp

@@ -225 +225 @@
         BUserCode* uCode = UCode(obj);
         BOperator* opr   = GetOperator(uCode);
-        if ( opr->NameBlock() && opr->NameBlock() == this ) {
+        if ( opr && opr->NameBlock() && opr->NameBlock() == this ) {
           opr->PutNameBlock( NULL );
         }
@@ -567 +567 @@
       {
         mbr = memberOwner.member_[n]->member_; 
-        if(mbr->method_) 
+        if(mbr && mbr->method_) 
         { 
           mbr->method_->PutNameBlock(NULL); 
@@ -573 +573 @@
           {
             BUserCode* uCode = UCode(mbr->method_);
-            uCode->Contens().Operator()->PutNameBlock(NULL);
+            BOperator* opr = uCode->Contens().Operator();
+            if(opr) { opr->PutNameBlock(NULL); }
           }
         }
-        if(mbr->static_) 
+        if(mbr && mbr->static_) 
         { 
           mbr->static_->PutNameBlock(NULL); 
@@ -582 +583 @@
           {
             BUserCode* uCode = UCode(mbr->static_);
-            uCode->Contens().Operator()->PutNameBlock(NULL);
+            BOperator* opr = uCode->Contens().Operator();
+            if(opr) { opr->PutNameBlock(NULL); }
           }
         }
@@ -932 +934 @@
       {
         BUserCode* uCode = UCode(met);
-        uCode->Contens().Operator()->PutNameBlock(this);
+        BOperator* opr = uCode->Contens().Operator();
+        if(opr) { opr->PutNameBlock(this); }
       }
       result = met; 
@@ -965 +968 @@
       {
         BUserCode* uCode = UCode(met);
-        uCode->Contens().Operator()->PutNameBlock(this);
+        BOperator* opr = uCode->Contens().Operator();
+        if(opr) { opr->PutNameBlock(this); }
       }
       result = met; 
@@ -1142 +1146 @@
       {
         BUserCode* uCode = UCode(met);
-        uCode->Contens().Operator()->PutNameBlock(this);
+        BOperator* opr = uCode->Contens().Operator();
+        if(opr) { opr->PutNameBlock(this); }
       }
       result = met;