Changeset 300 for trunk/thune/rune

Timestamp:

10/18/06 23:51:02 (2 years ago)

Author:

krobillard

Message:

Rune - Implemented 'each.

Location:

trunk/thune/rune

Files:

• project.r (modified) (1 diff)
• rune.c (modified) (12 diffs)
• tests/control.good (added)
• tests/control.t (added)
• tests/mandel.ru (modified) (1 diff)

trunk/thune/rune/project.r

@@ -5 +5 @@
 default [
     warn
-    ;debug
-    release
+    debug
+    ;release
 
     cflags {-DLANG_RUNE}

trunk/thune/rune/rune.c

@@ -41 +41 @@
 
 
-#define OR_TOC      ur_thread->toc
-#define OR_BOC      ur_thread->cstack
+#define OR_TOC          ur_thread->toc
+#define OR_BOC          ur_thread->cstack
 
 #define ur_funcFetch(cell)  cell->func.closureN
@@ -49 +49 @@
 #define ur_varc(cell)       cell->func.localVars
 #define ur_evalLocal(cell)  cell->series.encoding
+#define opForeverBlkN(cell) cell->word.valBlk
 
 #if 0
@@ -115 +116 @@
     ROP_IF_ELSE,
     ROP_FOREVER,
+    ROP_EACH,
+    ROP_EACH_LOOP,
     ROP_BREAK,
     ROP_RETURN,
@@ -139 +142 @@
 
 
+#ifdef DEBUG
+void dumpControl()
+{
+    UString str;
+    UString* sp = &str;
+    UCell* it  = ur_env->threads->cstack;
+    UCell* end = ur_env->threads->toc + 1;
+
+    ur_arrayInit( sp, 1, 0 );
+
+    while( it != end )
+    {
+        str.used = 0;
+        ur_toStr( it++, sp, 0 );
+        ur_termCStr( sp );
+
+        dprint( str.ptr.c );
+        dprint( "\n" );
+    }
+
+    ur_arrayFree( sp );
+}
+#endif
+
+
 static void _appendTraceBlk( UCellError* err, int n, int it )
 {
@@ -181 +209 @@
     }
     return 1;
+}
+
+
+/*
+   Returns length of series from current iterator position.
+   If cell is not a series or beyond the tail then a negative number is
+   returned.
+*/
+static int ur_itLen( UCell* cell )
+{
+    int len = ur_seriesLen( cell );
+    if( len > -1 )
+        len -= cell->series.it;
+    return len;
 }
 
@@ -329 +371 @@
 
                 case ROP_FOREVER:
+                    PUSHC_EVAL( blkN, 0 );
                     PUSHC_CELL( val );
-                    OR_TOC->word.valBlk = 0;
+                    opForeverBlkN(OR_TOC) = 0;
                     goto fetch_pc;
+
+                case ROP_EACH:
+                    PUSHC_EVAL( blkN, 0 );
+                    PUSHC_CELL( val );
+                    ur_opFetch( OR_TOC ) = 0;
+                    if( pc >= end )
+                        goto unexpected_end;
+                    if( ur_is(pc, UT_WORD) )
+                    {
+                        UR_S_PUSH( *pc );
+                        ++pc;
+                        goto fetch_pc;
+                    }
+                    cval = val;
+                    val = pc;
+                    goto bad_opcode_type;
 
                 case ROP_BREAK:
@@ -465 +524 @@
 
                 case ROP_FOREVER:
-                    if( OR_TOC->word.valBlk == 0 )
+                    if( opForeverBlkN(cval) == 0 )
                     {
+                        // Evaluate loop for the first time.
                         if( ur_is(val, UT_BLOCK) || ur_is(val, UT_PAREN) )
                         {
-                            OR_TOC->word.valBlk = val->series.n;
+                            opForeverBlkN(cval) = val->series.n;
+                            // Set resume block pc for any 'break.
+                            cval[-1].series.it = pc - start;
                             goto do_block;
                         }
+                        goto bad_opcode_type;
                     }
                     val = ur_s_next(UR_TOS);
                     ur_initType( val, UT_BLOCK );
-                    ur_setSeries( val, OR_TOC->word.valBlk, 0 );
+                    ur_setSeries( val, opForeverBlkN(cval), 0 );
                     goto do_block;
+
+                case ROP_EACH:
+                    PUSH_VAL
+                    if( ur_opFetch( cval ) == 0 )
+                    {
+                        ur_opFetch( cval ) += 1;
+                        if( ! ur_isASeries(val) )
+                            goto bad_opcode_type;
+                        goto fetch_pc;
+                    }
+                    else
+                    {
+                        if( ! ur_is(val, UT_BLOCK) )
+                            goto bad_opcode_type;
+                        ur_opcode(cval) = ROP_EACH_LOOP;
+                        // Set resume block pc.
+                        cval[-1].series.it = pc - start;
+                    }
+                    // Drop through to ROP_EACH_LOOP.
+
+                case ROP_EACH_LOOP:
+                    val = ur_s_prev(UR_TOS);
+                    if( ur_itLen( val ) > 0 )
+                    {
+                        cval = ur_wordCell( ur_thread, ur_s_prev(val) );
+                        if( ! cval )
+                            goto op_throw;
+                        ur_pick( val, 0, cval );
+                        val->series.it++;
+                        val = UR_TOS;
+                        goto do_block;
+                    }
+                    UR_C_DEC;
+                    UR_S_DROPN(3);
+                    val = UR_TOS;
+                    goto control;
 
                 case ROP_RETURN:
@@ -677 +776 @@
                         if( ur_evalLocal(cval) )
                             UR_LF_POP;
-                        break;
                     }
-                    OR_TOC = cval;
-                    goto func_return;
+                    else
+                    {
+                        OR_TOC = cval;
+                        goto func_return;
+                    }
                 }
+                break;
         }
         --cval;     // UR_C_DEC
@@ -687 +789 @@
 
 op_break:
+
+    cval = OR_TOC;
+    while( 1 )
+    {
+        switch( ur_type(cval) )
+        {
+            case UT_UNSET:
+bad_break:
+                ur_throwErr( UR_ERR_SCRIPT, "break used outside of loop" );
+                goto trace_error;
+
+            case UT_OPCODE:
+                switch( ur_opcode(cval) )
+                {
+                    case ROP_EACH_LOOP:
+                        UR_S_DROPN(3);
+                        // Drop through.
+
+                    case ROP_FOREVER:
+                        OR_TOC = cval - 1;
+                        val = UR_TOS;
+                        ur_initType( val, UT_UNSET );
+                        goto control;
+                }
+                break;
+
+            case UT_BLOCK:
+                if( cval->id.flags & FLAG_FUNC_BLOCK )
+                    goto bad_break;
+                break;
+        }
+        --cval;     // UR_C_DEC
+    }
+
 op_throw:
 
@@ -700 +836 @@
 
             case UT_OPCODE:
-                if( ur_opcode(cval) == ROP_FOREVER )
-                {
-                    ur_copyCell( cval, cval[1] );
-                    goto control;
-                }
                 break;
 
@@ -975 +1106 @@
   "  5 'if.else\n"
   "  6 'forever\n"
-  "  7 'break\n"
-  "  8 'return\n"
-  "  9 +\n"
-  "  10 -\n"
-  "  11 *\n"
-  "  12 /\n"
-  "  13 >\n"
-  "  14 <\n"
+  "  7 'each\n"
+  "  8 'each-loop\n"
+  "  9 'break\n"
+  "  10 'return\n"
+  "  11 +\n"
+  "  12 -\n"
+  "  13 *\n"
+  "  14 /\n"
+  "  15 >\n"
+  "  16 <\n"
   "] make-opcodes :rune-ops\n"
   "[\n"
@@ -1005 +1138 @@
   "  probe  [val]\n"
   "  type?  [val]\n"
+  "  eq?    [a b]\n"
+  "  same?  [a b]\n"
   "  zero?  [val]\n"
   "  to-text [val]\n"

trunk/thune/rune/tests/mandel.ru

@@ -28 +28 @@
 
 ;prin zi2 prin ' ' print zr2
-        if zi2 + zr2 > BAILOUT [return nop false]
+        if zi2 + zr2 > BAILOUT [return false]
     ]
     true