Changeset 7881d14d in tol

Timestamp:

Apr 21, 2010, 4:31:27 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

6ad2ca7

Parents:

b686a59

Message:

Fixes #837

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

Location:

tol

Files:

• btol/bgrammar/class.cpp (modified) (3 diffs)
• stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_missingBlock.tol (modified) (1 diff)
• stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_outputMissing.tol (modified) (1 diff)

tol/btol/bgrammar/class.cpp

@@ -1248 +1248 @@
       ok = (class_!=NULL);
       cdr = cdr->cdr();
+      BText owner = "";
       while(ok && !memberLst && cdr && 
             cdr->car() && cdr->car()->IsListClass())
@@ -1253 +1254 @@
         car = ((List*)(cdr->car()))->car();
         tok = (BToken*)car;
-        if((tok->TokenType()==TYPE) && 
+        BText parentName = "";
+        if(tok->Name()=="::")
+        {
+          ok = false;
+          if(cdr->car() && cdr->car()->IsListClass())
+          {
+            cdr = ((List*)(cdr->car()))->cdr();
+            if(cdr && cdr->car()->IsListClass())
+            {
+              car = ((List*)(cdr->car()))->car();
+              cdr = cdr->cdr();
+              BToken* tokOwner = (BToken*)car;
+              if(owner.HasName()) { owner = owner + "::" + tokOwner->Name(); }
+              else { owner = tokOwner->Name(); }
+              ok = true;
+            }
+          }
+          continue;
+        }
+        else if((tok->TokenType()==TYPE) && 
            (!tok->Close()) && 
            (((BTypeToken*)tok)->type_==BTypeToken::BCLASS))
         {
           parentArr.ReallocBuffer(nParent+1);
-          parentArr[nParent] = FindClass(tok->Name(),-1);
-          if(parentArr[nParent])
+          BClass* parent = NULL;
+          if(owner.HasName())
           {
+            parent = FindClass(owner+"::"+tok->Name(),-1);
+            owner = "";
+          }
+          else
+          {
+            parent = FindClass(tok->Name(),-1);
+          }
+          if(parent)
+          {
+            parentArr[nParent] = parent;
             nParent++;
             cdr = ((List*)(cdr->car()))->cdr();
@@ -1279 +1309 @@
         }
       }
-      if(ok && !memberLst && cdr)
+      if(ok && !parentArr.Size())
+      {
+        ok = false;
+        parentArr.ReallocBuffer(0);
+        Error(I2("No valid parent class list",
+                 "Lista de clases padre no válida")+":\n"+
+              BParser::Unparse(tree));
+      }
+      else if(ok && !memberLst && cdr)
       {
         memberLst = (List*)(cdr->car());

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_missingBlock.tol

@@ -8 +8 @@
 
 ////////////////////////////////////////////////////////////////////////////
-Class @BlockMissingBase : 
+Class @BlockMissingBase
 ////////////////////////////////////////////////////////////////////////////
 {

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/gibbs/_outputMissing.tol

@@ -7 +7 @@
 
 ////////////////////////////////////////////////////////////////////////////
-Class @OutputMissingBase :
+Class @OutputMissingBase
 ////////////////////////////////////////////////////////////////////////////
 {