Changeset 476

Timestamp:

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

Author:

krobillard

Message:

Tweaked slice behavior.

Location:

trunk/thune

Files:

• doc/UserManual (modified) (1 diff)
• series.c (modified) (2 diffs)
• tests/working/slice.good (modified) (2 diffs)
• tests/working/slice.t (modified) (2 diffs)

trunk/thune/doc/UserManual

@@ -645 +645 @@
 
     "Hello world" :s
-    s 2,6 slice .          ; "ello"
+    s 2,4 slice .          ; "ello"
     s -2 slice .           ; ""Hello wor"
 

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;
 

trunk/thune/tests/working/slice.good

@@ -3 +3 @@
 "abc 123"
 true
+"abc"
+""
 --- logic! slice ---
 "abc 123 XYZ"
@@ -11 +13 @@
 "123"
 true
-"123 XYZ"
-true
+"123"
+""
 --- series! slice ---
 "abc 123"

trunk/thune/tests/working/slice.t

@@ -10 +10 @@
 s -4 slice dup :x
 x show
+s 3 slice .
+s 0 slice .
 
 
@@ -21 +23 @@
 
 s 5,-4 slice show
-s 5, 0 slice show
+s 5, 3 slice .
+s 5, 0 slice .