fix n-ary subtract and divide

Quite simply we had the associativity wrong from subtract and divide
cbaggers · Oct 4, 2022 · 7949aa6 · 7949aa6
1 parent 9e77f30
commit 7949aa6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/vari.cl/nary-operators.lisp b/src/vari.cl/nary-operators.lisp
@@ -28,7 +28,9 @@
                          (t t t &rest t) 0 :pure t)
 
 (v-define-compiler-macro / ((a t) (b t) (c t) &rest (d t))
-  `(/ ,a (/ ,b (/ ,c ,@d))))
+  (if d
+      `(/ (/ (/ ,a ,b) ,c) ,@d)
+      `(/ (/ ,a ,b) ,c)))
 
 (v-def-glsl-template-fun + (a b c &rest c) "(~a £+£ ~a £+£ ~a ~{ £+£ ~a~})"
                          (t t t &rest t) 0 :pure t)
@@ -40,7 +42,9 @@
                          (t t t &rest t) 0 :pure t)
 
 (v-define-compiler-macro - ((a t) (b t) (c t) &rest (d t))
-  `(- ,a (- ,b (- ,c ,@d))))
+  (if d
+      `(- (- (- ,a ,b) ,c) ,@d)
+      `(- (- ,a ,b) ,c)))
 
 (v-def-glsl-template-fun + () "0" () :int :pure t)
 (v-def-glsl-template-fun + (x &rest y) "(~a~{ + ~a~})" (v-number &rest v-number) nil :pure t)