Changeset 503 for trunk/thune/thune.c

Timestamp:

01/21/08 16:21:29 (10 months ago)

Author:

krobillard

Message:

Iter/each can now take skip value on stack. Each.set works again.

Files:

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

trunk/thune/thune.c

@@ -601 +601 @@
                     break;
 
-                case OP_ITER:           // (series blk -- )
+                case OP_ITER:           // (series blk [skip] -- )
                 case OP_EACH:
-                    if( ur_is(UR_TOS, UT_BLOCK) &&
-                        (ur_itLen( ut, ur_s_prev(UR_TOS) ) > 0) )
-                    {
-                        int itype = (ur_opcode(val) == OP_ITER) ?
+                {
+                    int itype;
+                    int skip;
+
+                    if( ur_is(UR_TOS, UT_INT) )
+                    {
+                        skip = ur_int(UR_TOS);
+                        UR_S_DROP;
+                    }
+                    else
+                    {
+                        skip = ur_sel(val);
+                    }
+
+                    if( ! ur_is(UR_TOS, UT_BLOCK) )
+                    {
+                        ur_throwErr( UR_ERR_DATATYPE,
+                             "iter/each expected block! for body" );
+                        goto throw_cc;
+                    }
+
+                    if( ur_itLen( ut, ur_s_prev(UR_TOS) ) > 0 )
+                    {
+                        itype = (ur_opcode(val) == OP_ITER) ?
                                     CC_ITER : CC_EACH;
-                        int skip = ur_sel(val);
-                        if( skip == 0 )
-                            skip = 1;
 
                         PUSHC_EVAL( blkN, start, pc );
@@ -620 +637 @@
                         //ur_copyCell( ut->toc, UR_TOS );
                         UR_TOC->iter.code = itype;
-                        UR_TOC->iter.skip = skip;
+                        UR_TOC->iter.skip = skip ? skip : 1;
                         ut->toc->series.n   = UR_TOS->series.n;
                         ut->toc->series.it  = UR_TOS->series.it;
@@ -634 +651 @@
                         UR_S_DROPN(2);
                     }
+                }
                     break;