Changeset 447 for branches/thune

Timestamp:

08/08/07 04:40:40 (16 months ago)

Author:

krobillard

Message:

ur_makeBinary() now takes pointer argument.

Location:

branches/thune/thread_safe

Files:

• encoding.c (modified) (2 diffs)
• eval.c (modified) (2 diffs)
• files.c (modified) (4 diffs)
• make.c (modified) (10 diffs)
• net.c (modified) (1 diff)
• series.c (modified) (2 diffs)
• thread.c (modified) (2 diffs)
• tokenize.c (modified) (1 diff)
• unix/os.c (modified) (1 diff)
• urlan.c (modified) (1 diff)
• urlan.h (modified) (3 diffs)
• win32/os.c (modified) (1 diff)

branches/thune/thread_safe/encoding.c

@@ -87 +87 @@
                     case UR_ENC_UTF16:
                         count >>= 1;
-                        strN = ur_makeBinary( count ); 
-                        bin = ur_binPtr( strN );
+                        strN = ur_makeBinary( count, &bin ); 
                         bin->used = copyUtf16ToAscii( bin->ptr.c,
                                                       (uint16_t*) cpA, count );
@@ -114 +113 @@
                 {
                     case UR_ENC_ASCII:
-                        strN = ur_makeBinary( count * 2 ); 
-                        bin = ur_binPtr( strN );
+                        strN = ur_makeBinary( count * 2, &bin ); 
                         bin->used = copyAsciiToUtf16( bin->ptr.u16,
                                                       cpA, count );

branches/thune/thread_safe/eval.c

@@ -1242 +1242 @@
                 UString* str;
 
-                binN = ur_makeBinary( 0 );
-                str  = ur_binPtr( binN );
+                binN = ur_makeBinary( 0, &str );
 
                 ur_toStr( val, str, 0 );
@@ -1644 +1643 @@
     if( ! ur_is(tos, UT_STRING) )
     {
-        UIndex strN = ur_makeBinary( 0 );
-        ur_toStrNatural( ut, tos, ur_binPtr(strN), 0 );
+        UString* bin;
+        UIndex strN = ur_makeBinary( 0, &bin );
+        ur_toStrNatural( ut, tos, bin, 0 );
         ur_initString(tos, strN, 0);
     }

branches/thune/thread_safe/files.c

@@ -386 +386 @@
                 }
 
-                binN = ur_makeBinary( size /*+ OR_CTERM_LEN*/ );
-                buf = ur_binPtr( binN );
+                binN = ur_makeBinary( size /*+ OR_CTERM_LEN*/, &buf );
 
                 fp = fileOpen( fn, FILE_READ_BINARY );
@@ -669 +668 @@
             blen = len + (len / 99) + 600;
 
-            binN = ur_makeBinary( blen /*+ 4*/ );
-            bin = ur_binPtr( binN );
+            binN = ur_makeBinary( blen /*+ 4*/, &bin );
 
             if( len > 0 )
@@ -725 +723 @@
         strm.avail_in  = len;
 
-        strN = ur_makeBinary( (len < BUF_LOW) ? BUF_LOW : len );
-        str = ur_binPtr(strN);
+        strN = ur_makeBinary( (len < BUF_LOW) ? BUF_LOW : len, &str );
         strm.next_out  = str->ptr.c;
         strm.avail_out = str->avail;
@@ -825 +822 @@
                 UBinary* bin;
 
-                binN = ur_makeBinary( 20 );
-                bin = ur_binPtr( binN );
+                binN = ur_makeBinary( 20, &bin );
                 bin->used = 20;
 

branches/thune/thread_safe/make.c

@@ -115 +115 @@
   Size is the number of bytes to reserve.  Used is set to 0.
 */
-UIndex ur_makeBinaryT( UThread* ut, int size )
+UIndex ur_makeBinaryT( UThread* ut, int size, UBinary** binPtr )
 {
     UBinary* ptr;
@@ -148 +148 @@
 
     ur_arrayInit( ptr, sizeof(char), size );
+    if( binPtr )
+        *binPtr = ptr;
     return ur_binN( ptr );
 }
@@ -167 +169 @@
 
         size = cpB - cpA;
-        binN = ur_makeBinary( size );
+        binN = ur_makeBinary( size, &bin );
         if( size )
         {
-            bin = ur_binPtr( binN );
             memCpy( bin->ptr.b, cpA, size );
             bin->used = size;
@@ -627 +628 @@
     if( len == 0 )
     {
-        return ur_makeBinary( 0 );
+        return ur_makeBinary( 0, 0 );
     }
 
@@ -638 +639 @@
     }
 
-    strN = ur_makeBinary( len + UR_CTERM_LEN );
-    str = ur_binPtr( strN );
+    strN = ur_makeBinary( len + UR_CTERM_LEN, &str );
 
     cp  = txt;
@@ -685 +685 @@
     UArray* bin;
 
-    binN = ur_makeBinary( size * sizeof(int32_t) );
-    bin = ur_binPtr( binN );
+    binN = ur_makeBinary( size * sizeof(int32_t), &bin );
     bin->avail /= sizeof(int32_t);
 
@@ -903 +902 @@
             bits = bin->ptr.b;
 
-            binN = ur_makeBinary( bin->used );
-            bin  = ur_binPtr( binN );
+            binN = ur_makeBinary( bin->used, &bin );
             bin->used = len;
             memCpy( bin->ptr.b, bits, len );
@@ -914 +912 @@
     }
 
-    binN = ur_makeBinary( len );
-    bin = ur_binPtr( binN );
+    binN = ur_makeBinary( len, &bin );
     bin->used = len;
     bits = bin->ptr.b;
@@ -1615 +1612 @@
 
         case UT_BINARY:
+        {
+            UIndex binN;
+            UBinary* bin;
+
             if( ur_is(tos, UT_INT) )
             {
-                UIndex binN;
-                binN = ur_makeBinary( ur_int(tos) );
+                binN = ur_makeBinary( ur_int(tos), &bin );
 
                 if( argc == 2 )
                 {
-                    UBinary* bin = ur_binPtr( binN );
                     int32_t n = ur_int( ur_s_prev(tos) );
                     bin->used = ur_int(tos);
@@ -1647 +1646 @@
                     }
                 }
-
-                ur_initType(res, UT_BINARY);
-                ur_setSeries(res, binN, 0);
+                goto init_bin;
             }
             else if( ur_stringSlice(ut, tos, &spA, &spB) )
             {
-                UIndex binN;
-                binN = ur_makeBinary( 0 );
+                binN = ur_makeBinary( 0, &bin );
                 if( spA )
-                    ur_readBinary( ur_binPtr( binN ), spA, spB );
-                ur_initType(res, UT_BINARY);
-                ur_setSeries(res, binN, 0);
-            }
+                    ur_readBinary( bin, spA, spB );
+init_bin:
+                ur_initBinary(res, binN, 0);
+            }
+        }
             break;
 
         case UT_STRING:
+        {
+            UIndex binN;
+
             if( ur_is(tos, UT_INT) )
             {
-                UIndex binN;
-                binN = ur_makeBinary( ur_int(tos) );
-                ur_initType(res, UT_STRING);
-                //ur_setEncoding(res, UR_ENC_ASCII);
-                ur_setSeries(res, binN, 0);
+                binN = ur_makeBinary( ur_int(tos), 0 );
+                goto init_str;
             }
             else if( ur_is(tos, UT_BLOCK) )
             {
-                UIndex binN;
                 UString* str;
-               
-                binN = ur_makeBinary(0);
-                str  = ur_binPtr(binN);
-
+                binN = ur_makeBinary(0, &str);
                 ur_toStr( tos, str, 0 );
-
-                ur_initType(res, UT_STRING);
-                //ur_setEncoding(res, UR_ENC_ASCII);
-                ur_setSeries(res, binN, 0);
+                goto init_str;
             }
             else if( ur_stringSlice(ut, tos, &spA, &spB) )
             {
-                UIndex binN;
-
                 if( spA )
                     binN = ur_makeString( spA, spB - spA );
                 else
-                    binN = ur_makeBinary( 0 );
-
-                ur_initType(res, UT_STRING);
-                //ur_setEncoding(res, UR_ENC_ASCII);
-                ur_setSeries(res, binN, 0);
-            }
+                    binN = ur_makeBinary( 0, 0 );
+init_str:
+                ur_initString( res, binN, 0 );
+            }
+        }
             break;
 

branches/thune/thread_safe/net.c

@@ -258 +258 @@
         {
             UIndex binN;
+            UBinary* bin;
 
             ur_initType(val, UT_INT);       // SV_FD
             ur_int(val) = socket;
 
-            binN = ur_makeBinary( sizeof(struct sockaddr) );
+            binN = ur_makeBinary( sizeof(struct sockaddr), &bin );
             if( spec )
             {
-                UBinary* bin = ur_binPtr( binN );
                 bin->used = sizeof(addr);
                 memCpy( bin->ptr.v, &addr, sizeof(addr) );

branches/thune/thread_safe/series.c

@@ -2245 +2245 @@
 {
     UBinary* orig;
+    UBinary* copy;
     UIndex copyN;
     int len;
@@ -2255 +2256 @@
         len = part;
 
-    copyN = ur_makeBinary( len * elemSize );
+    copyN = ur_makeBinary( len * elemSize, &copy );
     if( len > 0 )
     {
-        UBinary* copy = ur_binPtr( copyN );
         memCpy( copy->ptr.b,
                 orig->ptr.b + (val->series.it * elemSize),

branches/thune/thread_safe/thread.c

@@ -71 +71 @@
 
         {
-        UIndex binN = ur_makeBinary( 0 );
+        UIndex binN = ur_makeBinary( 0, 0 );
         assert( binN == BIN_THREAD_TMP );
         //ur_hold( ut, UT_BINARY, binN );       // Hardcoded in recycle
@@ -238 +238 @@
     //(void) exceptionType;
 
-    strN = ur_makeBinary( MAX_ERR_LEN );
-    str = ur_binPtr( strN );
+    strN = ur_makeBinary( MAX_ERR_LEN, &str );
 
     va_start( arg, fmt );

branches/thune/thread_safe/tokenize.c

@@ -839 +839 @@
                 if( ch == '}' )
                 {
+                    UBinary* bin;
+
                     if( tn & 1 )
                         goto binary_err;
 
-                    tn = ur_makeBinary( 0 );
-                    ur_readBinary( ur_binPtr(tn), token + 2, it );
+                    tn = ur_makeBinary( 0, &bin );
+                    ur_readBinary( bin, token + 2, it );
 
                     cell = ur_appendCell( BLOCK, UT_BINARY );

branches/thune/thread_safe/unix/os.c

@@ -73 +73 @@
         assert( len > 0 );
 
-        binN = ur_makeBinary( len + 1 );
-        str = ur_binPtr( binN );
+        binN = ur_makeBinary( len + 1, &str );
         str->used = len;
         memCpy( str->ptr.c, tmp, len );

branches/thune/thread_safe/urlan.c

@@ -668 +668 @@
     ur_pushContext( ut, (UCell*) &ur_thrGlobal );
 
-    ur_makeBinary( 0 );       // 0 - BIN_THREAD_TMP
+    ur_makeBinary( 0, 0 );       // 0 - BIN_THREAD_TMP
 }
 

branches/thune/thread_safe/urlan.h

@@ -548 +548 @@
 UCell*  ur_makePort( UThread*, UPortDevice* dev, UCell* res );
 UIndex  ur_makeBlockT( UThread*, int size, UBlock** ptr );
-UIndex  ur_makeBinaryT( UThread*, int size );
+UIndex  ur_makeBinaryT( UThread*, int size, UBinary** ptr );
 UIndex  ur_makeBinaryFrom( UThread*, const UCell* );
 UIndex  ur_makeStringT( UThread*, const char* txt, int len );
@@ -615 +615 @@
 
 #define ur_makeBlock(size)              ur_makeBlockT(ut,size,0)    
-#define ur_makeBinary(size)             ur_makeBinaryT(ut,size)
+#define ur_makeBinary(size,ptr)         ur_makeBinaryT(ut,size,ptr)
 #define ur_makeString(txt,len)          ur_makeStringT(ut,txt,len)
 #define ur_makeVector(size,ptr)         ur_makeVectorT(ut,size,ptr)
@@ -664 +664 @@
 
 #define ur_setSeries(c,sn,sit) \
-    (c)->series.n  = sn; \
-    (c)->series.it = sit
+    (c)->series.n = sn; \
+    (c)->series.it = sit;
 
 #define ur_bindType(c)      (c->word.flags & UR_FLAG_BIND_MASK)

branches/thune/thread_safe/win32/os.c

@@ -68 +68 @@
         assert( len > 0 );
 
-        binN = ur_makeBinary( len + 1 );
-        str = ur_binPtr( binN );
+        binN = ur_makeBinary( len + 1, &str );
         str->used = len;
         memCpy( str->ptr.c, tmp, len );