Changeset 475 for trunk/thune/series.c

Timestamp:

09/08/07 04:52:24 (15 months ago)

Author:

krobillard

Message:

append.cat now uses slice end.

Files:

• trunk/thune/series.c (modified) (1 diff)

trunk/thune/series.c

@@ -1278 +1278 @@
         case UT_BLOCK:
         case UT_PAREN:
-            if( ur_isABlock(tos) )
-            {
-                UBlock* s1 = ur_block(ser);
-                UBlock* s2 = ur_block(tos);
-                int used = s1->used;
-                int srcLen = s2->used - tos->series.it;
-
-                ur_arrayReserve( s1, sizeof(UCell), used + srcLen );
-
-                ur_copyCells( s2->ptr.cells + tos->series.it,
-                              s2->ptr.cells + s2->used,
-                              s1->ptr.cells + s1->used );
-                s1->used += srcLen;
+        {
+            UCell* ca;
+            UCell* cb;
+            if( ur_blockSlice( ut, tos, &ca, &cb ) )
+            {
+                if( ca != cb )
+                {
+                    UBlock* s1 = ur_block(ser);
+                    int srcLen = cb - ca;
+
+                    ur_arrayReserve( s1, sizeof(UCell), s1->used + srcLen );
+                    ur_copyCells( ca, cb, s1->ptr.cells + s1->used );
+                    s1->used += srcLen;
+                }
                 goto done;
             }
+        }
             break;
     }