Changeset 450 for branches/thune/thread_safe/make.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/make.c (modified) (4 diffs)

branches/thune/thread_safe/make.c

@@ -163 +163 @@
     UIndex binN = 0;
 
-    if( ur_seriesMem( ut, cell, &cpA, &cpB ) )
+    if( ur_binaryMem( ut, cell, &cpA, &cpB ) )
     {
         int size;
@@ -1304 +1304 @@
 
 
+/*
 static void _setSliceRange( UCell* cell, UIndex a, UIndex b )
 {
     if( a < b )
     {
-        cell->slice.it  = a;
-        cell->slice.end = b;
+        cell->series.it  = a;
+        cell->series.end = b;
     }
     else
     {
-        cell->slice.it  = a;
-        cell->slice.end = b;
-    }
-}
+        cell->series.it  = a;
+        cell->series.end = b;
+    }
+}
+*/
 
 
@@ -1663 +1665 @@
             UIndex binN;
 
+#if 0
+#ifdef LANG_THUNE
+            if( argc == 2 )
+            {
+                UCell* pc = ur_s_prev(tos);
+
+                ur_initType(res, UT_STRING);
+                ur_sliceDT(res) = ur_type(tos);
+                res->series.n = tos->series.n;
+
+                if( ur_is(tos, UT_STRING) )
+                    ur_encoding(res) = ur_encoding(tos);
+                if( ur_isASeries(pc) )
+                {
+                    _setSliceRange( res, pc->series.it, tos->series.it );
+                }
+                else if( ur_is(pc, UT_COORD) )
+                {
+                    int a, b;
+
+                    a = pc->coord.elem[0];
+                    b = pc->coord.elem[1];
+                    if( a < 1 )
+                        a = 0;
+                    else
+                        --a;
+                    if( b < 1 )
+                    {
+                        UString* str = ur_bin(tos);
+                        b += ur_sliceEnd(tos, str);
+                    }
+                    else
+                        --b;
+
+                    _setSliceRange( res, a, b );
+                }
+            }
+            else
+#endif
+#endif
             if( ur_is(tos, UT_INT) )
             {
@@ -1773 +1815 @@
             res->err.messageStr = tos->series.n;
             res->err.traceBlk   = ur_makeBlock( 8 );
-            break;
-
-        case UT_SLICE:
-            if( ur_isASeries(tos) )
-            {
-                ur_initType(res, UT_SLICE);
-                ur_sliceDT(res) = ur_type(tos);
-                res->series.n = tos->series.n;
-
-                if( ur_is(tos, UT_STRING) )
-                    ur_encoding(res) = ur_encoding(tos);
-
-                if( argc == 2 )
-                {
-                    UCell* pc = ur_s_prev(tos);
-                    if( ur_isASeries(pc) )
-                    {
-                        _setSliceRange( res, pc->series.it, tos->series.it );
-                    }
-                    else if( ur_is(pc, UT_COORD) )
-                    {
-                        _setSliceRange( res, pc->coord.elem[0] - 1,
-                                             pc->coord.elem[1] - 1 );
-                    }
-                }
-                else
-                {
-                    res->slice.it  = tos->series.it;
-                    res->slice.end = -1;
-                }
-            }
             break;