Changeset 314 for trunk/thune/make.c

Timestamp:

12/03/06 07:37:24 (2 years ago)

Author:

krobillard

Message:

Thune - Added ur_makeVector().

Files:

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

trunk/thune/make.c

@@ -660 +660 @@
 
 
+UIndex ur_makeVector( int size, UArray** ptr )
+{
+    UIndex binN;
+    UArray* bin;
+
+    binN = ur_makeBinary( size * sizeof(int32_t) );
+    bin = ur_binPtr( binN );
+    bin->avail /= sizeof(int32_t);
+
+    if( ptr )
+        *ptr = bin;
+
+    return binN;
+}
+
+
 // Returns zero if make failed.
-UIndex ur_makeVector( const UCell* from, UCell* res ) 
-{
+UIndex ur_makeVectorCell( const UCell* from, UCell* res ) 
+{
+    UArray* bin;
     UIndex binN = 0;
     int vtype = UT_INT;
@@ -668 +685 @@
     if( ur_is(from, UT_BLOCK) )
     {
-        UBinary* bin;
         UBlock* blk;
         UCell* it;
@@ -676 +692 @@
         UR_ITER_BLOCK( it, end, blk, from )
 
-        binN = ur_makeBinary( (end - it) * sizeof(int32_t) );
-        bin = ur_binPtr( binN );
+        binN = ur_makeVector( end - it, &bin );
 
         while( it != end )
@@ -716 +731 @@
     else if( ur_is(from, UT_INT) )
     {
-        binN = ur_makeBinary( ur_int(from) * sizeof(int32_t) );
+        binN = ur_makeVector( ur_int(from), 0 );
     }
 
@@ -723 +738 @@
 init:
         ur_initType(res, UT_VECTOR);
-        ur_arrayDT(res) = vtype;
+        ur_vectorDT(res) = vtype;
         ur_setSeries(res, binN, 0);
         return binN;
@@ -1530 +1545 @@
         {
             // Make array before setting res in case GC is called.
-            UIndex binN = ur_makeVector( tos, res );
+            UIndex binN = ur_makeVectorCell( tos, res );
             if( ! binN )
                 goto error;