X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/60529354d9cf7b479605366b103517af44927e02..40d95de71fca4c3b7b145d5ba73d1420e8854673:/src/final.lisp?ds=sidebyside

diff --git a/src/final.lisp b/src/final.lisp
index 8cd42f8..96e9625 100644
--- a/src/final.lisp
+++ b/src/final.lisp
@@ -110,16 +110,16 @@
 			      ,scanner (make-instance
 					'sod-token-scanner
 					:char-scanner ,char-scanner))
-			(multiple-value-bind (,value ,winp ,consumedp)
-			    (parse ,parser)
-			  (declare (ignore ,consumedp))
-			  (cond (,winp ,value)
-				(t (syntax-error ,scanner ,value)
-				   nil)))))
+			(with-default-error-location (,scanner)
+			  (multiple-value-bind (,value ,winp ,consumedp)
+			      (parse ,parser)
+			    (declare (ignore ,consumedp))
+			    (cond (,winp ,value)
+				  (t (syntax-error ,scanner ,value)
+				     nil))))))
 		 (if ,backtrace (,body)
 		     (count-and-report-errors ()
-		       (with-default-error-location (,scanner)
-			 (,body)))))
+		       (,body))))
 	     (let ((,where (scanner-capture-place ,char-scanner)))
 	       (values ,value
 		       (list ,nerror ,nwarn)