Changeset 417 for branches/thune

Timestamp:

06/22/07 20:53:35 (17 months ago)

Author:

krobillard

Message:

Added ur_seriesMem() & fold helper.

Location:

branches/thune/thread_safe

Files:

• boot.c (modified) (1 diff)
• eval.c (modified) (1 diff)
• files.c (modified) (3 diffs)
• make.c (modified) (1 diff)
• mkboot.t (modified) (1 diff)
• series.c (modified) (4 diffs)
• tests/working/helpers.good (modified) (1 diff)
• tests/working/helpers.t (modified) (1 diff)
• urlan.h (modified) (1 diff)

branches/thune/thread_safe/boot.c

@@ -92 +92 @@
   "]\n"
   "'loop func :each.set       ; (ser words body -- )\n"
-  "[ser comb]\n"
-  "[\n"
+  "[ser accu op] [\n"
+  "  ser [first accu op do :accu] iter\n"
+  "  accu\n"
+  "] 'loop func :fold      ;(ser accu op -- accu)\n"
+  "[ser comb] [\n"
   "  ser [dup first comb do 1 poke drop] iter\n"
-  "] 'loop func :map     ;(ser comb -- )\n"
+  "] 'loop func :map       ;(ser comb -- )\n"
   "[ser old new | len] [\n"
   "    old length? :len\n"

branches/thune/thread_safe/eval.c

@@ -1128 +1128 @@
             else if( ur_is(val, UT_SLICE) && (ur_sliceDT(val) == UT_STRING) )
             {
-                ur_sliceDT(val) = UT_BINARY;
+                if( ur_encCharSize(val) == 1 )
+                    ur_sliceDT(val) = UT_BINARY;
             }
             else if( ur_is(val, UT_BITSET) )
             {
+                ur_type(val) = UT_BINARY;
+            }
+            else if( ur_is(val, UT_VECTOR) )
+            {
+                UIndex binN;
+                binN = ur_makeBinaryFrom( ut, val );
+                ur_setSeries(val, binN, 0);
                 ur_type(val) = UT_BINARY;
             }

branches/thune/thread_safe/files.c

@@ -622 +622 @@
     unsigned int blen;
 
-    if( ur_stringSlice( ut, tos, &cpA, &cpB ) && cpA )
-    {
-        len = cpB - cpA;
-        blen = len + (len / 99) + 600;
-
-        binN = ur_makeBinary( blen /*+ 4*/ );
-        bin = ur_binPtr( binN );
-
-        if( len > 0 )
-        {
-            ret = BZ2_bzBuffToBuffCompress( bin->ptr.c /*+ 4*/, &blen,
-                                            cpA, len,
-                                            3, 0, 0 );
-            if( ret == BZ_OUTBUFF_FULL )
-            {
-                ur_arrayFree( bin );
-                ur_throwErr( UR_ERR_ACCESS, "compress buffer full" );
-                return;
-            }
-            bin->used = blen;
-        }
-
-        ur_initType( tos, UT_BINARY );
-        ur_setSeries( tos, binN, 0 );
+    if( ur_seriesMem( ut, tos, &cpA, &cpB ) )
+    {
+        if( cpA )
+        {
+            len = cpB - cpA;
+            blen = len + (len / 99) + 600;
+
+            binN = ur_makeBinary( blen /*+ 4*/ );
+            bin = ur_binPtr( binN );
+
+            if( len > 0 )
+            {
+                ret = BZ2_bzBuffToBuffCompress( bin->ptr.c /*+ 4*/, &blen,
+                                                cpA, len,
+                                                3, 0, 0 );
+                if( ret == BZ_OUTBUFF_FULL )
+                {
+                    ur_arrayFree( bin );
+                    ur_throwErr( UR_ERR_ACCESS, "compress buffer full" );
+                    return;
+                }
+                bin->used = blen;
+            }
+
+            ur_initType( tos, UT_BINARY );
+            ur_setSeries( tos, binN, 0 );
+        }
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE,
+                     "compress expected string!/binary!/vector!" );
     }
 }
@@ -762 +770 @@
     res = UR_TOS;
 
-    if( ur_binarySlice( ut, res, &cpA, &cpB ) )
+    if( ur_seriesMem( ut, res, &cpA, &cpB ) )
     {
         switch( ur_atom(tos) )
@@ -794 +802 @@
     else
     {
-        ur_throwErr( UR_ERR_DATATYPE, "checksum expected binary!" );
+        ur_throwErr( UR_ERR_DATATYPE, "checksum expected string!/binary!" );
         return;
     }

branches/thune/thread_safe/make.c

@@ -197 +197 @@
     UIndex binN = 0;
 
-    if( ur_stringSlice( ut, cell, &cpA, &cpB ) )
+    if( ur_seriesMem( ut, cell, &cpA, &cpB ) )
     {
         int size;

branches/thune/thread_safe/mkboot.t

@@ -105 +105 @@
 'loop func :each.set       ; (ser words body -- )
 
-[ser comb]
-[
+[ser accu op] [
+  ser [first accu op do :accu] iter
+  accu
+] 'loop func :fold      ;(ser accu op -- accu)
+
+[ser comb] [
   ser [dup first comb do 1 poke drop] iter
-] 'loop func :map     ;(ser comb -- )
+] 'loop func :map       ;(ser comb -- )
 
 

branches/thune/thread_safe/series.c

@@ -96 +96 @@
 
 /**
-  Get pointers to the start and end characters of a string! or string slice!.
+  Get pointers to the start and end of a series or slice.
 
   \returns
-    Pointer to UString if cell is a string! or string slice!. 
+    Pointer to UBinary if cell is a series or slice.
     Otherwise, zero is returned.
     If the pointer is non-zero then cpA & cpB are set to point to the
@@ -105 +105 @@
     The character pointers will be zero if the string is empty.
 */
+UBinary* ur_seriesMem( UThread* ut, const UCell* cell,
+                       char** cpA, char** cpB )
+{
+    UBinary* bin;
+    int end;
+
+    switch( ur_type(cell) )
+    {
+        case UT_BINARY:
+            bin = ur_bin(cell);
+            if( ! bin->used )
+                goto empty;
+            end = bin->used;
+            goto set_pointers;
+
+        case UT_STRING:
+            bin = ur_bin(cell);
+            if( ! bin->used )
+                goto empty;
+            end = bin->used;
+            if( ur_encoding(cell) == UR_ENC_UTF16 )
+                goto set_pointers2;
+            goto set_pointers;
+
+        case UT_SLICE:
+            if( ur_sliceDT(cell) == UT_BINARY )
+            {
+                bin = ur_bin(cell);
+                if( ! bin->used )
+                    goto empty;
+                end = ur_sliceEnd(cell, bin);
+                goto set_pointers;
+            }
+            else if( ur_sliceDT(cell) == UT_STRING )
+            {
+                bin = ur_bin(cell);
+                if( ! bin->used )
+                    goto empty;
+                end = ur_sliceEnd(cell, bin);
+                if( ur_encoding(cell) == UR_ENC_UTF16 )
+                    goto set_pointers2;
+                goto set_pointers;
+            }
+            break;
+
+        case UT_VECTOR:
+            bin = ur_bin(cell);
+            if( ! bin->used )
+                goto empty;
+            end = bin->used;
+            goto set_pointers4;
+    }
+    return 0;
+
+set_pointers:
+
+    *cpA = bin->ptr.c + cell->series.it;
+    *cpB = bin->ptr.c + end;
+    return bin;
+
+set_pointers2:
+
+    *cpA = (char*) (bin->ptr.u16 + cell->series.it);
+    *cpB = (char*) (bin->ptr.u16 + end);
+    return bin;
+
+set_pointers4:
+
+    *cpA = (char*) (bin->ptr.i + cell->series.it);
+    *cpB = (char*) (bin->ptr.i + end);
+    return bin;
+
+empty:
+
+    *cpA = *cpB = 0;
+    return bin;
+}
+
+
+/**
+  Get pointers to the start and end characters of a string! or string slice!.
+
+  \see ur_seriesMem()
+*/
 UString* ur_stringSlice( UThread* ut, const UCell* cell,
                          char** cpA, char** cpB )
 {
-    UString* str;
-    int end;
-
-    if( ur_is(cell, UT_STRING) )
-    {
-        str = ur_bin(cell);
-        if( ! str->used )
-            goto empty;
-        end = str->used;
-
-set_pointers:
-        
-        if( ur_encoding(cell) == UR_ENC_UTF16 )
-        {
-            *cpA = (char*) (str->ptr.u16 + cell->series.it);
-            *cpB = (char*) (str->ptr.u16 + end);
-        }
-        else
-        {
-            *cpA = str->ptr.c + cell->series.it;
-            *cpB = str->ptr.c + end;
-        }
-        return str;
-    }
-    else if( ur_is(cell, UT_SLICE) && (ur_sliceDT(cell) == UT_STRING) )
-    {
-        str = ur_bin(cell);
-        if( ! str->used )
-            goto empty;
-        end = ur_sliceEnd(cell, str);
-        goto set_pointers;
-    }
+    if( ur_is(cell, UT_STRING) ||
+        (ur_is(cell, UT_SLICE) && (ur_sliceDT(cell) == UT_STRING)) )
+        return ur_seriesMem( ut, cell, cpA, cpB );
     return 0;
-
-empty:
-
-    *cpA = *cpB = 0;
-    return str;
 }
 
@@ -152 +202 @@
   Get pointers to the start and end characters of a binary! or binary slice!.
 
-  \see ur_stringSlice()
+  \see ur_seriesMem()
 */
 UBinary* ur_binarySlice( UThread* ut, const UCell* cell,
                          char** cpA, char** cpB )
 {
-    UBinary* str;
-    int end;
-
-    if( ur_is(cell, UT_BINARY) )
-    {
-        str = ur_bin(cell);
-        if( ! str->used )
-            goto empty;
-        end = str->used;
-
-set_pointers:
-        
-        *cpA = str->ptr.c + cell->series.it;
-        *cpB = str->ptr.c + end;
-        return str;
-    }
-    else if( ur_is(cell, UT_SLICE) && (ur_sliceDT(cell) == UT_BINARY) )
-    {
-        str = ur_bin(cell);
-        if( ! str->used )
-            goto empty;
-        end = ur_sliceEnd(cell, str);
-        goto set_pointers;
-    }
+    if( ur_is(cell, UT_BINARY) ||
+        (ur_is(cell, UT_SLICE) && (ur_sliceDT(cell) == UT_BINARY)) )
+        return ur_seriesMem( ut, cell, cpA, cpB );
     return 0;
-
-empty:
-
-    *cpA = *cpB = 0;
-    return str;
 }
 
@@ -193 +217 @@
   Get pointers to the start and end cells of a block or paren slice!.
 
-  \see ur_stringSlice()
+  \see ur_seriesMem()
 */
 UBlock* ur_blockSlice( UThread* ut, const UCell* cell,

branches/thune/thread_safe/tests/working/helpers.good

@@ -12 +12 @@
 "my\path/"
 "my\path\"
+--- fold ---
+10
+12

branches/thune/thread_safe/tests/working/helpers.t

@@ -20 +20 @@
 "my\path" dirize .
 "my\path\" dirize .
+
+
+"--- fold ---" print
+[2 5 3] 0 [add] fold .
+["Thune" "is" "great"] 0 [swap length? add] fold .
+

branches/thune/thread_safe/urlan.h

@@ -587 +587 @@
 
 UIndex ur_sliceEnd( const UCell*, const UArray* );
+UBinary* ur_seriesMem( UThread*, const UCell*, char** cpA, char** cpB );
 UString* ur_stringSlice( UThread*, const UCell*, char** cpA, char** cpB );
 UBinary* ur_binarySlice( UThread*, const UCell*, char** cpA, char** cpB );