Changeset fa5f9a1 in tol

Timestamp:

May 16, 2011, 4:49:03 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5408466

Parents:

ad7183d

Message:

Refs #1206

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

Location:

tol

Files:

• btol/text_type/txtgra.cpp (modified) (2 diffs)
• stdlib/general/TolPackage/client.tol (modified) (3 diffs)

tol/btol/text_type/txtgra.cpp

@@ -64 +64 @@
 
 #include <locale.h>
+#include <stdlib.h>
 
 /*! key used to force that Sub be initialized before than Sub of matrix
@@ -2633 +2634 @@
   contens_ = textToWrap.Wrap(maxLineLength, wordSeparators, prefix);
 }
+
+
+//--------------------------------------------------------------------
+BInt CompareVersionString(const BText* txt1, const BText* txt2) 
+//--------------------------------------------------------------------
+{
+  BChar sep = '.';
+  BArray<BText> tok1, tok2;
+  ReadAllTokens(*txt1, tok1, sep);
+  ReadAllTokens(*txt2, tok2, sep);
+  int n1 = tok1.Size();
+  int n2 = tok2.Size();
+  int n = Minimum(n1,n2);
+  int k, t1, t2;
+  int cmp = 0;
+
+  for(k=0; (k<n) && !cmp; k++)
+  {
+    t1 = atoi(tok1[k].String());
+    t2 = atoi(tok2[k].String());
+    cmp = t1-t2;
+  }
+  if(!cmp) { cmp = n1-n2; }
+  return (cmp);
+}
+
+//--------------------------------------------------------------------
+DeclareContensClass(BDat, BDatTemporary, BDatCompareVersionString);
+DefExtOpr(1, BDatCompareVersionString, "Compare.VersionString", 2, 2, 
+"Text Text",
+"(Text a, Text b)",
+I2("Compares two version strings with an arbitrary number of numeric "
+    "tokens separated by the point character. For example 1.9 would "
+    "be prior to 1.10 while it is the reverse alphabetical order.",
+    "Compara dos cadenas de version con un número arbitrario de tokens "
+    "numéricos separados por el caracter punto. Por ejemplo 1.9 sería "
+    "anterior a 1.10 mientras que alfabéticamente es al revés.\n"),
+          BOperClassify::System_);
+void BDatCompareVersionString::CalcContens()
+//--------------------------------------------------------------------
+{
+  contens_ = CompareVersionString(&Text(Arg(1)),&Text(Arg(2)));
+}

tol/stdlib/general/TolPackage/client.tol

@@ -117 +117 @@
   Text If(!Card(pkgSel),"",
   {
-    Set pkgSort = Sort(pkgSel, Real(Text a, Text b) { Compare(b, a) });
+    Set pkgSort = Sort(pkgSel, Real(Text a, Text b) { 
+      Compare.VersionString(b, a) });
     pkgSort[1]
   })
@@ -616 +617 @@
     },
     {
-      Set ord = Sort(cls,Real ev.sort(Text a, Text b) { Compare(b, a) });
+      Set ord = Sort(cls,Real ev.sort(Text a, Text b) { 
+        Compare.VersionString(b, a) });
       Text ver = ord[1];
       Date gmt = Copy(NowGmt);
@@ -739 +741 @@
   Real(TolPackage::@VersionSynchro a, TolPackage::@VersionSynchro b)
   {
-    Compare(b->co_name_version,a->co_name_version)
+    Compare.VersionString(b->co_name_version,a->co_name_version)
   })[1];
   last_compatible->co_name_version