Changeset 465 for trunk/thune/parse.c

Timestamp:

08/29/07 21:14:57 (15 months ago)

Author:

krobillard

Message:

parse now throws all exceptions from evaluated parens.

Files:

• trunk/thune/parse.c (modified) (5 diffs)

trunk/thune/parse.c

@@ -25 +25 @@
 
 
-#define _errorThrown    ur_is(ut->tos, UT_ERROR)
+/*
+#define BREAK_EXCEPTION \
+    (ur_is(UR_TOS, UT_WORD) && (ur_atom(UR_TOS) == UR_ATOM_BREAK))
+*/
+
 #define PARSE_EX        ut, UR_EX_SCRIPT
 
@@ -374 +378 @@
 
             case UT_PAREN:
-                ur_eval( ut, rit->series.n, rit->series.it );
-                if( _errorThrown )
-                {
-                    //UR_CALL_OP = OP_THROW;
-                    ut->callOp = OP_THROW;
-
+                if( UR_EVAL_ERROR ==
+                    ur_eval( ut, rit->series.n, rit->series.it ) )
+                {
+                    UR_CALL_OP = OP_THROW;
                     pe->error = PARSE_EX_ERROR;
                     return 0;
@@ -892 +894 @@
 
             case UT_PAREN:
-                ur_eval( ut, rit->series.n, rit->series.it );
-                if( _errorThrown )
-                {
-                    //UR_CALL_OP = OP_THROW;
-                    ut->callOp = OP_THROW;
-
+                if( UR_EVAL_ERROR ==
+                    ur_eval( ut, rit->series.n, rit->series.it ) )
+                {
+                    UR_CALL_OP = OP_THROW;
                     pe->error = PARSE_EX_ERROR;
                     return 0;
@@ -1085 +1085 @@
             rules = (UCell*) _parseStr( ut, &pe, rit, rend, &pe.input.it );
             if( pe.error == PARSE_EX_ERROR )
-                return;
+            {
+                //if( ! BREAK_EXCEPTION )
+                    return;
+            }
 
             UR_S_DROP;
@@ -1129 +1132 @@
             rules = (UCell*) _parseBlock( ut, &pe, rit, rend, &pe.input.it );
             if( pe.error == PARSE_EX_ERROR )
-                return;
+            {
+                //if( ! BREAK_EXCEPTION )
+                    return;
+            }
 
             UR_S_DROP;