Changeset 6f7a669 in tol

Timestamp:

Nov 28, 2016, 12:33:05 PM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

97db5a0

Parents:

7b8f6fc

Message:

Se agilizan algunas funciones de TolPackage. Se incrementa la versión a 4.4.

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

Location:

tol/stdlib/TolPackage

Files:

• TolPackage.tol (modified) (1 diff)
• TolVersion.tol (modified) (2 diffs)
• common.tol (modified) (2 diffs)
• def_catalog.tol (modified) (2 diffs)

tol/stdlib/TolPackage/TolPackage.tol

@@ -18 +18 @@
   Text _.autodoc.minTolVersion = "v3.1";
   Real _.autodoc.version.high = 4;
-  Real _.autodoc.version.low = 3;
+  Real _.autodoc.version.low = 4;
 
   Text _.version = ""<<_.autodoc.version.high<<"."<<_.autodoc.version.low;

tol/stdlib/TolPackage/TolVersion.tol

@@ -32 +32 @@
   };
 
+  ////////////////////////////////////////////////////////////////////////////
+  // Se introduce una cache para agilizar las llamadas a esta función.
+  Set _ObtainIntegers.Cache = Copy(Empty);
   ////////////////////////////////////////////////////////////////////////////
   Set ObtainIntegers(Text version)
@@ -40 +43 @@
       If(False, ?)
     }, {
-      Real firstEnd = TextFind(version, ".", 2)-1;
-      Real If(firstEnd<0, firstEnd:=TextLength(version));
-      Real v1 = Eval(Text Sub(version, 2, firstEnd));
-      If(v1<=2, {
-        Text versionM = Replace(Sub(version, 2, TextLength(version)), 
-          ".", " ");
-        EvalSet(Select(Tokenizer(versionM, " "), _IsIntegerText), 
-          Real (Text it) { Eval(it) })
+      Real index = FindIndexByName(_ObtainIntegers.Cache, version);
+      Set If(index, {
+        _ObtainIntegers.Cache[index]
       }, {
-        Text versionM = Replace(Replace(
-          Replace(Sub(version, 2, TextLength(version)), ".", " "), 
-          " p", " 1 "), " b", " 0 ");
-        EvalSet(Select(Tokenizer(versionM, " "), _IsIntegerText), 
-          Real (Text it) { Eval(it) })
+        Real firstEnd = TextFind(version, ".", 2)-1;
+        Real If(firstEnd<0, firstEnd:=TextLength(version));
+        Real v1 = Eval(Text Sub(version, 2, firstEnd));
+        Set integers = If(v1<=2, {
+          Text versionM = Replace(Sub(version, 2, TextLength(version)), 
+            ".", " ");
+          EvalSet(Select(Tokenizer(versionM, " "), _IsIntegerText), 
+            Real (Text it) { Eval(it) })
+        }, {
+          Text versionM = Replace(Replace(
+            Replace(Sub(version, 2, TextLength(version)), ".", " "), 
+            " p", " 1 "), " b", " 0 ");
+          EvalSet(Select(Tokenizer(versionM, " "), _IsIntegerText), 
+            Real (Text it) { Eval(it) })
+        });
+        Set Append(_ObtainIntegers.Cache, [[ PutName(version, integers) ]]);
+        integers
       })
     })

tol/stdlib/TolPackage/common.tol

@@ -270 +270 @@
       UnknownDate);
     SetConcat(EvalSet(compRecords, Set (Set list) {
+      // localRelease se obtiene sólo una vez por cada list
+      Set record1 = list[1];
+      Text localIdentifier = client::ObtainIdentifier_Show(record1::name, 
+        Platform(?), Version, UnknownDate, 0);
+      Date localRelease = If(TextLength(localIdentifier), {
+        Set localRecord = client::GetRecord(localIdentifier);
+        localRecord::release
+      }, TheBegin);    
       EvalSet(list, Set (Set record) {
         Text dependencies = If(Card(record::freeDependencies), {
@@ -277 +285 @@
           }))
         }, "");
-        Text localIdentifier = client::ObtainIdentifier_Show(record::name, 
-          Platform(?), Version, UnknownDate, 0);
-        Date localRelease = If(TextLength(localIdentifier), {
-          Set localRecord = client::GetRecord(localIdentifier);
-          localRecord::release
-        }, TheBegin);
         @VersionSynchro(record::repository, record::name, record::identifier,
           "<...>", record::minTolVersion, record::maxTolVersion, 

tol/stdlib/TolPackage/def_catalog.tol

@@ -72 +72 @@
     Real If(ok, {
       // Se comprueba la versión de TOL
-      Real ok := If(tolVersion=="any", True, {
-        TolVersion::CompareVersions(record::minTolVersion, tolVersion)<=0
-        & TolVersion::CompareVersions(tolVersion, record::maxTolVersion)<=0
-      })
+      Real ok := Case(tolVersion=="any", True,
+        TolVersion::CompareVersions(record::minTolVersion, tolVersion)>0, False,
+        TolVersion::CompareVersions(tolVersion, record::maxTolVersion)>0, False,
+        True, True)
     });
     If(ok, {
@@ -148 +148 @@
         Real ok = TextMatch(record::identifier, txtPattern1) 
           | TextMatch(record::identifier, txtPattern2);
-        // Se comprueba la plataforma de TOL
+        // Se comprueba la plataforma y versión de TOL y la fecha
         Real If(ok, ok := _Record.IsCompatible(record, tolPlatform, 
           tolVersion, date));
-        // Se comprueba la versión de TOL
-        Real If(ok, ok := Case(tolVersion=="any", True,
-          TolVersion::CompareVersions(record::minTolVersion, tolVersion)>0,
-            False,
-          TolVersion::CompareVersions(tolVersion, record::maxTolVersion)>0, 
-            False,
-          True, True));
-        // Se comprueba que la fecha no es posterior a la indicada
-        Real If(ok, ok := If(""<<date=="Unknown", True,
-          record::release<=date));
         ok
       });