Changeset 246 for trunk/thune/eval.c

Timestamp:

08/05/06 18:39:12 (2 years ago)

Author:

krobillard

Message:

Thune - Data stack overflow now throws an error.

Files:

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

trunk/thune/eval.c

@@ -606 +606 @@
         if( ! val )
             goto throw_cc;
-
         if( ur_is(val, UT_PAREN) )
-        {
-            UR_S_PUSH( *val );
-            goto execute;
-        }
+            goto push_val;
     }
 
@@ -1053 +1049 @@
             break;
 
+        case UT_SELECT:
+            // TODO: select! needs to call functions, block on unset, etc.
+            if( ! ur_getSelector( ur_thread, val, UR_S_GROW ) )
+            {
+                _appendTraceBlk( &UR_TOS->err, blkN, pc - start - 1 );
+                goto throw_cc;
+            }
+            break;
+
+        case UT_SETSELECT:
+            if( ! ur_setSelector( ur_thread, val, UR_TOS ) )
+            {
+                _appendTraceBlk( &UR_TOS->err, blkN, pc - start - 1 );
+                goto throw_cc;
+            }
+            UR_S_DROP;
+            break;
+
+        case UT_PAREN:
+            DO_BLOCK( val );
+            break;
+
         case UT_GETWORD:
             val = ur_wordCell( ur_thread, val );
             if( ! val )
                 goto throw_cc;
-            UR_S_PUSH( *val );
-            break;
-
-        case UT_SELECT:
-            // TODO: select! needs to call functions, block on unset, etc.
-            if( ! ur_getSelector( ur_thread, val, UR_S_GROW ) )
-            {
-                _appendTraceBlk( &UR_TOS->err, blkN, pc - start - 1 );
-                goto throw_cc;
-            }
-            break;
-
-        case UT_SETSELECT:
-            if( ! ur_setSelector( ur_thread, val, UR_TOS ) )
-            {
-                _appendTraceBlk( &UR_TOS->err, blkN, pc - start - 1 );
-                goto throw_cc;
-            }
-            UR_S_DROP;
-            break;
-
-        case UT_PAREN:
-            DO_BLOCK( val );
-            break;
+            // Fall through to push.
 
         default:
+push_val:
+            if( UR_TOS >= ur_thread->eos )
+                goto stack_overflow;
             UR_S_PUSH( *val );
             break;
@@ -1332 +1330 @@
     _appendTraceBlk( &UR_TOS->err, blkN, pc - start );
     goto throw_cc;
+
+stack_overflow:
+
+    ur_throwErr( ur_thread, UR_EX_INTERNAL, "data stack overflow" );
+    goto trace_error;
 
 stack_eaten: