Changeset d958827 in tol

Timestamp:

Jun 16, 2010, 4:09:32 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

1ce1326

Parents:

7ccb257

Message:

Corregidos errores lógicos y sintácticos

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

File:

• tol/stdlib/general/TolPackage/common.tol (modified) (2 diffs)

tol/stdlib/general/TolPackage/common.tol

@@ -25 +25 @@
 //////////////////////////////////////////////////////////////////////////////
 //Devuelve el nombre de versión actual de un paquete ya cargado 
-  Set GetCurrentNameVersion(Text packageName, Real specificVersion)
+  Text GetCurrentNameVersion(Text packageName, Real specificVersion)
 //////////////////////////////////////////////////////////////////////////////
 {
@@ -39 +39 @@
 //////////////////////////////////////////////////////////////////////////////
 {
+//WriteLn("TRACE GetDeepDependencies 1");
   NameBlock p = Eval(packageName);
-  Text name.version = GetCurrentNameVersion(p);
+//WriteLn("TRACE GetDeepDependencies 2");
+  Text name.version = 
+    TolPackage::GetCurrentNameVersion(packageName, specificVersion);
+//WriteLn("TRACE GetDeepDependencies 3");
   If(!Card(p::_.autodoc.dependencies), Copy(Empty),
   {
-    Unique(SetConcat(EvalSet(p::_.autodoc.dependencies,GetDeepDependencies))<<
-           name.version)
+    Set aux=EvalSet(p::_.autodoc.dependencies, Set(Text r)
+    {
+      TolPackage::GetDeepDependencies(r,specificVersion)
+    });
+    Unique(SetConcat(aux)<<[[name.version]])
   }) 
 };