Changeset 510 for trunk/thune/thune.c

Timestamp:

02/10/08 23:53:46 (9 months ago)

Author:

krobillard

Message:

'loop is now an opcode and can act as loop.to for integers.
File port! read now handles optional limit.
console.out now handles binary!.
Can now 'make an int! from first 4 bytes of a binary!
Added ur_initDecimal macro.
Added 'fcalc.
Removed word inc/dec.

Files:

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

trunk/thune/thune.c

@@ -45 +45 @@
             case CC_EVAL:
             case CC_EVAL_RUNNING:
+            case CC_REDUCE:
             case CC_FOREVER:
-            case CC_REDUCE:
                 toc -= CC_LEN_EVAL;
                 break;
 
+            case CC_LOOP:
             case CC_ITER:
             case CC_EACH:
@@ -795 +796 @@
                         goto bad_opcode_type;
                     break;
-
+#if 0
                 case OP_INC_WORD:               // ( -- )
                     if( (pc == end) || (! ur_is(pc, UT_WORD)) )
@@ -841 +842 @@
                     }
                     break;
-
+#endif
                 case OP_VERIFY:     // (val type -- val)
                                     // (v1 v2 t1 t2 -- v1 v2)
@@ -869 +870 @@
                     goto control;
 
+                case OP_LOOP:           // (body n [n2] -- )
+                {
+                    int n0, n1;
+                    int prevInt;
+                    UCell* prev = ur_s_prev(UR_TOS);
+
+                    if( ur_is(prev, UT_INT) )
+                    {
+                        n0 = ur_int(prev);
+                        --prev;
+                        prevInt = 1;
+                    }
+                    else
+                    {
+                        n0 = 0;
+                        prevInt = 0;
+                    }
+
+                    if( ! ur_is(UR_TOS, UT_INT) || ! ur_is(prev, UT_BLOCK) )
+                    {
+                        ur_throwErr( UR_ERR_DATATYPE,
+                                     "loop expected block! int!" );
+                        goto throw_cc;
+                    }
+                    n1 = ur_int(UR_TOS);
+                    UR_S_DROP;
+                    if( prevInt )
+                        UR_S_DROP;
+                    if( n1 > n0 )
+                    {
+                        PUSHC_EVAL( blkN, start, pc );
+                        SET_BLK_PC( UR_TOS->series.n,
+                                    UR_TOS->series.it );
+                        ur_copyCell( ut->toc, *UR_TOS );
+                        UR_C_GROW;
+
+                        UR_TOC->loop.code  = CC_LOOP;
+                        UR_TOC->loop.flags = prevInt;
+                        UR_TOC->loop.n     = n1;
+                        UR_TOC->loop.it    = n0;
+                        UR_C_GROW;
+
+                        if( prevInt )   // Loop body must drop counter.
+                        {
+                            ur_initInt( UR_TOS, n0 );
+                            UR_S_GROW;
+                        }
+                    }
+                    UR_S_DROP;
+                }
+                    break;
+
                 //case OP_END:
                 //    goto finish;
@@ -1070 +1123 @@
             goto control;
 
-        case CC_FOREVER:
-            SET_BLK_PC( UR_TOC->eval.n, UR_TOC->eval.it );
-            UR_C_GROW;
-            goto execute;
-
         case CC_REDUCE:
         {
@@ -1097 +1145 @@
             ur_setSeries(ntos, rblkN, 0);
         }
+            goto control;
+
+        case CC_FOREVER:
+            SET_BLK_PC( UR_TOC->eval.n, UR_TOC->eval.it );
+            UR_C_GROW;
+            goto execute;
+
+        case CC_LOOP:
+            if( ++UR_TOC->loop.it < UR_TOC->loop.n )
+            {
+                UCell* ser = ut->toc - 1;
+                if( UR_TOC->loop.flags )
+                {
+                    UR_S_GROW;      // Loop code must drop TOS.
+                    ur_initInt( UR_TOS, UR_TOC->loop.it );
+                }
+                SET_BLK_PC( ser->series.n, ser->series.it );
+                UR_C_GROW;
+                goto execute;
+            }
+            UR_C_DEC;
             goto control;
 
@@ -1202 +1271 @@
                 break;
 
+            case CC_LOOP:
             case CC_ITER:
             case CC_EACH: