mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-02-05 16:51:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

preproc: make $ and $$ TOKEN_OTHER

Browse Source 
Recognize $ and $$ as TOKEN_OTHER; they aren't really either
TOK_NUMBER nor TOK_ID, even though we have traditionally considered
them TOK_NUMBER.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2009-04-17 14:20:44 -07:00
parent fb5f2519ad
commit 8e1f81110a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
preproc.c
View File

@ -874,7 +874,7 @@ static Token *tokenize(char *line)
/* type = -1; */
}
} else if (p[0] == '$' && p[1] == '$') {
type = TOK_NUMBER;
type = TOK_OTHER; /* TOKEN_BASE */
p += 2;
} else if (isnumstart(*p)) {
bool is_hex = false;
@ -935,12 +935,16 @@ static Token *tokenize(char *line)
}
p--; /* Point to first character beyond number */
if (has_e && !is_hex) {
/* 1e13 is floating-point, but 1e13h is not */
is_float = true;
if (p == line+1 && *line == '$') {
type = TOK_OTHER; /* TOKEN_HERE */
} else {
if (has_e && !is_hex) {
/* 1e13 is floating-point, but 1e13h is not */
is_float = true;
}
type = is_float ? TOK_FLOAT : TOK_NUMBER;
}
type = is_float ? TOK_FLOAT : TOK_NUMBER;
} else if (nasm_isspace(*p)) {
type = TOK_WHITESPACE;
p++;