Changeset 525 for trunk/thune/series.c

Timestamp:

05/20/08 21:19:55 (7 months ago)

Author:

krobillard

Message:

Change can now poke a big-endian number into a binary.

Files:

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

trunk/thune/series.c

@@ -1091 +1091 @@
 
 
-/*
-   Append n to binary in big-endian byte format.
-*/
-static void _appendAsBytes( UThread* ut, UCell* bcell,
-                            int32_t n, int byteCount )
-{
-    uint8_t* bp;
-    UBinary* bin = ur_bin( bcell );
-
-    ur_arrayReserve( bin, 1, bin->used + byteCount );
-    bp = bin->ptr.b + bin->used;
-    bin->used += byteCount;
-
+static void _intToBytes( int n, uint8_t* bp, int byteCount )
+{
     switch( byteCount )
     {
@@ -1125 +1114 @@
             break;
     }
+}
+
+
+/*
+   Append n to binary in big-endian byte format.
+*/
+static void _appendAsBytes( UThread* ut, UCell* bcell,
+                            int32_t n, int byteCount )
+{
+    UBinary* bin = ur_bin( bcell );
+
+    ur_arrayReserve( bin, 1, bin->used + byteCount );
+    _intToBytes( n, bin->ptr.b + bin->used, byteCount );
+    bin->used += byteCount;
+
 }
 
@@ -2512 +2516 @@
 */
 static UIndex _changeBytes( UBinary* dst, UIndex di,
-                            UBinary* src, UIndex si, int part )
-{
-    int slen = src->used - si;
+                            char* src, int slen, int part )
+{
     if( slen > 0 )
     {
@@ -2540 +2543 @@
 
         // TODO: Handle overwritting self when dst is src.
-        memCpy( dst->ptr.c + di,
-                src->ptr.c + si, slen );
+        assert( di <= dst->used );
+        memCpy( dst->ptr.c + di, src, slen );
 
         return newIndex;
@@ -2571 +2574 @@
         case UT_STRING:
         {
-            UBinary* s1;
-
-            if( ur_is(tos, UT_STRING) )
-            {
-                if( ur_encCharSize(tos) != 1 )
+            UBinary* s1 = ur_bin(a1);
+
+            switch( ur_type(tos) )
+            {
+                case UT_CHAR:
+                case UT_INT:
+                {
+                    uint8_t bytes[ 4 ];
+
+                    if( part < 1 )
+                        part = 1;
+                    else if( part > 4 )
+                        goto type_err;
+
+                    _intToBytes( ur_int(tos), bytes, part );
+                    a1->series.it = _changeBytes( s1, a1->series.it,
+                                                  (char*) bytes, part, 0 );
+                }
+                    break;
+
+                case UT_STRING:
+                    if( ur_encCharSize(tos) != 1 )
+                        goto type_err;
+                    // Fall through...
+
+                case UT_BINARY:
+                {
+                    UBinary* s2 = ur_bin(tos);
+                    a1->series.it = _changeBytes( s1, a1->series.it,
+                                        s2->ptr.c + tos->series.it,
+                                        ur_sliceEnd(tos, s2) - tos->series.it,
+                                        part );
+                }
+                    break;
+
+                default:
                     goto type_err;
             }
-            else if( ! ur_is(tos, UT_BINARY) )
-            {
-                goto type_err;
-            }
-
-            s1 = ur_bin(a1);
-            assert( a1->series.it <= s1->used );
-
-            if( ur_is(tos, UT_CHAR) )
-            {
-                if( a1->series.it == s1->used )
-                {
-                    ur_arrayReserve( s1, sizeof(char), 1 );
-                    ++s1->used;
-                }
-                s1->ptr.b[ a1->series.it ] = ur_char(tos);
-                a1->series.it += 1;
-            }
-            else
-            {
-                a1->series.it = _changeBytes( s1, a1->series.it,
-                                              ur_bin(tos), tos->series.it,
-                                              part );
-            }
+
             UR_S_DROP;
         }