Index: src/tests/.expect/64/math.txt
===================================================================
--- src/tests/.expect/64/math.txt	(revision 5ea26ed2fcd7204d100fb83710fcb611e2948b38)
+++ src/tests/.expect/64/math.txt	(revision 08d14cfeed825db9ddc2478861efd65b988e0b3f)
@@ -2,5 +2,5 @@
 remainder:-1 -1 -1
 remquo:7 0.0999999 7 0.1 7 0.0999999999999999999
-div:7 0.0999999 7 0.1 7 0.0999999999999999999
+div:7, 0.2 7, 0.2 7, 0.2
 fma:-2 -2 -2
 fdim:2 2 2
@@ -55,5 +55,7 @@
 frexp:0.5 3 0.5 3 0.5 3
 ldexp:8 8 8
-modf:2 0.3 2 0.3 2 0.3 nextafter:2 2 2
+modf:2 0.3 2 0.3 2 0.3
+modf:2, 0.3 2, 0.3 2, 0.3
+nextafter:2 2 2
 nexttoward:2 2 2
 scalbn:16 16 16
Index: src/tests/div.c
===================================================================
--- src/tests/div.c	(revision 08d14cfeed825db9ddc2478861efd65b988e0b3f)
+++ src/tests/div.c	(revision 08d14cfeed825db9ddc2478861efd65b988e0b3f)
@@ -0,0 +1,38 @@
+//                               -*- Mode: C -*- 
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// div.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Aug  8 16:28:43 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Aug  8 18:02:44 2017
+// Update Count     : 14
+// 
+
+#include <fstream>
+#include <stdlib>										// div
+
+struct T { int i; };
+T ?/?( T t1, T t2 ) { return t1.i / t2.i; }
+T ?%?( T t1, T t2 ) { return t1.i % t2.i; }
+ofstream * ?|?( ofstream * os, T t ) { return os | t.i; }
+
+int main( void ) {
+	sout | "div" | div( 13, 5 ) | div( 13L, 5L ) | div( 13LL, 5LL ) | endl;
+	short s1 = 13, s2 = 5;
+	sout | "div" | div( s1, s2 ) | endl;
+	T t1 = { 13 }, t2 = { 5 };
+	[t1, t2] = div( t1, t2 );							// polymorphic div
+	sout | "div" | t1 | t2 | endl;
+//	sout | "div" | div( t1, t2 ) | endl;
+} // main
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa div.c" //
+// End: //
Index: src/tests/math.c
===================================================================
--- src/tests/math.c	(revision 5ea26ed2fcd7204d100fb83710fcb611e2948b38)
+++ src/tests/math.c	(revision 08d14cfeed825db9ddc2478861efd65b988e0b3f)
@@ -10,6 +10,6 @@
 // Created On       : Fri Apr 22 14:59:21 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 10:32:04 2017
-// Update Count     : 73
+// Last Modified On : Wed Aug  9 07:20:49 2017
+// Update Count     : 77
 // 
 
@@ -31,10 +31,5 @@
 	l = remquo( 3.6L, 0.5L, &quot );
 	sout | quot | l | endl;
-	f = div( 3.6F, 0.5F, &quot );
-	sout | "div:" | quot | f;
-	d = div( 3.6D, 0.5F, &quot );
-	sout | quot | d;
-	l = div( 3.6L, 0.5L, &quot );
-	sout | quot | l | endl;
+	sout | "div:" | div( 3.6F, 0.5F ) | div( 3.6D, 0.5D ) | div( 3.6L, 0.5L ) | endl;
 	sout | "fma:" | fma( 3.0F, -1.0F, 1.0F ) | fma( 3.0D, -1.0D, 1.0D ) | fma( 3.0L, -1.0L, , 1.0L ) | endl;
 	sout | "fdim:" | fdim( 1.0F, -1.0F ) | fdim( 1.0D, -1.0D ) | fdim( 1.0L, -1.0L ) | endl;
@@ -137,5 +132,6 @@
 	sout | di | d;
 	l = modf( 2.3L, &ldi );
-	sout | ldi | l;
+	sout | ldi | l | endl;
+	sout | "modf:" | modf( 2.3F ) | modf( 2.3D ) | modf( 2.3L ) | endl;
 	sout | "nextafter:" | nextafter( 2.0F, 3.0F ) | nextafter( 2.0D, 3.0D ) | nextafter( 2.0L, 3.0L ) | endl;
 	sout | "nexttoward:" | nexttoward( 2.0F, 3.0F ) | nexttoward( 2.0D, 3.0D ) | nexttoward( 2.0L, 3.0L ) | endl;