From: Vincent Belaïche <vincent.belaiche@gmail.com>
Date: Wed, 7 Apr 2010 01:33:00 +0000 (-0500)
Subject: (calcFunc-fdiv): Allow `fdiv' to divide fractions.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~576
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=317a26be001283988504d544692930af75a92e53;p=emacs.git

(calcFunc-fdiv): Allow `fdiv' to divide fractions.
---

diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el
index a01f5b8b9fa..d1164bec3c5 100644
--- a/lisp/calc/calc-frac.el
+++ b/lisp/calc/calc-frac.el
@@ -205,16 +205,32 @@
 	    n temp))
     (math-div n d)))
 
-
-
 (defun calcFunc-fdiv (a b)   ; [R I I] [Public]
-  (if (Math-num-integerp a)
-      (if (Math-num-integerp b)
-	  (if (Math-zerop b)
-	      (math-reject-arg a "*Division by zero")
-	    (math-make-frac (math-trunc a) (math-trunc b)))
-	(math-reject-arg b 'integerp))
-    (math-reject-arg a 'integerp)))
+  (cond
+   ((Math-num-integerp a)
+    (cond 
+     ((Math-num-integerp b)
+      (if (Math-zerop b)
+	  (math-reject-arg a "*Division by zero")
+	(math-make-frac (math-trunc a) (math-trunc b))))
+     ((eq (car-safe b) 'frac)
+      (if (Math-zerop (cadr b))
+	  (math-reject-arg a "*Division by zero")
+	(math-make-frac (math-mul (math-trunc a) (caddr b)) (cadr b))))
+     (t (math-reject-arg b 'integerp))))
+   ((eq (car-safe a) 'frac)
+    (cond 
+     ((Math-num-integerp b)
+      (if (Math-zerop b)
+	  (math-reject-arg a "*Division by zero")
+	(math-make-frac (cadr a) (math-mul (caddr a) (math-trunc b)))))
+     ((eq (car-safe b) 'frac)
+      (if (Math-zerop (cadr b))
+	  (math-reject-arg a "*Division by zero")
+	(math-make-frac (math-mul (cadr a) (caddr b)) (math-mul (caddr a) (cadr b)))))
+     (t (math-reject-arg b 'integerp))))
+   (t 
+    (math-reject-arg a 'integerp))))
 
 (provide 'calc-frac)