Changeset 6306f69 in tol

Timestamp:

Dec 27, 2010, 9:22:30 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

239a237

Parents:

f4cc2f5

Message:

Fixes #908

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

File:

• tol/lang/language.cpp (modified) (3 diffs)

tol/lang/language.cpp

@@ -1337 +1337 @@
 
 //--------------------------------------------------------------------
-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);
+static void PkgStartActions(
+  BSyntaxObject* pkg,
+  const BText& package, 
+  const BText path)
+//--------------------------------------------------------------------
+{
+  BNameBlock& nb = NameBlock(pkg);
+  if(!nb.startedPackage)
+  {
+    nb.startedPackage = true;
+    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);
+  }
 }
 
@@ -1387 +1395 @@
   bool ok = pkg!=NULL;
   if(ok) { 
-    BNameBlock& nb = NameBlock(pkg);
-    if(!nb.startedPackage)
-    {
-      PkgStartActions(package, path);
-      nb.startedPackage = true;
-    }
+    PkgStartActions(pkg, package, path);
     return(pkg); 
   }
@@ -1436 +1439 @@
           required_ = Cons(pkg, required_);
           BNameBlock::AddGlobalRequiredPackage(package);
-          PkgStartActions(package, path);
+          PkgStartActions(pkg, package, path);
         }
       }