From: Taylor R. Campbell <net/mumble/campbell>
Date: Thu, 14 Feb 2008 08:20:22 +0000 (+0000)
Subject: Iron out two remaining little bugs in the recent flurry of changes
X-Git-Tag: 20090517-FFI~313
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=0687c93a1dfa22a8aed234df660da206a4a92a84;p=mit-scheme.git

Iron out two remaining little bugs in the recent flurry of changes
surrounding errors during compiled invocation setup from primitives.
---

diff --git a/v7/src/microcode/cmpint.c b/v7/src/microcode/cmpint.c
index 7cc80156e..3e06df22e 100644
--- a/v7/src/microcode/cmpint.c
+++ b/v7/src/microcode/cmpint.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: cmpint.c,v 1.118 2008/02/14 06:47:32 cph Exp $
+$Id: cmpint.c,v 1.119 2008/02/14 08:20:22 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -1434,7 +1434,6 @@ setup_compiled_invocation_from_primitive (SCHEME_OBJECT procedure,
     {
       if (code != PRIM_APPLY_INTERRUPT)
 	{
-	  PUSH_REFLECTION (REFLECT_CODE_INTERNAL_APPLY);
 	  prim_apply_error_code = code;
 	  code = PRIM_APPLY_ERROR;
 	}
diff --git a/v7/src/microcode/interp.c b/v7/src/microcode/interp.c
index 247f5f0b8..78da3b1da 100644
--- a/v7/src/microcode/interp.c
+++ b/v7/src/microcode/interp.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: interp.c,v 9.109 2008/02/14 06:47:36 cph Exp $
+$Id: interp.c,v 9.110 2008/02/14 08:20:22 riastradh Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -291,8 +291,7 @@ Interpret (void)
 
     case PRIM_APPLY_ERROR:
       PROCEED_AFTER_PRIMITIVE ();
-      Do_Micro_Error (prim_apply_error_code, true);
-      goto internal_apply;
+      APPLICATION_ERROR (prim_apply_error_code);
 
     case PRIM_DO_EXPRESSION:
       SET_VAL (GET_EXP);