Changeset 7efd6dd in tol

Timestamp:

Dec 27, 2010, 8:50:49 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f4cc2f5

Parents:

137d85f

Message:

Fixes #908

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

Location:

tol

Files:

• btol/bgrammar/nameblock.cpp (modified) (3 diffs)
• btol/bgrammar/tol_bnameblock.h (modified) (1 diff)
• lang/language.cpp (modified) (4 diffs)

tol/btol/bgrammar/nameblock.cpp

@@ -103 +103 @@
   nonPrivateMembers_(0),
   requiredPackages_(NULL),
-  doingRebuildFullNameDeep(false)
+  doingRebuildFullNameDeep(false),
+  startedPackage(false)
 {
   SetEmptyKey(public_ ,NULL);
@@ -126 +127 @@
   nonPrivateMembers_(0),
   requiredPackages_(NULL),
-  doingRebuildFullNameDeep(false)
+  doingRebuildFullNameDeep(false),
+  startedPackage(false)
 {
   SetEmptyKey(public_ ,NULL);
@@ -149 +151 @@
   nonPrivateMembers_(0),
   requiredPackages_(NULL),
-  doingRebuildFullNameDeep(false)
+  doingRebuildFullNameDeep(false),
+  startedPackage(false)
 {
   short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->_bfsm_PageNum__);

tol/btol/bgrammar/tol_bnameblock.h

@@ -88 +88 @@
   bool doingRebuildFullNameDeep;
 public:
+  bool startedPackage;
   static bool Initialize();
   static BNameBlock&  Unknown() { return(*unknown_); }

tol/lang/language.cpp

@@ -1331 +1331 @@
   BOis::SetRunningUseModule(oldRunningUseModule);
   if(!fai) { return(false); }
-  bool ok = (bool)Real(fai);
+  bool ok = (bool)(Real(fai)!=0);
   DESTROY(fai);
   return(ok);
+}
+
+//--------------------------------------------------------------------
+static void PkgStartActions(const BText& package, const BText path)
+//--------------------------------------------------------------------
+{
+  BText startActionsExpr = package+"::StartActions(0)";
+  bool oldRunningUseModule = BOis::SetRunningUseModule(false);
+  BText oldDir = BDir::GetCurrent();
+  BDir::ChangeCurrent( GetFilePath(path) );
+  BSyntaxObject* startActions = GraReal()->EvaluateExpr(startActionsExpr);
+  BDir::ChangeCurrent(oldDir);
+  BOis::SetRunningUseModule(oldRunningUseModule);
+//Std(BText("\nTRACE startActionsExpr =")+startActionsExpr+" "+((startActions)?"OK":"FAIL")+"\n");
+  DESTROY(startActions);
 }
 
@@ -1366 +1381 @@
   }
   BSyntaxObject* pkg = GraNameBlock()->FindOperand(package,false);
-  bool ok = pkg!=NULL;
-  if(ok) { return(pkg); }
   BText path = LocalPath(package_version);
 //Std(BText("\nTRACE BPackage::Load 3 path='")+path+"'");
   BDir dirPath = path;
+
+  bool ok = pkg!=NULL;
+  if(ok) { 
+    BNameBlock& nb = NameBlock(pkg);
+    if(!nb.startedPackage)
+    {
+      PkgStartActions(package, path);
+      nb.startedPackage = true;
+    }
+    return(pkg); 
+  }
 //Std(BText("\nTRACE BPackage::Load 3 dirPath='")+dirPath.Name()+"'");
   if(!ok)
   {
-    ok=dirPath.Exist();
+    ok=dirPath.Exist()!=0;
     if(!ok)
     {
@@ -1385 +1409 @@
         zip.Close();
       }
-      ok=dirPath.Exist();
+      ok=dirPath.Exist()!=0;
     }
   //Std(BText("\nTRACE BPackage::Load 4 ok=")+ok);
@@ -1412 +1436 @@
           required_ = Cons(pkg, required_);
           BNameBlock::AddGlobalRequiredPackage(package);
-          BText startActionsExpr = package+"::StartActions(0)";
-          bool oldRunningUseModule = BOis::SetRunningUseModule(false);
-          BText oldDir = BDir::GetCurrent();
-          BDir::ChangeCurrent( GetFilePath(path) );
-          BSyntaxObject* startActions = GraReal()->EvaluateExpr(startActionsExpr);
-          BDir::ChangeCurrent(oldDir);
-          BOis::SetRunningUseModule(oldRunningUseModule);
-        //Std(BText("\nTRACE startActionsExpr =")+startActionsExpr+" "+((startActions)?"OK":"FAIL")+"\n");
-          DESTROY(startActions);
+          PkgStartActions(package, path);
         }
       }