fixed quotient and modulus for non-integer domains

M2/Macaulay2/m2/reals.m2

@@ -210,20 +210,11 @@ new CC from RawRingElement := (CCC,x) -> ( assert( CCC === CC ); rawToCC x)
 
 CC.InverseMethod = y -> conjugate y / y^2
 
-scan((QQ,RR,CC), F -> (
-	  F // F := (x,y) -> if y == 0 then 0_F else x/y;
-	  F % F := (x,y) -> if y == 0 then x else 0_F;
-	  F // ZZ := (x,y) -> x // y_F;
-	  F % ZZ := (x,y) -> x % y_F;
-	  ))
-
-scan((RR,CC), F -> (
-	  F // QQ := (x,y) -> x // y_F;
-	  F % QQ := (x,y) -> x % y_F;
-	  ))
-
-CC // RR := (x,y) -> x // y_CC;
-CC % RR := (x,y) -> x % y_CC;
+installDivMod = F -> (
+    F // Number := (x, y) -> if y == 0 then 0_F else floor(x / y_F);
+    F %  Number := (x, y) -> if y == 0 then x   else x - y * (x // y);
+    )
+apply({QQ, RR, CC}, installDivMod)
 
 -- functions
 realPart Number := realPart0

M2/Macaulay2/tests/normal/reals.m2

@@ -0,0 +1,13 @@
+scan({QQ, RR, CC}, F -> (
+	assert(13.3_F // 4_RR - 3.0 < 1e-15);
+	assert(13.3_F %  4_RR - 1.3 < 1e-15);
+	assert(13.3_F // 4_QQ - 3.0 < 1e-15);
+	assert(13.3_F %  4_QQ - 1.3 < 1e-15);
+	assert(13.3_F // 4_ZZ - 3.0 < 1e-15);
+	assert(13.3_F %  4_ZZ - 1.3 < 1e-15);
+	))
+
+scan({ZZ, QQ, RR}, F -> (
+	assert((pi*ii) // 3_F < 1e-15);
+	assert((pi*ii) %  3_F == pi*ii);
+	))