Changeset 98778a7 in tol

Timestamp:

Mar 26, 2013, 10:22:40 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

1af36f5

Parents:

a6be476

Message:

Fixes #1643 in tol 3.2

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

Location:

tol/btol/timeset_type

Files:

• tms.cpp (modified) (2 diffs)
• tmsgrav.cpp (modified) (4 diffs)

tol/btol/timeset_type/tms.cpp

@@ -723 +723 @@
   CheckCache(this);
   if(nth == 0) { return((!dte.HasValue()||Includes(dte))?dte:BDate::Unknown()); }
+  if(nth == -nth)
+  {
+    return(BDate::End());
+  }
   if(nth <  0) { return(Prev(dte, -nth)); }
   if(dte.IsTheEnd()) { return(BDate::End()); }
@@ -770 +774 @@
   CheckCache(this);
   if(nth == 0) { return((!dte.HasValue()||Includes(dte))?dte:BDate::Unknown()); }
+  if(nth == -nth)
+  {
+    return(BDate::Begin());
+  }
   if(nth <  0) { return(Next(dte, -nth)); }
   if(dte.IsTheBegin()) { return(BDate::Begin()); }

tol/btol/timeset_type/tmsgrav.cpp

@@ -1591 +1591 @@
 //--------------------------------------------------------------------
 {
-  if(x.IsUnknown() || x.IsTheEnd ()) 
+  if(x.IsUnknown() || x.IsTheEnd () || x.IsTheBegin ()) 
   { return(x); }
   if(n==0)  { return(icu_->Successor(x)); }
@@ -1610 +1610 @@
   {
     r *= 2;
+    if(r==-r)
+    { 
+      return(BDate::End()); 
+    }
     if(ua>x)
     {
@@ -1675 +1679 @@
 //--------------------------------------------------------------------
 {
-  if(x.IsUnknown() || x.IsTheBegin ()) 
+  if(x.IsUnknown() || x.IsTheBegin () || x.IsTheEnd ()) 
   { return(x); }
   if(n==0)  { return(icu_->Predecessor(x)); }
@@ -1694 +1698 @@
   {
     r *= 2;
+    if(r==-r)
+    { 
+      return(BDate::Begin()); 
+    }
     if(ua>=x)
     {