[nasm:master] asm/preproc.c: in tokenize() advance pointer past ? for TOKEN_QMARK

nasm-bot for H. Peter Anvin (Intel) hpa at zytor.com
Fri Sep 11 18:39:04 PDT 2020


Commit-ID:  6f01aca07cf35a9e43f94991e4abaabb8511eba6
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=6f01aca07cf35a9e43f94991e4abaabb8511eba6
Author:     H. Peter Anvin (Intel) <hpa at zytor.com>
AuthorDate: Fri, 11 Sep 2020 18:36:26 -0700
Committer:  H. Peter Anvin (Intel) <hpa at zytor.com>
CommitDate: Fri, 11 Sep 2020 18:37:35 -0700

asm/preproc.c: in tokenize() advance pointer past ? for TOKEN_QMARK

When we process a TOKEN_QMARK we also need to advance p, in order to
get the proper start for the next token.

This fixes travis test br3392707.

Signed-off-by: H. Peter Anvin (Intel) <hpa at zytor.com>


---
 asm/preproc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/asm/preproc.c b/asm/preproc.c
index bd385157..629fe5df 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -1475,6 +1475,7 @@ static Token *tokenize(const char *line)
         } else if (*p == '?' && !nasm_isidchar(p[1])) {
             /* ? operator */
             type = TOKEN_QMARK;
+            p++;
         } else if (nasm_isidstart(*p) || (*p == '$' && nasm_isidstart(p[1]))) {
             /*
              * A regular identifier. This includes keywords, which are not


More information about the Nasm-commits mailing list