Changeset 413 for branches/thune

Timestamp:

06/16/07 22:57:19 (17 months ago)

Author:

krobillard

Message:

change now handles optional int! part.

Files:

• branches/thune/thread_safe/series.c (modified) (4 diffs)

branches/thune/thread_safe/series.c

@@ -2366 +2366 @@
 
 /*
-  (ser new -- ser)
+   Returns index in dst where copy of src ends.
+*/
+static UIndex _changeBytes( UBinary* dst, UIndex di,
+                            UBinary* src, UIndex si, int part )
+{
+    int slen = src->used - si;
+    if( slen > 0 )
+    {
+        UIndex newIndex = di + slen;
+
+        if( (part > 0) && (part < slen) )
+        {
+            part = slen - part;
+
+            ur_arrayReserve( dst, sizeof(char), dst->used + part );
+
+            copyReverseC( dst->ptr.c + dst->used - 1,
+                          dst->ptr.c + di - 1,
+                          dst->ptr.c + dst->used + part - 1 );
+
+            dst->used += part;
+        }
+        else
+        {
+            ur_arrayReserve( dst, sizeof(char), newIndex );
+
+            if( newIndex > dst->used )
+                dst->used = newIndex;
+        }
+
+        // TODO: Handle overwritting self when dst is src.
+        memCpy( dst->ptr.c + di,
+                src->ptr.c + si, slen );
+
+        return newIndex;
+    }
+    return di;
+}
+
+
+/*
+  (ser new [part] -- ser)
 */
 UR_CALL( uc_change )
 {
-    UCell* a1 = ur_s_prev(tos);
-
-    UR_S_DROP;
+    UCell* a1;
+    int part = 0;
+
+    if( ur_is(tos, UT_INT) )
+    {
+        part = ur_int(tos);
+        tos = ur_s_prev(tos);
+        UR_S_DROP;
+    }
+
+    a1 = ur_s_prev(tos);
 
     switch( ur_type(a1) )
@@ -2379 +2428 @@
         case UT_STRING:
         {
-            int len2;
             UBinary* s1;
-            UBinary* s2;
-
-            if( ur_type(tos) == UT_STRING )
+
+            if( ur_is(tos, UT_STRING) )
             {
                 if( ur_encCharSize(tos) != 1 )
                     goto type_err;
             }
-            else if( ur_type(tos) != UT_BINARY )
+            else if( ! ur_is(tos, UT_BINARY) )
             {
                 goto type_err;
@@ -2396 +2443 @@
             assert( a1->series.it <= s1->used );
 
-            if( ur_is(tos, UT_CHAR ) )
+            if( ur_is(tos, UT_CHAR) )
             {
                 if( a1->series.it == s1->used )
@@ -2405 +2452 @@
                 s1->ptr.b[ a1->series.it ] = ur_char(tos);
                 a1->series.it += 1;
-                return;
-            }
-
-            // TODO: Handle overwritting itself.
-            assert( a1->series.n != tos->series.n );
-
-            s2 = ur_bin(tos);
-            assert( tos->series.it <= s2->used );
-
-            len2 = s2->used - tos->series.it;
-            if( len2 > 0 )
-            {
-                int newIndex;
-                newIndex = a1->series.it + len2;
-#if 0
-                if( orRefineSet(REF_CHANGE_PART) )
-                {
-                    int range;
-                    UCell* rngVal = REF_CHANGE_RANGE;
-
-                    if( rngVal->type == UT_INTEGER )
-                        range = rngVal->integer;
-                    else
-                        range = rngVal->series.it - a1->series.it;
-
-                    if( range < len2 )
-                    {
-                        if( range < 0 )
-                            range = 0;
-
-                        range = len2 - range;
-
-                        ur_arrayReserve( s1, sizeof(char),
-                                        s1->used + range );
-
-                        copyReverseC(s1->ptr.c + s1->used - 1,
-                                     s1->ptr.c + a1->series.it - 1,
-                                     s1->ptr.c + s1->used + range - 1);
-
-                        s1->used += range;
-                        goto str_copy;
-                    }
-                }
-#endif
-                ur_arrayReserve( s1, sizeof(char), newIndex );
-
-                if( newIndex > s1->used )
-                    s1->used = newIndex;
-//str_copy:
-                memCpy( s1->ptr.c + a1->series.it,
-                        s2->ptr.c + tos->series.it, len2 );
-
-                // Result.
-                a1->series.it = newIndex;
-                return;
-            }
+            }
+            else
+            {
+                a1->series.it = _changeBytes( s1, a1->series.it,
+                                              ur_bin(tos), tos->series.it,
+                                              part );
+            }
+            UR_S_DROP;
         }
             return;