Changeset 336 for trunk/thune/make.c

Timestamp:

01/05/07 21:14:50 (2 years ago)

Author:

krobillard

Message:

Thune - Added lshift, rshift. Improved bitset!.

Files:

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

trunk/thune/make.c

@@ -869 +869 @@
     UBinary* bin;
     uint8_t* bits;
-
-    binN = ur_makeBinary( ur_is(from, UT_INT) ? ur_int(from) : 32 );
+    int len;
+
+
+    switch( ur_type(from) )
+    {
+        case UT_INT:
+            len = (ur_int(from) + 7) / 8;
+            break;
+
+        case UT_BINARY:
+            bin  = ur_bin(from);
+            len  = bin->used;
+            bits = bin->ptr.b;
+
+            binN = ur_makeBinary( bin->used );
+            bin  = ur_binPtr( binN );
+            bin->used = len;
+            memCpy( bin->ptr.b, bits, len );
+            return binN;
+
+        default:
+            len = 32;
+            break;
+    }
+
+    binN = ur_makeBinary( len );
     bin = ur_binPtr( binN );
-    bin->used = bin->avail;
+    bin->used = len;
     bits = bin->ptr.b;
 
@@ -930 +954 @@
             }
         }
-            break;
-
-        case UT_BINARY:
-            _setBitsetBin( bits, from );
             break;