Changeset 476 for trunk/thune/series.c

Timestamp:

09/08/07 05:44:09 (15 months ago)

Author:

krobillard

Message:

Tweaked slice behavior.

Files:

• trunk/thune/series.c (modified) (2 diffs)

trunk/thune/series.c

@@ -419 +419 @@
 
 #define _sliceFromEnd(n,cell) \
-    ((n < 1) ? ur_seriesEnd(cell) + n : cell->series.it + n - 1)
+    ((n < 0) ? ur_seriesEnd(cell) + n : cell->series.it + n)
 
 
@@ -456 +456 @@
         case UT_INT:
             end = _sliceFromEnd( ur_int(tos), res );
+            if( end < res->series.it )
+                end = res->series.it;
             break;
 
         case UT_COORD:
-            // TODO: Handle negative and incorrect order.
+            res->series.it += tos->coord.elem[0] - 1;
+            if( res->series.it < 0 )
+                res->series.it = 0;
+
             end = _sliceFromEnd( tos->coord.elem[1], res );
-            res->series.it += tos->coord.elem[0] - 1;
+            if( end < res->series.it )
+                end = res->series.it;
             break;