Changeset 312 for trunk/thune/make.c

Timestamp:

12/03/06 04:52:27 (2 years ago)

Author:

krobillard

Message:

Thune - Renamed array! to vector!. Added vector! make.

Files:

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

trunk/thune/make.c

@@ -641 +641 @@
     str->ptr.c[ str->used ] = '\0';
     return strN;
+}
+
+
+/*--------------------------------------------------------------------------*/
+
+
+void _convertToDecimalVector( UArray* arr )
+{
+    int32_t* it  = arr->ptr.i;
+    int32_t* end = it + arr->used;
+
+    while( it != end )
+    {
+        *((float*) it) = (float) *it;
+        ++it;
+    }
+}
+
+
+// Returns zero if make failed.
+UIndex ur_makeVector( const UCell* from, UCell* res ) 
+{
+    UIndex binN = 0;
+    int vtype = UT_INT;
+
+    if( ur_is(from, UT_BLOCK) )
+    {
+        UBinary* bin;
+        UBlock* blk;
+        UCell* it;
+        UCell* end;
+
+        blk = ur_block( from );
+        UR_ITER_BLOCK( it, end, blk, from )
+
+        binN = ur_makeBinary( (end - it) * sizeof(int32_t) );
+        bin = ur_binPtr( binN );
+
+        while( it != end )
+        {
+            if( ur_is(it, UT_INT) )
+            {
+                bin->ptr.i[ bin->used ] = ur_int(it);
+                ++bin->used;
+            }
+            else if( ur_is(it, UT_DECIMAL) )
+            {
+                goto decimal;
+            }
+            ++it;
+        }
+        goto init;
+
+decimal:
+
+        vtype = UT_DECIMAL;
+        _convertToDecimalVector( bin );
+
+        while( it != end )
+        {
+            if( ur_is(it, UT_DECIMAL) )
+            {
+                bin->ptr.f[ bin->used ] = (float) ur_decimal(it);
+                ++bin->used;
+            }
+            else if( ur_is(it, UT_INT) )
+            {
+                bin->ptr.f[ bin->used ] = (float) ur_int(it);
+                ++bin->used;
+            }
+            ++it;
+        }
+    }
+    else if( ur_is(from, UT_INT) )
+    {
+        binN = ur_makeBinary( ur_int(from) * sizeof(int32_t) );
+    }
+
+    if( binN )
+    {
+init:
+        ur_initType(res, UT_VECTOR);
+        ur_arrayDT(res) = vtype;
+        ur_setSeries(res, binN, 0);
+        return binN;
+    }
+
+    return 0;
 }
 
@@ -1439 +1527 @@
             break;
 
+        case UT_VECTOR:
+        {
+            // Make array before setting res in case GC is called.
+            UIndex binN = ur_makeVector( tos, res );
+            if( ! binN )
+                goto error;
+        }
+            break;
+
         case UT_BITSET:
         {