Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40)
+++ src/driver/cfa.cc	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr  6 14:04:22 2016
-// Update Count     : 132
+// Last Modified On : Wed Apr 20 18:31:28 2016
+// Update Count     : 133
 //
 
@@ -310,4 +310,6 @@
 			nargs += 1;
 		} // if
+		args[nargs] = "-fgnu89-inline"; 
+		nargs += 1;
 		args[nargs] = ( *new string( string("-B") + Bprefix + "/" ) ).c_str();
 		nargs += 1;
Index: src/examples/swap.c
===================================================================
--- src/examples/swap.c	(revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40)
+++ src/examples/swap.c	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 16:15:11 2016
-// Update Count     : 65
+// Last Modified On : Thu Apr 21 08:10:41 2016
+// Update Count     : 69
 //
 
@@ -24,68 +24,68 @@
 
 	signed int i1 = -1, i2 = -2;
-	sout | "signed int\t\t" | i1 | ' ' | i2 | "\t\t\tswap ";
+	sout | "signed int\t\t" | i1 | i2 | "\t\t\tswap ";
 	swap( &i1, &i2 );
-	sout | '\t' | i1 | ' ' | i2 | endl;
+	sout | '\t' | i1 | i2 | endl;
 
 	unsigned int ui1 = 1, ui2 = 2;
-	sout | "unsigned int\t\t" | ui1 | ' ' | ui2 | "\t\t\tswap ";
+	sout | "unsigned int\t\t" | ui1 | ui2 | "\t\t\tswap ";
 	swap( &ui1, &ui2 );
-	sout | '\t' | ui1 | ' ' | ui2 | endl;
+	sout | '\t' | ui1 | ui2 | endl;
 
 	signed long int li1 = -1, li2 = -2;
-	sout | "signed long int\t\t" | li1 | ' ' | li2 | "\t\t\tswap ";
+	sout | "signed long int\t\t" | li1 | li2 | "\t\t\tswap ";
 	swap( &li1, &li2 );
-	sout | '\t' | li1 | ' ' | li2 | endl;
+	sout | '\t' | li1 | li2 | endl;
 
 	unsigned long int uli1 = 1, uli2 = 2;
-	sout | "unsigned long int\t" | uli1 | ' ' | uli2 | "\t\t\tswap ";
+	sout | "unsigned long int\t" | uli1 | uli2 | "\t\t\tswap ";
 	swap( &uli1, &uli2 );
-	sout | '\t' | uli1 | ' ' | uli2 | endl;
+	sout | '\t' | uli1 | uli2 | endl;
 
 	signed long long int lli1 = -1, lli2 = -2;
-	sout | "signed long long int\t" | lli1 | ' ' | lli2 | "\t\t\tswap ";
+	sout | "signed long long int\t" | lli1 | lli2 | "\t\t\tswap ";
 	swap( &lli1, &lli2 );
-	sout | '\t' | lli1 | ' ' | lli2 | endl;
+	sout | '\t' | lli1 | lli2 | endl;
 
 	unsigned long long int ulli1 = 1, ulli2 = 2;
-	sout | "unsigned long long int\t" | ulli1 | ' ' | ulli2 | "\t\t\tswap ";
+	sout | "unsigned long long int\t" | ulli1 | ulli2 | "\t\t\tswap ";
 	swap( &ulli1, &ulli2 );
-	sout | '\t' | ulli1 | ' ' | ulli2 | endl;
+	sout | '\t' | ulli1 | ulli2 | endl;
 
 	float f1 = 1.5, f2 = 2.5;
-	sout | "float\t\t\t" | f1 | ' ' | f2 | "\t\tswap ";
+	sout | "float\t\t\t" | f1 | f2 | "\t\t\tswap ";
 	swap( &f1, &f2 );
-	sout | '\t' | f1 | ' ' | f2 | endl;
+	sout | '\t' | f1 | f2 | endl;
 
 	double d1 = 1.5, d2 = 2.5;
-	sout | "double\t\t\t" | d1 | ' ' | d2 | "\t\tswap ";
+	sout | "double\t\t\t" | d1 | d2 | "\t\t\tswap ";
 	swap( &d1, &d2 );
-	sout | '\t' | d1 | ' ' | d2 | endl;
+	sout | '\t' | d1 | d2 | endl;
 
 	long double ld1 = 1.5, ld2 = 2.5;
-	sout | "long double\t\t" | ld1 | ' ' | ld2 | "\t\tswap ";
+	sout | "long double\t\t" | ld1 | ld2 | "\t\t\tswap ";
 	swap( &ld1, &ld2 );
-	sout | '\t' | ld1 | ' ' | ld2 | endl;
+	sout | '\t' | ld1 | ld2 | endl;
 
 	float _Complex fc1 = 1.5f+1.5if, fc2 = 2.5f+2.5if;
-	sout | "float _Complex\t\t" | fc1 | ' ' | fc2 | "\tswap ";
+	sout | "float _Complex\t\t" | fc1 | fc2 | "\tswap ";
 	swap( &fc1, &fc2 );
-	sout | '\t' | fc1 | ' ' | fc2 | endl;
+	sout | '\t' | fc1 | fc2 | endl;
 
 	double _Complex dc1 = 1.5d+1.5id, dc2 = 2.5d+2.5id;
-	sout | "double _Complex\t\t" | dc1 | ' ' | dc2 | "\tswap ";
+	sout | "double _Complex\t\t" | dc1 | dc2 | "\tswap ";
 	swap( &dc1, &dc2 );
-	sout | '\t' | dc1 | ' ' | dc2 | endl;
+	sout | '\t' | dc1 | dc2 | endl;
 
 	long double _Complex ldc1 = 1.5d+1.5il, ldc2 = 2.5d+2.5il;
-	sout | "long double _Complex\t" | ldc1 | ' ' | ldc2 | "\tswap ";
+	sout | "long double _Complex\t" | ldc1 | ldc2 | "\tswap ";
 	swap( &ldc1, &ldc2 );
-	sout | '\t' | ldc1 | ' ' | ldc2 | endl;
+	sout | '\t' | ldc1 | ldc2 | endl;
 
 	struct S { int i, j; } s1 = { 1, 2 }, s2 = { 2, 1 };
-	ofstream * ?|?( ofstream * os, S s ) { return os | s.i | ' ' | s.j; }
-	sout | "struct S\t\t" | s1 | "  " | s2 | "\t\tswap ";
+	ofstream * ?|?( ofstream * os, S s ) { return os | s.i | s.j; }
+	sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap ";
 	swap( &s1, &s2 );
-	sout | '\t' | s1 | "  " | s2 | endl;
+	sout | '\t' | s1 | "," | s2 | endl;
 } // main
 
Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40)
+++ src/libcfa/Makefile.am	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Wed Apr  6 21:10:44 2016
-## Update Count     : 123
+## Last Modified On : Tue Apr 19 22:30:17 2016
+## Update Count     : 124
 ###############################################################################
 
@@ -60,5 +60,5 @@
 	${CC} ${CFLAGS} -c -o $@ $<
 
-libs = limits stdlib iostream fstream iterator rational
+libs = limits stdlib math iostream fstream iterator rational
 libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
 
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40)
+++ src/libcfa/Makefile.in	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -83,6 +83,7 @@
 libcfa_a_AR = $(AR) $(ARFLAGS)
 libcfa_a_LIBADD =
-am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) iostream.$(OBJEXT) \
-	fstream.$(OBJEXT) iterator.$(OBJEXT) rational.$(OBJEXT)
+am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) math.$(OBJEXT) \
+	iostream.$(OBJEXT) fstream.$(OBJEXT) iterator.$(OBJEXT) \
+	rational.$(OBJEXT)
 am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
@@ -213,5 +214,5 @@
 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} \
 	${addprefix ${libdir}/,${lib_LIBRARIES}} ${includedir}/*
-libs = limits stdlib iostream fstream iterator rational
+libs = limits stdlib math iostream fstream iterator rational
 libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
 cheaders = # expat
@@ -298,4 +299,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa-prelude.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/limits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/math.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
Index: src/libcfa/math
===================================================================
--- src/libcfa/math	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
+++ src/libcfa/math	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -0,0 +1,301 @@
+// 
+// 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.
+//
+// math -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Apr 18 23:37:04 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Apr 21 07:56:48 2016
+// Update Count     : 38
+// 
+
+float cos( float );
+extern "C" { double cos( double ); }
+long double cos( long double );
+float _Complex cos( float _Complex );
+double _Complex cos( double _Complex );
+long double _Complex cos( long double _Complex );
+
+float cosh( float );
+extern "C" { double cosh( double ); }
+long double cosh( long double );
+float _Complex cosh( float _Complex );
+double _Complex cosh( double _Complex );
+long double _Complex cosh( long double _Complex );
+
+float acos( float );
+extern "C" { double acos( double ); }
+long double acos( long double );
+float _Complex acos( float _Complex );
+double _Complex acos( double _Complex );
+long double _Complex acos( long double _Complex );
+
+float acosh( float );
+extern "C" { double acosh( double ); }
+long double acosh( long double );
+float _Complex acosh( float _Complex );
+double _Complex acosh( double _Complex );
+long double _Complex acosh( long double _Complex );
+
+float sin( float );
+extern "C" { double sin( double ); }
+long double sin( long double );
+float _Complex sin( float _Complex );
+double _Complex sin( double _Complex );
+long double _Complex sin( long double _Complex );
+
+float sinh( float );
+extern "C" { double sinh( double ); }
+long double sinh( long double );
+float _Complex sinh( float _Complex );
+double _Complex sinh( double _Complex );
+long double _Complex sinh( long double _Complex );
+
+float asin( float );
+extern "C" { double asin( double ); }
+long double asin( long double );
+float _Complex asin( float _Complex );
+double _Complex asin( double _Complex );
+long double _Complex asin( long double _Complex );
+
+float asinh( float );
+extern "C" { double asinh( double ); }
+long double asinh( long double );
+float _Complex asinh( float _Complex );
+double _Complex asinh( double _Complex );
+long double _Complex asinh( long double _Complex );
+
+float tan( float );
+extern "C" { double tan( double ); }
+long double tan( long double );
+float _Complex tan( float _Complex );
+double _Complex tan( double _Complex );
+long double _Complex tan( long double _Complex );
+
+float tanh( float );
+extern "C" { double tanh( double ); }
+long double tanh( long double );
+float _Complex tanh( float _Complex );
+double _Complex tanh( double _Complex );
+long double _Complex tanh( long double _Complex );
+
+float atan( float );
+extern "C" { double atan( double ); }
+long double atan( long double );
+float _Complex atan( float _Complex );
+double _Complex atan( double _Complex );
+long double _Complex atan( long double _Complex );
+
+float _Complex atan( float, float );
+double atan( double, double );
+long double atan( long double, long double );
+
+float atanh( float );
+extern "C" { double atanh( double ); }
+long double atanh( long double );
+float _Complex atanh( float _Complex );
+double _Complex atanh( double _Complex );
+long double _Complex atanh( long double _Complex );
+
+float exp( float );
+extern "C" { double exp( double ); }
+long double exp( long double );
+float _Complex exp( float _Complex );
+double _Complex exp( double _Complex );
+long double _Complex exp( long double _Complex );
+
+float log( float );
+extern "C" { double log( double ); }
+long double log( long double );
+float _Complex log( float _Complex );
+double _Complex log( double _Complex );
+long double _Complex log( long double _Complex );
+
+float pow( float, float );
+extern "C" { double pow( double, double ); }
+long double pow( long double, long double );
+float _Complex pow( float _Complex, float _Complex );
+double _Complex pow( double _Complex, double _Complex );
+long double _Complex pow( long double _Complex, long double _Complex );
+
+float sqrt( float );
+extern "C" { double sqrt( double ); }
+long double sqrt( long double );
+float _Complex sqrt( float _Complex );
+double _Complex sqrt( double _Complex );
+long double _Complex sqrt( long double _Complex );
+
+float fabs( float );
+extern "C" { double fabs( double ); }
+long double fabs( long double );
+float cabs( float _Complex );
+extern "C" { double cabs( double _Complex ); }
+long double cabs( long double _Complex );
+
+float floor( float );
+extern "C" { double floor( double ); }
+long double floor( long double );
+
+float ceil( float );
+extern "C" { double ceil( double ); }
+long double ceil( long double );
+
+//---------------------------------------
+
+float cbrt( float );
+extern "C" { double cbrt( double ); }
+long double cbrt( long double );
+
+float copysign( float, float );
+extern "C" { double copysign( double, double ); }
+long double copysign( long double, long double );
+
+float erf( float );
+extern "C" { double erf( double ); }
+long double erf( long double );
+
+float erfc( float );
+extern "C" { double erfc( double ); }
+long double erfc( long double );
+
+float exp2( float );
+extern "C" { double exp2( double ); }
+long double exp2( long double );
+
+float expm1( float );
+extern "C" { double expm1( double ); }
+long double expm1( long double );
+
+float fdim( float, float );
+extern "C" { double fdim( double, double ); }
+long double fdim( long double, long double );
+
+float fma( float, float, float );
+extern "C" { double fma( double, double, double ); }
+long double fma( long double, long double, long double );
+
+float ?%?( float, float );
+float fmod( float, float );
+double ?%?( double, double );
+extern "C" { double fmod( double, double ); }
+long double ?%?( long double, long double );
+long double fmod( long double, long double );
+
+[ int, float ] div( float x );
+float frexp( float, int * );
+[ int, double ] div( double x );
+extern "C" { double frexp( double, int * ); }
+[ int, long double ] div( long double x );
+long double frexp( long double, int * );
+
+float hypot( float, float );
+extern "C" { double hypot( double, double ); }
+long double hypot( long double, long double );
+
+int ilogb( float );
+extern "C" { int ilogb( double ); }
+int ilogb( long double );
+
+float ldexp( float, int );
+extern "C" { double ldexp( double, int ); }
+long double ldexp( long double, int );
+
+float lgamma( float );
+extern "C" { double lgamma( double ); }
+long double lgamma( long double );
+
+float rint( float x );
+long double rint( long double x );
+long int rint( float x );
+long int rint( double x );
+long int rint( long double x );
+long long int rint( float x );
+long long int rint( double x );
+long long int rint( long double x );
+
+long int lrint( float );
+extern "C" { long int lrint( double ); }
+long int lrint( long double );
+long long int llrint( float );
+extern "C" { long long int llrint( double ); }
+long long int llrint( long double );
+
+float round( float x );
+long double round( long double x );
+long int round( float x );
+long int round( double x );
+long int round( long double x );
+long long int round( float x );
+long long int round( double x );
+long long int round( long double x );
+
+long int lround( float );
+extern "C" { long int lround( double ); }
+long int lround( long double );
+long long int llround( float );
+extern "C" { long long int llround( double ); }
+long long int llround( long double );
+
+float log10( float );
+extern "C" { double log10( double ); }
+long double log10( long double );
+
+float log1p( float );
+extern "C" { double log1p( double ); }
+long double log1p( long double );
+
+float log2( float );
+extern "C" { double log2( double ); }
+long double log2( long double );
+
+float logb( float );
+extern "C" { double logb( double ); }
+long double logb( long double );
+
+float nearbyint( float );
+extern "C" { double nearbyint( double ); }
+long double nearbyint( long double );
+
+float nextafter( float, float );
+extern "C" { double nextafter( double, double ); }
+long double nextafter( long double, long double );
+
+float nexttoward( float, long double );
+extern "C" { double nexttoward( double, long double ); }
+long double nexttoward( long double, long double );
+
+float remainder( float, float );
+extern "C" { double remainder( double, double ); }
+long double remainder( long double, long double );
+
+[ int, float ] remquo( float x, float y );
+float remquo( float, float, int * );
+[ int, double ] remquo( double x, double y );
+extern "C" { double remquo( double, double, int * ); }
+[ int, long double ] remquo( long double x, long double y );
+long double remquo( long double, long double, int * );
+
+float scalbn( float, int );
+extern "C" { double scalbn( double, int ); }
+long double scalbn( long double, int );
+
+float scalbln( float, long int );
+extern "C" { double scalbln( double, long int ); }
+long double scalbln( long double, long int );
+
+float tgamma( float );
+extern "C" { double tgamma( double ); }
+long double tgamma( long double );
+
+float trunc( float );
+extern "C" { double trunc( double ); }
+long double trunc( long double );
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/math.c
===================================================================
--- src/libcfa/math.c	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
+++ src/libcfa/math.c	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -0,0 +1,263 @@
+//                               -*- 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.
+// 
+// math.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Apr 19 22:23:08 2016
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Apr 21 07:56:49 2016
+// Update Count     : 51
+// 
+
+#include "math"
+
+//---------------------------------------
+
+extern "C" {
+#include <math.h>
+#include <complex.h>
+} // extern "C"
+
+float cos( float x ) { return cosf( x ); }
+long double cos( long double x ) { return cosl( x ); }
+float _Complex cos( float _Complex x ) { return ccosf( x ); }
+double _Complex cos( double _Complex x ) { return ccos( x ); }
+long double _Complex cos( long double _Complex x ) { return ccosl( x ); }
+
+float cosh( float x ) { return coshf( x ); }
+long double cosh( long double x ) { return coshl( x ); }
+float _Complex cosh( float _Complex x ) { return ccoshf( x ); }
+double _Complex cosh( double _Complex x ) { return ccosh( x ); }
+long double _Complex cosh( long double _Complex x ) { return ccoshl( x ); }
+
+float acos( float x ) { return acosf( x ); }
+long double acos( long double x ) { return acosl( x ); }
+float _Complex acos( float _Complex x ) { return cacosf( x ); }
+double _Complex acos( double _Complex x ) { return cacos( x ); }
+long double _Complex acos( long double _Complex x ) { return cacosl( x ); }
+
+float acosh( float x ) { return acoshf( x ); }
+long double acosh( long double x ) { return acoshl( x ); }
+float _Complex acosh( float _Complex x ) { return cacoshf( x ); }
+double _Complex acosh( double _Complex x ) { return cacosh( x ); }
+long double _Complex acosh( long double _Complex x ) { return cacoshl( x ); }
+
+float sin( float x ) { return sinf( x ); }
+long double sin( long double x ) { return sinl( x ); }
+float _Complex sin( float _Complex x ) { return csinf( x ); }
+double _Complex sin( double _Complex x ) { return csin( x ); }
+long double _Complex sin( long double _Complex x ) { return csinl( x ); }
+
+float sinh( float x ) { return sinhf( x ); }
+long double sinh( long double x ) { return sinhl( x ); }
+float _Complex sinh( float _Complex x ) { return csinhf( x ); }
+double _Complex sinh( double _Complex x ) { return csinh( x ); }
+long double _Complex sinh( long double _Complex x ) { return csinhl( x ); }
+
+float asin( float x ) { return asinf( x ); }
+long double asin( long double x ) { return asinl( x ); }
+float _Complex asin( float _Complex x ) { return casinf( x ); }
+double _Complex asin( double _Complex x ) { return casin( x ); }
+long double _Complex asin( long double _Complex x ) { return casinl( x ); }
+
+float asinh( float x ) { return asinhf( x ); }
+long double asinh( long double x ) { return asinhl( x ); }
+float _Complex asinh( float _Complex x ) { return casinhf( x ); }
+double _Complex asinh( double _Complex x ) { return casinh( x ); }
+long double _Complex asinh( long double _Complex x ) { return casinhl( x ); }
+
+float tan( float x ) { return tanf( x ); }
+long double tan( long double x ) { return tanl( x ); }
+float _Complex tan( float _Complex x ) { return ctanf( x ); }
+double _Complex tan( double _Complex x ) { return ctan( x ); }
+long double _Complex tan( long double _Complex x ) { return ctanl( x ); }
+
+float tanh( float x ) { return tanhf( x ); }
+long double tanh( long double x ) { return tanhl( x ); }
+float _Complex tanh( float _Complex x ) { return ctanhf( x ); }
+double _Complex tanh( double _Complex x ) { return ctanh( x ); }
+long double _Complex tanh( long double _Complex x ) { return ctanhl( x ); }
+
+float atan( float x ) { return atanf( x ); }
+long double atan( long double x ) { return atanl( x ); }
+float _Complex atan( float _Complex x ) { return catanf( x ); }
+double _Complex atan( double _Complex x ) { return catan( x ); }
+long double _Complex atan( long double _Complex x ) { return catanl( x ); }
+
+float atan( float x, float y ) { return atan2f( x, y ); }
+double atan( double x, double y ) { return atan2( x, y ); }
+long double atan( long double x, long double y ) { return atan2l( x, y ); }
+
+float atanh( float x ) { return atanhf( x ); }
+long double atanh( long double x ) { return atanhl( x ); }
+float _Complex atanh( float _Complex x ) { return catanhf( x ); }
+double _Complex atanh( double _Complex x ) { return catanh( x ); }
+long double _Complex atanh( long double _Complex x ) { return catanhl( x ); }
+
+float exp( float x ) { return expf( x ); }
+long double exp( long double x ) { return expl( x ); }
+float _Complex exp( float _Complex x ) { return cexpf( x ); }
+double _Complex exp( double _Complex x ) { return cexp( x ); }
+long double _Complex exp( long double _Complex x ) { return cexpl( x ); }
+
+float log( float x ) { return logf( x ); }
+long double log( long double x ) { return logl( x ); }
+float _Complex log( float _Complex x ) { return clogf( x ); }
+double _Complex log( double _Complex x ) { return clog( x ); }
+long double _Complex log( long double _Complex x ) { return clogl( x ); }
+
+float pow( float x, float y ) { return powf( x, y ); }
+long double pow( long double x, long double y ) { return powl( x, y ); }
+float _Complex pow( float _Complex x, float _Complex y ) { return cpowf( x, y ); }
+double _Complex pow( double _Complex x, double _Complex y ) { return cpow( x, y ); }
+long double _Complex pow( long double _Complex x, long double _Complex y ) { return cpowl( x, y ); }
+
+float sqrt( float x ) { return sqrtf( x ); }
+long double sqrt( long double x ) { return sqrtl( x ); }
+float _Complex sqrt( float _Complex x ) { return csqrtf( x ); }
+double _Complex sqrt( double _Complex x ) { return csqrt( x ); }
+long double _Complex sqrt( long double _Complex x ) { return csqrtl( x ); }
+
+float fabs( float x ) { return fabsf( x ); }
+long double fabs( long double x ) { return fabsl( x ); }
+float cabs( float _Complex x ) { return cabsf( x ); }
+long double cabs( long double _Complex x ) { return cabsl( x ); }
+
+float floor( float x ) { return floorf( x ); }
+long double floor( long double x ) { return floorl( x ); }
+
+float ceil( float x ) { return ceilf( x ); }
+long double ceil( long double x ) { return ceill( x ); }
+
+//---------------------------------------
+
+float cbrt( float x ) { return cbrtf( x ); }
+long double cbrt( long double x ) { return cbrtl( x ); }
+
+float copysign( float x, float y ) { return copysignf( x, y ); }
+long double copysign( long double x, long double y ) { return copysignl( x, y ); }
+
+float erf( float x ) { return erff( x ); }
+long double erf( long double x ) { return erfl( x ); }
+
+float erfc( float x ) { return erfcf( x ); }
+long double erfc( long double x ) { return erfcl( x ); }
+
+float exp2( float x ) { return exp2f( x ); }
+long double exp2( long double x ) { return exp2l( x ); }
+
+float expm1( float x ) { return expm1f( x ); }
+long double expm1( long double x ) { return expm1l( x ); }
+
+float fdim( float x, float y ) { return fdimf( x, y ); }
+long double fdim( long double x, long double y ) { return fdiml( x, y ); }
+
+float fma( float x, float y, float z ) { return fmaf( x, y, z ); }
+long double fma( long double x, long double y, long double z ) { return fmal( x, y, z ); }
+
+float ?%?( float x, float y ) { return fmodf( x, y ); }
+float fmod( float x, float y ) { return fmodf( x, y ); }
+double ?%?( double x, double y ) { return fmod( x, y ); }
+long double ?%?( long double x, long double y ) { return fmodl( x, y ); }
+long double fmod( long double x, long double y ) { return fmodl( x, y ); }
+
+//[ int, float ] div( float x ) { int i; x = frexpf( x, &i ); return [ i, x ]; }
+float frexp( float x, int *ip ) { return frexpf( x, ip ); }
+//[ int, double ] div( double x ) { int i; x = frexp( x, &i ); return [ i, x ]; }
+//[ int, long double ] div( long double x ) { int i; x = frexpl( x, &i ); return [ i, x ]; }
+long double frexp( long double x, int *ip ) { return frexpl( x, ip ); }
+
+float hypot( float x, float y ) { return hypotf( x, y ); }
+long double hypot( long double x, long double y ) { return hypotl( x, y ); }
+
+int ilogb( float x ) { return ilogbf( x ); }
+int ilogb( long double x ) { return ilogbl( x ); }
+
+float ldexp( float x, int exp2 ) { return ldexpf( x, exp2 ); }
+long double ldexp( long double x, int exp2 ) { return ldexpl( x, exp2 ); }
+
+float lgamma( float x ) { return lgammaf( x ); }
+long double lgamma( long double x ) { return lgammal( x ); }
+
+float rint( float x ) { return rintf( x ); }
+long double rint( long double x ) { return rintl( x ); }
+long int rint( float x ) { return lrintf( x ); }
+long int rint( double x ) { return lrint( x ); }
+long int rint( long double x ) { return lrintl( x ); }
+long long int rint( float x ) { return llrintf( x ); }
+long long int rint( double x ) { return llrint( x ); }
+long long int rint( long double x ) { return llrintl( x ); }
+
+long int lrint( float x ) { return lrintf( x ); }
+long int lrint( long double x ) { return lrintl( x ); }
+long long int llrint( float x ) { return llrintf( x ); }
+long long int llrint( long double x ) { return llrintl( x ); }
+
+float round( float x ) { return roundf( x ); }
+long double round( long double x ) { return roundl( x ); }
+long int round( float x ) { return lroundf( x ); }
+long int round( double x ) { return lround( x ); }
+long int round( long double x ) { return lroundl( x ); }
+long long int round( float x ) { return llroundf( x ); }
+long long int round( double x ) { return llround( x ); }
+long long int round( long double x ) { return llroundl( x ); }
+
+long int lround( float x ) { return lroundf( x ); }
+long int lround( long double x ) { return lroundl( x ); }
+long long int llround( float x ) { return llroundf( x ); }
+long long int llround( long double x ) { return llroundl( x ); }
+
+float log10( float x ) { return log10f( x ); }
+long double log10( long double x ) { return log10l( x ); }
+
+float log1p( float x ) { return log1pf( x ); }
+long double log1p( long double x ) { return log1pl( x ); }
+
+float log2( float x ) { return log2f( x ); }
+long double log2( long double x ) { return log2l( x ); }
+
+float logb( float x ) { return logbf( x ); }
+long double logb( long double x ) { return logbl( x ); }
+
+float nearbyint( float x ) { return nearbyintf( x ); }
+long double nearbyint( long double x ) { return nearbyintl( x ); }
+
+float nextafter( float x, float y ) { return nextafterf( x, y ); }
+long double nextafter( long double x, long double y ) { return nextafterl( x, y ); }
+
+float nexttoward( float x, long double y ) { return nexttowardf( x, y ); }
+long double nexttoward( long double x, long double y ) { return nexttowardl( x, y ); }
+
+float remainder( float x, float y ) { return remainderf( x, y ); }
+long double remainder( long double x, long double y ) { return remainderl( x, y ); }
+
+//[ int, float ] remquo( float x, float y ) { int quo; x = remquof( x, y, &quo ); return [ quo, x ]; }
+float remquo( float x, float y, int *quo ) { return remquof( x, y, quo ); }
+//[ int, double ] remquo( double x, double y ) { int quo; x = remquo( x, y, &quo ); return [ quo, x ]; }
+//[ int, long double ] remquo( long double x, long double y ) { int quo; x = remquol( x, y, &quo ); return [ quo, x ]; }
+long double remquo( long double x, long double y, int *quo ) { return remquol( x, y, quo ); }
+
+float scalbn( float x, int exp ) { return scalbnf( x, exp ); }
+long double scalbn( long double x, int exp ) { return scalbnl( x, exp ); }
+float scalbn( float x, long int exp ) { return scalblnf( x, exp ); }
+double scalbn( double x, long int exp ) { return scalbln( x, exp ); }
+long double scalbn( long double x, long int exp ) { return scalblnl( x, exp ); }
+
+float scalbln( float x, long int exp ) { return scalblnf( x, exp ); }
+long double scalbln( long double x, long int exp ) { return scalblnl( x, exp ); }
+
+float tgamma( float x ) { return tgammaf( x ); }
+long double tgamma( long double x ) { return tgammal( x ); }
+
+float trunc( float x ) { return truncf( x ); }
+long double trunc( long double x ) { return truncl( x ); }
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/libcfa/rational.c
===================================================================
--- src/libcfa/rational.c	(revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40)
+++ src/libcfa/rational.c	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -11,6 +11,6 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 12 21:26:42 2016
-// Update Count     : 21
+// Last Modified On : Thu Apr 21 07:33:03 2016
+// Update Count     : 22
 // 
 
@@ -18,4 +18,5 @@
 #include "fstream"
 #include "stdlib"
+#include "math"											// floor
 
 
Index: src/libcfa/stdlib
===================================================================
--- src/libcfa/stdlib	(revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40)
+++ src/libcfa/stdlib	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 19 21:21:53 2016
-// Update Count     : 93
+// Last Modified On : Thu Apr 21 07:55:21 2016
+// Update Count     : 95
 //
 
@@ -33,18 +33,12 @@
 //---------------------------------------
 
-extern "C" {
-void * malloc( size_t );								// use default C routine for void *
-} // extern "C"
+extern "C" { void * malloc( size_t ); }					// use default C routine for void *
 forall( otype T ) T * malloc( void );
 forall( otype T ) T * malloc( char fill );
 forall( otype T ) T * malloc( T * ptr, size_t size );
 forall( otype T ) T * malloc( T * ptr, size_t size, unsigned char fill );
-extern "C" {
-void * calloc( size_t nmemb, size_t size );				// use default C routine for void *
-} // extern "C"
+extern "C" { void * calloc( size_t nmemb, size_t size ); } // use default C routine for void *
 forall( otype T ) T * calloc( size_t nmemb );
-extern "C" {
-void * realloc( void * ptr, size_t size );				// use default C routine for void *
-} // extern "C"
+extern "C" { void * realloc( void * ptr, size_t size ); } // use default C routine for void *
 forall( otype T ) T * realloc( T * ptr, size_t size );
 forall( otype T ) T * realloc( T * ptr, size_t size, unsigned char fill );
@@ -103,7 +97,5 @@
 
 char abs( char );
-extern "C" {
-int abs( int );											// use default C routine for int
-} // extern "C"
+extern "C" { int abs( int ); }							// use default C routine for int
 long int abs( long int );
 long long int abs( long long int );
@@ -111,21 +103,7 @@
 double abs( double );
 long double abs( long double );
-float _Complex abs( float _Complex );
-double _Complex abs( double _Complex );
-long double _Complex abs( long double _Complex );
-
-//---------------------------------------
-
-float floor( float );
-extern "C" {
-double floor( double );									// use C routine for double
-} // extern "C"
-long double floor( long double );
-
-float ceil( float );
-extern "C" {
-double ceil( double );									// use C routine for double
-} // extern "C"
-long double ceil( long double );
+float abs( float _Complex );
+double abs( double _Complex );
+long double abs( long double _Complex );
 
 //---------------------------------------
Index: src/libcfa/stdlib.c
===================================================================
--- src/libcfa/stdlib.c	(revision 6b6597c4520b64fdb6397f1de6a7497d55cccc40)
+++ src/libcfa/stdlib.c	(revision 6e991d61d3d430d19f91624ec57c3454edee668a)
@@ -10,6 +10,6 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 19 21:21:51 2016
-// Update Count     : 159
+// Last Modified On : Thu Apr 21 07:58:29 2016
+// Update Count     : 165
 //
 
@@ -24,5 +24,5 @@
 #include <malloc.h>										// malloc_usable_size
 #include <math.h>										// fabsf, fabs, fabsl
-#include <complex.h>									// _Complex_I, cabsf, cabs, cabsl
+#include <complex.h>									// _Complex_I
 } // extern "C"
 
@@ -82,30 +82,30 @@
 int ato( const char * ptr ) {
 	int i;
-	if ( sscanf( ptr, "%d", &i ) == EOF ) {}			// check return code
+	if ( sscanf( ptr, "%d", &i ) == EOF ) {}
 	return i;
 }
 unsigned int ato( const char * ptr ) {
 	unsigned int ui;
-	if ( sscanf( ptr, "%u", &ui ) == EOF ) {}			// check return code
+	if ( sscanf( ptr, "%u", &ui ) == EOF ) {}
 	return ui;
 }
 long int ato( const char * ptr ) {
 	long int li;
-	if ( sscanf( ptr, "%ld", &li ) == EOF ) {}			// check return code
+	if ( sscanf( ptr, "%ld", &li ) == EOF ) {}
 	return li;
 }
 unsigned long int ato( const char * ptr ) {
 	unsigned long int uli;
-	if ( sscanf( ptr, "%lu", &uli ) == EOF ) {}			// check return code
+	if ( sscanf( ptr, "%lu", &uli ) == EOF ) {}
 	return uli;
 }
 long long int ato( const char * ptr ) {
 	long long int lli;
-	if ( sscanf( ptr, "%lld", &lli ) == EOF ) {}		// check return code
+	if ( sscanf( ptr, "%lld", &lli ) == EOF ) {}
 	return lli;
 }
 unsigned long long int ato( const char * ptr ) {
 	unsigned long long int ulli;
-	if ( sscanf( ptr, "%llu", &ulli ) == EOF ) {}		// check return code
+	if ( sscanf( ptr, "%llu", &ulli ) == EOF ) {}
 	return ulli;
 }
@@ -113,15 +113,15 @@
 float ato( const char * ptr ) {
 	float f;
-	if ( sscanf( ptr, "%f", &f ) == EOF ) {}			// check return code
+	if ( sscanf( ptr, "%f", &f ) == EOF ) {}
 	return f;
 }
 double ato( const char * ptr ) {
 	double d;
-	if ( sscanf( ptr, "%lf", &d ) == EOF ) {}			// check return code
+	if ( sscanf( ptr, "%lf", &d ) == EOF ) {}
 	return d;
 }
 long double ato( const char * ptr ) {
 	long double ld;
-	if ( sscanf( ptr, "%Lf", &ld ) == EOF ) {}			// check return code
+	if ( sscanf( ptr, "%Lf", &ld ) == EOF ) {}
 	return ld;
 }
@@ -129,15 +129,15 @@
 float _Complex ato( const char * ptr ) {
 	float re, im;
-	if ( sscanf( ptr, "%g%gi", &re, &im ) == EOF ) {}	// check return code
+	if ( sscanf( ptr, "%g%gi", &re, &im ) == EOF ) {}
 	return re + im * _Complex_I;
 }
 double _Complex ato( const char * ptr ) {
 	double re, im;
-	if ( sscanf( ptr, "%lf%lfi", &re, &im ) == EOF ) {} // check return code
+	if ( sscanf( ptr, "%lf%lfi", &re, &im ) == EOF ) {}
 	return re + im * _Complex_I;
 }
 long double _Complex ato( const char * ptr ) {
 	long double re, im;
-	if ( sscanf( ptr, "%Lf%Lfi", &re, &im ) == EOF ) {}	// check return code
+	if ( sscanf( ptr, "%Lf%Lfi", &re, &im ) == EOF ) {}
 	return re + im * _Complex_I;
 }	
@@ -221,18 +221,10 @@
 long int abs( long int v ) { return labs( v ); }
 long long int abs( long long int v ) { return llabs( v ); }
-float abs( float v ) { return fabsf( v ); }
-double abs( double v ) { return fabs( v ); }
-long double abs( long double v ) { return fabsl( v ); }
-float _Complex abs( float _Complex v ) { return cabsf( v ); }
-double _Complex abs( double _Complex v ) { return cabs( v ); }
-long double _Complex abs( long double _Complex v ) { return cabsl( v ); }
-
-//---------------------------------------
-
-float floor( float v ) { return floorf( v ); }
-long double floor( long double v ) { return floorl( v ); }
-
-float ceil( float v ) { return ceilf( v ); }
-long double ceil( long double v ) { return ceill( v ); }
+float abs( float x ) { return fabsf( x ); }
+double abs( double x ) { return fabs( x ); }
+long double abs( long double x ) { return fabsl( x ); }
+float abs( float _Complex x ) { return cabsf( x ); }
+double abs( double _Complex x ) { return cabs( x ); }
+long double abs( long double _Complex x ) { return cabsl( x ); }
 
 //---------------------------------------