Changeset 450 for branches/thune/thread_safe/print.c

Timestamp:

08/11/07 04:53:46 (16 months ago)

Author:

krobillard

Message:

Removed slice! datatype - series now have an end.
Added slice test.
ur_makeBinary() now takes pointer argument.
Fixed bug in _makeComponent().
Fixed compiler warnings. Minor optimization to if/.

Files:

• branches/thune/thread_safe/print.c (modified) (8 diffs)

branches/thune/thread_safe/print.c

@@ -55 +55 @@
 
 /*
-   c2 must be a string! or string slice!.
+   c2 must be a string!.
 */
 void ur_strCatCell( UThread* ut, UString* out, int encoding, const UCell* c2 )
@@ -66 +66 @@
     si = c2->series.it;
 
-    used = str2->used;
-    if( ur_is(c2, UT_SLICE) )
-    {
-        if( used > c2->slice.end )
-            used = c2->slice.end;
-    }
+    used = ur_sliceEnd( c2, str2 );
     used -= si;
 
@@ -263 +258 @@
 static void _binCellToStr( UThread* ut, UString* out, const UCell* val )
 {
-    UString* bin = ur_binPtr( val->series.n );
-    _binToStr( out, 
-               bin->ptr.b + val->series.it,
-               bin->ptr.b + bin->used );
+    UBinary* bin = ur_bin( val );
+    UIndex n = ur_sliceEnd( val, bin );
+    if( n < val->series.it )
+        n = val->series.it;
+    _binToStr( out, bin->ptr.b + val->series.it,
+                    bin->ptr.b + n );
 }
 
@@ -783 +780 @@
         case UT_BLOCK:
         {
+            UCell* vp;
+            UCell* end;
             UBlock* blk = ur_block( val );
-            UCell* vp  = blk->ptr.cells + val->series.it;
-            UCell* end = blk->ptr.cells + blk->used;
-
-            if( vp != end )
-            {
+            UIndex n = ur_sliceEnd( val, blk );
+
+            if( n > val->series.it )
+            {
+                vp  = blk->ptr.cells + val->series.it;
+                end = blk->ptr.cells + n;
                 while( 1 )
                 {
@@ -799 +799 @@
             }
         }
-            break;
-
-        case UT_SLICE:
-            switch( ur_sliceDT(val) )
-            {
-                case UT_STRING:
-                    ur_strCatCell( ut, out, UR_ENC_ASCII, val );
-                    break;
-            }
             break;
 
@@ -1012 +1003 @@
         {
             UString* str = ur_bin( val );
+            UIndex n = ur_sliceEnd( val, str );
+            if( n < val->series.it )
+                n = val->series.it;
             if( ur_encoding(val) == UR_ENC_UTF16 )
             {
                 _appendStringUtf16( out, str->ptr.u16 + val->series.it,
-                                         str->ptr.u16 + str->used );
+                                         str->ptr.u16 + n );
             }
             else
             {
                 _appendStringAscii( out, str->ptr.c + val->series.it,
-                                         str->ptr.c + str->used );
+                                         str->ptr.c + n );
             }
         }
@@ -1182 +1176 @@
         case UT_BLOCK:
         {
-            UBlock* blk = ur_blockPtr( val->series.n );
+            UBlock* blk = ur_block( val );
+            UIndex n = ur_sliceEnd( val, blk );
+
+            if( n < val->series.it )
+                n = val->series.it;
+
             ur_blockToStr( ut, out,
                            blk->ptr.cells + val->series.it,
-                           blk->ptr.cells + blk->used,
+                           blk->ptr.cells + n,
                            ur_type(val), depth );
         }
@@ -1264 +1263 @@
             break;
 
-        case UT_SLICE:
-            switch( ur_sliceDT(val) )
-            {
-                case UT_BINARY:
-                {
-                    UBinary* bin = ur_bin(val);
-                    _binToStr( out,
-                               bin->ptr.b + val->slice.it,
-                               bin->ptr.b + ur_sliceEnd(val, bin) );
-                }
-                    break;
-
-                case UT_STRING:
-                {
-                    UString* str = ur_bin(val);
-                    if( ur_encoding(val) == UR_ENC_UTF16 )
-                    {
-                        _appendStringUtf16( out, str->ptr.u16 + val->slice.it,
-                                       str->ptr.u16 + ur_sliceEnd(val,str) );
-                    }
-                    else
-                    {
-                        _appendStringAscii( out, str->ptr.c + val->slice.it,
-                                       str->ptr.c + ur_sliceEnd(val,str) );
-                    }
-                }
-                    break;
-
-                case UT_BLOCK:
-                case UT_PAREN:
-                {
-                    UBlock* blk = ur_block(val);
-                    ur_blockToStr( ut, out,
-                                   blk->ptr.cells + val->slice.it,
-                                   blk->ptr.cells + ur_sliceEnd(val, blk),
-                                   ur_sliceDT(val), depth );
-                }
-                    break;
-
-                default:
-                    append( out, "?slice!?", 8 );
-                    break;
-            }
-            break;
-
         case UT_VECTOR:
             _arrayToStr( ut, out, val, depth );