From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 7 Jan 2006 02:20:57 +0000 (+0000)
Subject: Fix incorrect WNA error message in CONDITION-CONSTRUCTOR.
X-Git-Tag: 20090517-FFI~1137
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=32f2483e5d12fb6e4c0c5b9f551494302d959590;p=mit-scheme.git

Fix incorrect WNA error message in CONDITION-CONSTRUCTOR.
---

diff --git a/v7/src/runtime/error.scm b/v7/src/runtime/error.scm
index 3c3d92f5d..64710df4f 100644
--- a/v7/src/runtime/error.scm
+++ b/v7/src/runtime/error.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: error.scm,v 14.69 2005/04/16 04:16:05 cph Exp $
+$Id: error.scm,v 14.70 2006/01/07 02:20:57 cph Exp $
 
 Copyright 1986,1987,1988,1989,1990,1991 Massachusetts Institute of Technology
 Copyright 1992,1993,1995,2000,2001,2002 Massachusetts Institute of Technology
@@ -210,13 +210,12 @@ USA.
 	      (let ((values (%condition/field-values condition)))
 		(do ((i indexes (cdr i))
 		     (v field-values (cdr v)))
-		    ((or (not (pair? i))
-			 (not (pair? v)))
+		    ((not (and (pair? i) (pair? v)))
 		     (if (or (pair? i) (pair? v))
 			 (error:wrong-number-of-arguments
 			  constructor
-			  (+ (length indexes) 1)
-			  (cons continuation field-values))))
+			  (fix:+ (length indexes) 2)
+			  (cons* continuation restarts field-values))))
 		  (vector-set! values (car i) (car v))))
 	      condition))))
       constructor)))