The R Project SVN – R – Diff – /branches/R-exp-API/src/main/errors.c

 void jump_to_toplevel()
+{
     RCNTXT *c;
     SEXP s, t;
+    int haveHandler;
     int nback = 0;
     inError = 1;
     if( R_CollectWarnings ) {
 	inError = 1;
+    }
     /*now see if options("error") is set */
     s = GetOption(install("error"), R_NilValue);
-    if( s != R_NilValue ) {
+    haveHandler = ( s != R_NilValue );
+    if (haveHandler) {
 	if( !isLanguage(s) &&  ! isExpression(s) )  /* shouldn't happen */
 	    REprintf("invalid option \"error\"\n");
 	else {
 	    c = R_GlobalContext;
 	    while ( !(c->callflag & CTXT_FUNCTION) && c->callflag )
 		c = c->nextcontext;
 	    inError = 3;
+	    if (isLanguage(s))
-	    eval(s, c->cloenv);
+		eval(s, c->cloenv);
+	    else /* expression */
+            {
+		int i, n = LENGTH(s);
+		for (i = 0 ; i < n ; i++)
+		    eval(VECTOR(s)[i], c->cloenv);
+	    }
 	    inError = 1;
+	}
+    }
-    else if ( !R_Interactive )
-	R_CleanUp(SA_NOSAVE);
     if (R_Inputfile != NULL)
 	fclose(R_Inputfile);
     R_ResetConsole();
     R_FlushConsole();
 	if (c->callflag == CTXT_RESTART) {
 		inError=0;
 		findcontext(CTXT_RESTART, c->cloenv, R_DollarSymbol);
+	}
+    }
+    if ( !R_Interactive && !haveHandler && inError )
+	R_CleanUp(SA_NOSAVE);
     if (R_Sinkfile) R_Outputfile = R_Sinkfile;
     else R_Outputfile = R_Consolefile;
     PROTECT(s = allocList(nback));
     t = s;
     for (c = R_GlobalContext ; c ; c = c->nextcontext)

The R Project SVN R