Changeset 183 for trunk/thune/eval.c

Timestamp:

06/11/06 05:58:53 (3 years ago)

Author:

krobillard

Message:

Thune - An error is now thrown when an unset word is accessed.

Files:

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

trunk/thune/eval.c

@@ -488 +488 @@
 
 
-static void _throwUnbound( UThread* ur_thread, UCell* wcell )
+#define _throwUnset(th,cell)    _throwUnsetF(th,cell,"unset")
+#define _throwUnbound(th,cell)  _throwUnsetF(th,cell,"unbound")
+
+static void _throwUnsetF( UThread* ur_thread, UCell* wcell,
+                          const char* umsg )
 {
     UString* str;
@@ -496 +500 @@
     ur_termCStr( str );
     ur_throwErr( ur_thread, UR_EX_SCRIPT,
-                 "word '%s is unbound", str->ptr.c );
+                 "word '%s is %s", str->ptr.c, umsg );
 }
 
@@ -795 +799 @@
                     //case OP_END:
                     //    goto finish;
+
+                    default:
+                        _throwUnsetF( ur_thread, pc, "an invalid opcode" );
+                        goto op_throw_cc;
                 }
                 break;
@@ -803 +811 @@
                 {
                     _throwUnbound( ur_thread, pc );
-                    UR_CALL_OP = 0;
-                    goto op_throw;
+                    goto op_throw_cc;
                 }
 
                 ur_wordCell( pc, blk, val );
                 ++pc;
+
 do_func:
                 if( ur_is(val, UT_FUNCTION) )
@@ -922 +930 @@
                     goto call_return;
                 }
+                else if( ur_is(val, UT_UNSET) )
+                {
+                    _throwUnset( ur_thread, pc - 1 );
+                    goto op_throw_cc;
+                }
                 else
                 {
@@ -939 +952 @@
                 assert( pc->word.index > -1 );
                 ur_wordCell( pc, blk, val );
+                if( ur_is(val, UT_UNSET) )
+                {
+                    _throwUnset( ur_thread, pc );
+                    goto op_throw_cc;
+                }
                 ++pc;
                 UR_S_PUSH( *val );
@@ -946 +964 @@
                 if( ! ur_resolveSelector( ur_thread, pc++, UR_S_GROW ) )
                 {
-                    UR_CALL_OP = 0;
-                    goto op_throw;
+                    goto op_throw_cc;
                 }
                 break;
@@ -1050 +1067 @@
     }
 
+op_throw_cc:
+
+    UR_CALL_OP = 0;
+    
 op_throw:
 
@@ -1771 +1792 @@
             blk = ur_blockPtr( ctx->ctx.valBlk );
             ur_copyCell(ctx, blk->ptr.cells[ wrdN ]);
+            /*
+            if( ur_is(ctx, UT_UNSET) )
+                _throwUnset( ur_thread, ctx );
+            */
             return;
         }