Changeset 445 for branches/thune

Timestamp:

08/08/07 03:54:29 (16 months ago)

Author:

krobillard

Message:

Can make slice! using coord!.

Files:

• branches/thune/thread_safe/make.c (modified) (3 diffs)

branches/thune/thread_safe/make.c

@@ -1305 +1305 @@
 
 /*--------------------------------------------------------------------------*/
+
+
+static void _setSliceRange( UCell* cell, UIndex a, UIndex b )
+{
+    if( a < b )
+    {
+        cell->slice.it  = a;
+        cell->slice.end = b;
+    }
+    else
+    {
+        cell->slice.it  = a;
+        cell->slice.end = b;
+    }
+}
 
 
@@ -1788 +1803 @@
                     if( ur_isASeries(pc) )
                     {
-                        if( pc->series.it < tos->slice.it )
-                        {
-                            res->slice.it  = pc->series.it;
-                            res->slice.end = tos->series.it;
-                        }
-                        else
-                        {
-                            res->slice.it  = tos->series.it;
-                            res->slice.end = pc->series.it;
-                        }
+                        _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 );
                     }
                 }
@@ -1847 +1858 @@
             if( ur_datatype(res) < UT_BI_COUNT )
                 goto error;
+            if( ur_datatype(res) > ut->env->dtCount )
+                goto error;
 
             ut->env->customDT[ ur_datatype(res) - UT_BI_COUNT ].make( ut, tos );