X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/e624583049d699c769e6c1cc31501d8a92292682..167524b5890cdbf4a832b1766a328f6d8a1f8f04:/src/method-aggregate.lisp

diff --git a/src/method-aggregate.lisp b/src/method-aggregate.lisp
index 9446820..ec0a119 100644
--- a/src/method-aggregate.lisp
+++ b/src/method-aggregate.lisp
@@ -379,7 +379,7 @@
   :methods (lambda (invoke)
 	     (funcall invoke val)
 	     (emit-inst codegen (make-if-inst (format nil "~A > ~A" acc val)
-					      (make-set-inst acc val) nil))))
+					      (make-set-inst acc val)))))
 
 (define-aggregating-method-combination :max ((acc val) :codegen codegen)
   :first-method (lambda (invoke)
@@ -388,34 +388,28 @@
   :methods (lambda (invoke)
 	     (funcall invoke val)
 	     (emit-inst codegen (make-if-inst (format nil "~A < ~A" acc val)
-					      (make-set-inst acc val) nil))))
+					      (make-set-inst acc val)))))
 
-(define-aggregating-method-combination :and ((ret val) :codegen codegen)
-  :return-type int
+(define-aggregating-method-combination :and ((ret) :codegen codegen)
   :around (lambda (body)
 	    (codegen-push codegen)
-	    (deliver-expr codegen ret 0)
 	    (funcall body)
-	    (deliver-expr codegen ret 1)
 	    (emit-inst codegen
 		       (make-do-while-inst (codegen-pop-block codegen) 0)))
   :methods (lambda (invoke)
-	     (funcall invoke val)
-	     (emit-inst codegen (make-if-inst (format nil "!~A" val)
-					      (make-break-inst) nil))))
+	     (funcall invoke ret)
+	     (emit-inst codegen (make-if-inst (format nil "!~A" ret)
+					      (make-break-inst)))))
 
-(define-aggregating-method-combination :or ((ret val) :codegen codegen)
-  :return-type int
+(define-aggregating-method-combination :or ((ret) :codegen codegen)
   :around (lambda (body)
 	    (codegen-push codegen)
-	    (deliver-expr codegen ret 1)
 	    (funcall body)
-	    (deliver-expr codegen ret 0)
 	    (emit-inst codegen
 		       (make-do-while-inst (codegen-pop-block codegen) 0)))
   :methods (lambda (invoke)
-	     (funcall invoke val)
-	     (emit-inst codegen (make-if-inst val (make-break-inst) nil))))
+	     (funcall invoke ret)
+	     (emit-inst codegen (make-if-inst ret (make-break-inst)))))
 
 ;;;--------------------------------------------------------------------------
 ;;; A customizable aggregating method combination.