[Nasm-cvs] BR 2760773: $$ tokens

[Victor v. d. E. <vic...@gm...>]

Date: Fri, 17 Apr 2009 16:17:59 +0200

The tokenizer didn't handle $$, but relied on token pasting of two $ tokens.
This broke after the improvements in 9bb46df4.
---
 preproc.c           |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 test/br890790.asm
 mode change 100755 => 100644 test/br890790_i.asm
 mode change 100755 => 100644 test/ifelse.asm

diff --git a/preproc.c b/preproc.c
index 45ef1f6..9a03f02 100644
--- a/preproc.c
+++ b/preproc.c
@@ -873,6 +873,9 @@ static Token *tokenize(char *line)
                 /* Handling unterminated strings by UNV */
                 /* type = -1; */
             }
+        } else if (p[0] == '$' && p[1] == '$') {
+            type = TOK_NUMBER;
+            p += 2;
         } else if (isnumstart(*p)) {
 	    bool is_hex = false;
 	    bool is_float = false;
diff --git a/test/br890790.asm b/test/br890790.asm
old mode 100755
new mode 100644
diff --git a/test/br890790_i.asm b/test/br890790_i.asm
old mode 100755
new mode 100644
diff --git a/test/ifelse.asm b/test/ifelse.asm
old mode 100755
new mode 100644
-- 
1.6.1.1