Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check explicitly for inf and nan. We can't check if it is a number, 

because awk parses 1a as 1...
This commit is contained in:
christos 2020-09-01 00:21:01 +00:00
parent 4b14471916
commit d21092d46f
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
external/historical/nawk/dist/tran.c vendored
View File

@ -395,6 +395,25 @@ char *setsval(Cell *vp, const char *s) /* set string val of a Cell */
return(vp->sval);
}
static int checkstr(const char *s, const char *v)
{
while (*s && tolower((unsigned char)*s) == *v)
s++, v++;
return !(*s || *v);
}
static int checkinfnan(const char *s)
{
switch (tolower((unsigned char)*s)) {
case 'i':
return checkstr(s, "inf") || checkstr(s, "infinity");
case 'n':
return checkstr(s, "nan");
default:
return 1;
}
}
Awkfloat getfval(Cell *vp) /* get float val of a Cell */
{
if ((vp->tval & (NUM | STR)) == 0)
@ -404,11 +423,10 @@ Awkfloat getfval(Cell *vp) /* get float val of a Cell */
else if (isrec(vp) && !donerec)
recbld();
if (!isnum(vp)) { /* not a number */
if (is_number(vp->sval) && !(vp->tval&CON)) {
if (checkinfnan(vp->sval))
vp->fval = atof(vp->sval); /* best guess */
if (is_number(vp->sval) && !(vp->tval&CON)) {
vp->tval |= NUM; /* make NUM only sparingly */
} else {
vp->fval = 0;
}
}
dprintf( ("getfval %p: %s = %g, t=%o\n",