Changeset 184 for trunk/thune/eval.c

Timestamp:

06/12/06 01:58:22 (3 years ago)

Author:

krobillard

Message:

Thune -

Word lookup now uses an ordered binary search.
Renamed ur_setType as ur_initType.
Some error reporting improvements in eval.

Files:

• trunk/thune/eval.c (modified) (28 diffs)

trunk/thune/eval.c

@@ -52 +52 @@
 
 #define PUSHC_NONE \
-    ur_setType(UR_TOC, UT_NONE); \
+    ur_initType(UR_TOC, UT_NONE); \
     UR_C_GROW
 
@@ -126 +126 @@
 
     cell = &blk;
-    ur_setType( cell, UT_BLOCK );
+    ur_initType( cell, UT_BLOCK );
     ur_setSeries( cell, blkN, 0 );
 
@@ -171 +171 @@
 
         blkN = tos->series.n;
-        ur_setType( tos, UT_FUNCTION );
-        // localArgs cleared by ur_setType().
+        ur_initType( tos, UT_FUNCTION );
+        // localArgs cleared by ur_initType().
         tos->func.bodyN     = blkN;
         tos->func.closureN  = 0;
@@ -264 +264 @@
             if( n < 3 )
             {
-                ur_setType( res, UT_DECIMAL );
+                ur_initType( res, UT_DECIMAL );
                 ur_decimal(res) = (double) val->vec3.xyz[ n ];
             }
@@ -348 +348 @@
                     _infuseOpcodes( blkN );
 
-                    ur_setType(tos, UT_BLOCK);
+                    ur_initType(tos, UT_BLOCK);
                     ur_setSeries(tos, blkN, 0);
 
@@ -417 +417 @@
     else if( ur_is(tos, UT_LITWORD) )
     {
-        ur_setType(tos, UT_WORD );
+        ur_type(tos) = UT_WORD;
     }
     // else leave tos unchanged...
@@ -761 +761 @@
 
                     case OP_INCREMENT:
-                        if( ur_is(UR_TOS, UT_INT) )
-                            ur_int(UR_TOS) += 1;
+                        if( ! ur_is(UR_TOS, UT_INT) )
+                            goto bad_opcode_type;
+                        ur_int(UR_TOS) += 1;
                         ++pc;
                         break;
 
                     case OP_DECREMENT:
-                        if( ur_is(UR_TOS, UT_INT) )
-                            ur_int(UR_TOS) -= 1;
+                        if( ! ur_is(UR_TOS, UT_INT) )
+                            goto bad_opcode_type;
+                        ur_int(UR_TOS) -= 1;
                         ++pc;
                         break;
@@ -932 +934 @@
                 else if( ur_is(val, UT_UNSET) )
                 {
-                    _throwUnset( ur_thread, pc - 1 );
+                    --pc;
+                    _throwUnset( ur_thread, pc );
+                    _appendTraceBlk( &UR_TOS->err, blkN, pc - start );
                     goto op_throw_cc;
                 }
@@ -1038 +1042 @@
                 UR_TOS = ntos;
             }
-            ur_setType(ntos, UT_BLOCK);
+            ur_initType(ntos, UT_BLOCK);
             ur_setSeries(ntos, rblkN, 0);
         }
@@ -1166 +1170 @@
             ur_throwErr( ur_thread, UR_EX_SCRIPT,
                          "recurse used outside of function" );
-            goto error;
+            goto trace_error;
 
         default:
@@ -1184 +1188 @@
             ur_throwErr( ur_thread, UR_EX_SCRIPT,
                          "return used outside of function" );
-            _appendTraceBlk( &UR_TOS->err, blkN, pc - start );
-            goto error;
+            goto trace_error;
 
         default:
@@ -1195 +1198 @@
     return UR_EVAL_OK;
 
+bad_opcode_type:
+
+    ur_throwErr( ur_thread, UR_EX_DATATYPE, "invalid type %s! for '%s opcode",
+                 ur_typeName( ur_type(UR_TOS) ),
+                 ur_atomCStr( ur_atom(pc) ) );
+    _appendTraceBlk( &UR_TOS->err, blkN, pc - start );
+    goto op_throw_cc;
+
 stack_eaten:
 
     ur_throwErr( ur_thread, UR_EX_SCRIPT, "data stack eaten" );
-    _appendTraceBlk( &UR_TOS->err, blkN, pc - start );
-    goto error;
+    goto trace_error;
 
 bad_control:
 
     ur_throwErr( ur_thread, UR_EX_INTERNAL, "bad control code" );
+
+trace_error:
+
     _appendTraceBlk( &UR_TOS->err, blkN, pc - start );
 
@@ -1305 +1318 @@
     UR_S_GROW;
     tos = UR_TOS;
-    ur_setType(tos, UT_ERROR);
+    ur_initType(tos, UT_ERROR);
     tos->err.exType     = exceptionType;
     tos->err.messageStr = strN;
+
+    // Init traceBlk to zero before ur_makeBlock() in case GC occurs.
     tos->err.traceBlk   = 0;
-
-    // Init traceBlk to zero before ur_makeBlock() in case GC occurs.
     tos->err.traceBlk   = ur_makeBlock( 8 );
 
@@ -1349 +1362 @@
             break; \
         case MJ_INT_DEC: \
-            ur_setType(res, UT_DECIMAL); \
+            ur_initType(res, UT_DECIMAL); \
             ur_decimal(res) = ((double) ur_int(res)) OP ur_decimal(tos); \
             break; \
@@ -1600 +1613 @@
     UR_S_DROP;
     ur_logic(UR_TOS) = ur_equal( UR_TOS, tos );
-    ur_setType( UR_TOS, UT_LOGIC );
+    ur_initType( UR_TOS, UT_LOGIC );
 }
 
@@ -1613 +1626 @@
 
     same = ur_same( res, tos );
-    ur_setType( res, UT_LOGIC );
+    ur_initType( res, UT_LOGIC );
     ur_logic(res) = same;
 }
@@ -1623 +1636 @@
     UR_S_DROP;
     ur_logic(UR_TOS) = (ur_int(UR_TOS) > ur_int(tos)) ? 1 : 0;
-    ur_setType( UR_TOS, UT_LOGIC );
+    ur_initType( UR_TOS, UT_LOGIC );
 }
 
@@ -1632 +1645 @@
     UR_S_DROP;
     ur_logic(UR_TOS) = (ur_int(UR_TOS) < ur_int(tos)) ? 1 : 0;
-    ur_setType( UR_TOS, UT_LOGIC );
+    ur_initType( UR_TOS, UT_LOGIC );
 }
 
@@ -1646 +1659 @@
     else
         n = 0;
-    ur_setType(tos, UT_LOGIC);
+    ur_initType(tos, UT_LOGIC);
     ur_logic(tos) = n;
 }
@@ -1656 +1669 @@
     int t = ur_type(tos);
     UR_CALL_UNUSED_TH
-    ur_setType(tos, UT_DATATYPE);
+    ur_initType(tos, UT_DATATYPE);
     ur_datatype(tos) = t;
 }
@@ -1666 +1679 @@
     int t = ur_type(tos);
     UR_CALL_UNUSED_TH
-    ur_setType(tos, UT_WORD);
+    ur_initType(tos, UT_WORD);
     tos->word.wordBlk = 0;
     tos->word.valBlk  = GLOBAL_VAL_BLKN;
@@ -1841 +1854 @@
             if( ur_is(val, UT_INT) || ur_is(val, UT_CHAR) )
             {
-                ur_setType(val, UT_DECIMAL);
+                ur_initType(val, UT_DECIMAL);
                 ur_decimal(val) = ur_int(val);
             }
@@ -1874 +1887 @@
             break;
     }
+}
+
+
+/*
+  (block context -- block)
+*/
+UR_CALL( uc_bind )
+{
+    UCell* bc;
+
+    UR_S_DROP;
+    bc = UR_TOS;
+
+    if( ur_is(tos, UT_LITWORD) || ur_is(tos, UT_CONTEXT) )
+    {
+        if( ur_is(bc, UT_BLOCK) )
+        {
+            ur_bind( bc->series.n, tos );
+            return;
+        }
+    }
+
+    ur_throwErr( ur_thread, UR_EX_DATATYPE, "Invalid bind values" );
 }
 
@@ -1971 +2007 @@
                 UCell lctx;
 
-                ur_setType( &lctx, UT_CONTEXT );
+                ur_initType( &lctx, UT_CONTEXT );
                 lctx.ctx.wordBlk = toc->func.sigN;
                 lctx.ctx.valBlk  = ur_thread->localArgBlkN;
@@ -2028 +2064 @@
             UR_S_DROPN(argc);
 
-            ur_setType( UR_TOS, UT_FUNCTION );
-            // localArgs cleared by ur_setType().
+            ur_initType( UR_TOS, UT_FUNCTION );
+            // localArgs cleared by ur_initType().
             UR_TOS->func.bodyN     = bodN;
             UR_TOS->func.closureN  = encN;
@@ -2100 +2136 @@
 
         tos = UR_TOS;
-        ur_setType( tos, UT_FUNCTION );
+        ur_initType( tos, UT_FUNCTION );
         tos->func.localArgs = argc;
         tos->func.localVars = argc + varc;
@@ -2155 +2191 @@
         ur_toStrNatural( tos, ur_binPtr(strN), 0 );
 
-        ur_setType(tos, UT_STRING);
+        ur_initType(tos, UT_STRING);
         ur_setSeries(tos, strN, 0);
     }
@@ -2165 +2201 @@
 
 extern void uc_make( UThread*, UCell* );
-extern void uc_bind( UThread*, UCell* );
 extern void uc_console_out( UThread*, UCell* );
 extern void uc_parse( UThread*, UCell* );