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

make eval() recognize hexadecimal constant as specified in the man page.

Browse Source
This commit is contained in:
matthias 1999-04-14 09:38:37 +00:00
parent 37653920ec
commit f251445b74
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/m4/expr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: expr.c,v 1.8 1997/10/19 04:39:53 lukem Exp $ */ /* $NetBSD: expr.c,v 1.9 1999/04/14 09:38:37 matthias Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -41,12 +41,13 @@
#if 0 #if 0
static char sccsid[] = "@(#)expr.c 8.2 (Berkeley) 4/29/95"; static char sccsid[] = "@(#)expr.c 8.2 (Berkeley) 4/29/95";
#else #else
__RCSID("$NetBSD: expr.c,v 1.8 1997/10/19 04:39:53 lukem Exp $"); __RCSID("$NetBSD: expr.c,v 1.9 1999/04/14 09:38:37 matthias Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <stdio.h> #include <stdio.h>
#include <ctype.h>
#include "mdef.h" #include "mdef.h"
#include "extern.h" #include "extern.h"
@ -106,6 +107,7 @@ __RCSID("$NetBSD: expr.c,v 1.8 1997/10/19 04:39:53 lukem Exp $");
#define GEQ 5 #define GEQ 5
#define OCTAL 8 #define OCTAL 8
#define DECIMAL 10 #define DECIMAL 10
#define HEX 16
static char *nxtch; /* Parser scan pointer */ static char *nxtch; /* Parser scan pointer */
@ -499,9 +501,21 @@ num()
base = ((c = skipws()) == '0') ? OCTAL : DECIMAL; base = ((c = skipws()) == '0') ? OCTAL : DECIMAL;
rval = 0; rval = 0;
ndig = 0; ndig = 0;
while (c >= '0' && c <= (base == OCTAL ? '7' : '9')) { if (base == OCTAL) {
c = skipws();
if (c == 'x' || c == 'X') {
base = HEX;
c = skipws();
} else
ndig++;
}
while ((base == HEX && isxdigit(c)) ||
(c >= '0' && c <= (base == OCTAL ? '7' : '9'))) {
rval *= base; rval *= base;
rval += (c - '0'); if (isalpha(c))
rval += (tolower(c) - 'a' + 10);
else
rval += (c - '0');
c = getch(); c = getch();
ndig++; ndig++;
} }