Mon Aug 31 23:36:58 2020 UTC ()

Don't try so hard to convert strings into numbers. Results in bogus
conversions like:

% awk 'BEGIN { print "nanotime" + 123 }'
nan
% awk 'BEGIN { print "microtime" + 123 }'
123
% awk 'BEGIN { print "inftime" + 123 }'
inf


(christos)

diff -r1.11 -r1.12 src/external/historical/nawk/dist/tran.c

--- src/external/historical/nawk/dist/tran.c 2020/02/18 21:12:21	1.11
+++ src/external/historical/nawk/dist/tran.c 2020/08/31 23:36:58	1.12

 @@ -394,29 +394,32 @@ char *setsval(Cell *vp, const char *s)	/
 	return(vp->sval);
+}
 Awkfloat getfval(Cell *vp)	/* get float val of a Cell */
+{
 	if ((vp->tval & (NUM | STR)) == 0)
 		funnyvar(vp, "read value of");
 	if (isfld(vp) && !donefld)
 		fldbld();
 	else if (isrec(vp) && !donerec)
 		recbld();
 	if (!isnum(vp)) {	/* not a number */
-		vp->fval = atof(vp->sval);	/* best guess */
+		if (is_number(vp->sval) && !(vp->tval&CON)) {
-		if (is_number(vp->sval) && !(vp->tval&CON))
+			vp->fval = atof(vp->sval);	/* best guess */
 			vp->tval |= NUM;	/* make NUM only sparingly */
 		} else {
 			vp->fval = 0;
+		}
+	}
 	   dprintf( ("getfval %p: %s = %g, t=%o\n",
 		(void*)vp, NN(vp->nval), vp->fval, vp->tval) );
 	return(vp->fval);
+}
 static char *get_str_val(Cell *vp, char **fmt)        /* get string val of a Cell */
+{
 	char s[256];
 	double dtemp;
 	if ((vp->tval & (NUM | STR)) == 0)
 		funnyvar(vp, "read value of");