Index: src/tests/ato.c
===================================================================
--- src/tests/ato.c	(revision 00b7cd3e8a3b65734bb432ac26ee5940a9e3a00c)
+++ src/tests/ato.c	(revision b68382146bfc9aa68160d565370751e4f3074dd7)
@@ -10,6 +10,6 @@
 // Created On       : Thu Feb  4 08:10:57 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul  4 23:38:04 2016
-// Update Count     : 48
+// Last Modified On : Thu Nov 16 18:31:56 2017
+// Update Count     : 89
 // 
 
@@ -18,30 +18,102 @@
 
 int main( void ) {
-	int i = ato( "-123" );
-	sout | i | "-123" | endl;
-	unsigned int ui = ato( "123" );
-	sout | ui | "123" | endl;
-	long int li = ato( "-123" );
-	sout | li | "-123" | endl;
-	unsigned long int uli = ato( "123" );
-	sout | uli | "123" | endl;
-	long long int lli = ato( "-123" );
-	sout | lli | "-123" | endl;
-	unsigned long long int ulli = ato( "123" );
-	sout | ulli | "123" | endl;
-	float f = ato( "-123.456" );
-	sout | f | "-123.456" | endl;
-	double d = ato( "-123.4567890123456" );
-	sout | d | "-123.4567890123456" | endl;
-	long double ld = ato( "-123.45678901234567890123456789" );
-	sout | ld | "-123.45678901234567890123456789" | endl;
-	float _Complex fc = ato( "-123.456-123.456i" );
-	sout | fc | "-123.456-123.456i" | endl;
-	double _Complex dc = ato( "-123.4567890123456+123.4567890123456i" );
-	sout | dc | "-123.4567890123456+123.4567890123456i" | endl;
-	long double _Complex ldc = ato( "123.45678901234567890123456789-123.45678901234567890123456789i" );
-	sout | ldc | "123.45678901234567890123456789-123.45678901234567890123456789i" | endl;
-	long double _Complex ldc2 = ato( "123.45678901234-123.4567890i" );
-	sout | ldc2 | "123.45678901234-123.4567890i" | endl;
+	const char * sptr = "-123";
+	int i = ato( sptr );
+	sout | i | sptr | endl;
+	sptr = "123";
+	unsigned int ui = ato( sptr );
+	sout | ui | sptr | endl;
+
+	sptr = "-123";
+	long int li = ato( sptr );
+	sout | li | sptr | endl;
+	sptr = "123";
+	unsigned long int uli = ato( sptr );
+	sout | uli | sptr | endl;
+
+	sptr = "-123";
+	long long int lli = ato( sptr );
+	sout | lli | sptr | endl;
+	sptr = "123";
+	unsigned long long int ulli = ato( sptr );
+	sout | ulli | sptr | endl;
+
+	sptr = "-123.456";
+	float f = ato( sptr );
+	sout | f | sptr | endl;
+	sptr = "-123.4567890123456";
+	double d = ato( sptr );
+	sout | d | sptr | endl;
+	sptr = "-123.45678901234567890123456789";
+	long double ld = ato( sptr );
+	sout | ld | sptr | endl;
+
+	sptr = "-123.456-123.456i";
+	float _Complex fc = ato( sptr );
+	sout | fc | sptr | endl;
+	sptr = "-123.4567890123456+123.4567890123456i";
+	double _Complex dc = ato( sptr );
+	sout | dc | sptr | endl;
+	sptr = "123.45678901234567890123456789-123.45678901234567890123456789i";
+	long double _Complex ldc = ato( sptr );
+	sout | ldc | sptr | endl;
+	sptr = "123.45678901234-123.4567890i";
+	long double _Complex ldc2 = ato( sptr );
+	sout | ldc2 | sptr | endl;
+
+
+	sptr = "-123";
+	i = strto( sptr, 0, 10 );
+	sout | i | sptr | endl;
+	sptr = "123";
+	ui = strto( sptr, 0, 10 );
+	sout | ui | sptr | endl;
+
+	sptr = "-123";
+	li = strto( sptr, 0, 10 );
+	sout | li | sptr | endl;
+	sptr = "123";
+	uli = strto( sptr, 0, 10 );
+	sout | uli | sptr | endl;
+
+	sptr = "-123";
+	lli = strto( sptr, 0, 10 );
+	sout | lli | sptr | endl;
+	sptr = "123";
+	ulli = strto( sptr, 0, 10 );
+	sout | ulli | sptr | endl;
+
+	sptr = "-123.456";
+	f = strto( sptr, 0 );
+	sout | f | sptr | endl;
+	sptr = "-123.4567890123456";
+	d = strto( sptr, 0 );
+	sout | d | sptr | endl;
+	sptr = "-123.45678901234567890123456789";
+	ld = strto( sptr, 0 );
+	sout | ld | sptr | endl;
+
+	sptr = "-123.456-123.456i";
+	fc = strto( sptr, 0 );
+	sout | fc | sptr | endl;
+
+	char * eptr = 0;
+	// sptr = "2fred";
+	// fc = strto( sptr, &eptr );
+	// sout | fc | sptr | eptr | endl;
+
+	sptr = "2  3";
+	fc = strto( sptr, &eptr );
+	sout | fc | sptr | eptr | endl;
+
+	sptr = "-123.4567890123456+123.4567890123456i";
+	dc = strto( sptr, 0 );
+	sout | dc | sptr | endl;
+	sptr = "123.45678901234567890123456789-123.45678901234567890123456789i";
+	ldc = strto( sptr, 0 );
+	sout | ldc | sptr | endl;
+	sptr = "123.45678901234-123.4567890i";
+	ldc2 = strto( sptr, 0 );
+	sout | ldc2 | sptr | endl;
 } // main