Changeset 284 for trunk/thune/rune

Timestamp:

09/25/06 15:40:57 (2 years ago)

Author:

krobillard

Message:

Rune - Can now make contexts.

Location:

trunk/thune/rune

Files:

• rune.c (modified) (6 diffs)
• tests/eval.good (modified) (1 diff)
• tests/eval.t (modified) (1 diff)

trunk/thune/rune/rune.c

@@ -197 +197 @@
         goto push_infix;
 
+extern int ur_getSelector( UThread*, const UCell* sel, UCell* res );
 
 int rune_eval( UThread* ur_thread, UIndex blkN, UIndex si )
@@ -347 +348 @@
             goto invalid_opcode;
 
+        case UT_SELECT:
+            if( ! ur_getSelector( ur_thread, val, UR_TOS ) )
+            {
+                --pc;
+                goto trace_error; //throw_cc
+            }
+            val = UR_TOS;
+            if( ur_is(val, UT_FUNCTION) )
+                goto do_func;
+            break;
+
         case UT_PAREN:
             goto do_block;
 
         case UT_FUNCTION:
+do_func:
             if( ur_argc(val) == 0 )
                 goto call_func;
@@ -499 +512 @@
             goto control;
 
+        case UT_CONTEXT:
+            // Denotes context returned from uc_make().
+            val = OR_TOC;
+            UR_C_DEC;
+            goto control;
+
         case UT_FUNCTION:
             LOOK_AHEAD_FOR_INFIX
@@ -561 +580 @@
         case OP_DO:
             UR_CALL_OP = 0;
+            // uc_make() leaves (ctx blk) on stack.
+            PUSHC_CELL( UR_TOS );
+            UR_S_DROP;
             goto do_block;
 
@@ -963 +985 @@
   "] make-opcodes :rune-ops\n"
   "[\n"
+  "  0 :context\n"
   "  0 :prin\n"
   "  0 :print\n"
@@ -985 +1008 @@
   "  to-text [val]\n"
   "  reduce  [val]\n"
+  "  make    [type spec]\n"
   "  func.loop [sig body]\n"
   "] define-natives\n"
   "[\n"
+  "  context: func [spec] [make context! spec]\n"
   "  prin:  func [val] [cout to-text val]\n"
   "  print: func [val] [cout to-text val cout eol]\n"

trunk/thune/rune/tests/eval.good

@@ -41 +41 @@
 Timing print string.
 time!
+--- Context ---
+1
+2
+Hello
+'^/'

trunk/thune/rune/tests/eval.t

@@ -60 +60 @@
     [type? time-blk [print "Timing print string."]]
 
+tst "--- Context ---"
+[
+    c: context [a: 1 b: 2 c: does [print "Hello"]]
+    probe c/a
+    probe c/b
+    c/c
+]
+
 ] rune