Changeset 497 for trunk/thune/thune.c

Timestamp:

11/14/07 04:27:55 (12 months ago)

Author:

krobillard

Message:

Iter accepts negative skip.
Updated GL atoms, manual, and encode test.

Files:

• trunk/thune/thune.c (modified) (4 diffs)

trunk/thune/thune.c

@@ -609 +609 @@
 
                 case OP_ITER:           // (series blk -- )
-                    if( ur_is(UR_TOS, UT_BLOCK) &&
-                        (ur_itLen( ut, ur_s_prev(UR_TOS) ) > 0) )
+                    if( ur_is(UR_TOS, UT_BLOCK) )
                     {
+                        int skip = ur_sel(val);
+                        if( skip == 0 )
+                            skip = 1;
+                        if( skip > 0 )
+                        {
+                            if( ur_itLen( ut, ur_s_prev(UR_TOS) ) < 1 )
+                                goto no_iter;
+                        }
+                        else
+                        {
+                            if( ur_s_prev(UR_TOS)->series.it < 1 )
+                                goto no_iter;
+                        }
                         PUSHC_EVAL( blkN, start, pc );
                         SET_BLK_PC( UR_TOS->series.n,
                                     UR_TOS->series.it );
-                        PUSHC_ITER( blkN, pc, end,
-                                    (ur_sel(val) > 1) ? ur_sel(val) : 1 );
+                        PUSHC_ITER( blkN, pc, end, skip );
 
                         // Loop code must drop TOS.
@@ -623 +634 @@
                     else
                     {
+no_iter:
                         UR_S_DROPN(2);
                     }
@@ -1063 +1075 @@
 
         case CC_ITER:
-            UR_TOS->series.it += UR_TOC->iter.skip;
-            if( ur_itLen(ut, UR_TOS) > 0 )
+        {
+            int skip = UR_TOC->iter.skip;
+            UR_TOS->series.it += skip;
+            if( ((skip > 0) ? ur_itLen(ut, UR_TOS) : UR_TOS->series.it + 1)
+                    > 0 )
             {
                 RESET_ITER( pc, end );
@@ -1072 +1087 @@
             UR_C_DEC;
             UR_S_DROP;           // Pop iterator value.
+        }
             goto control;