* nasm-token.re: Actually handle $-prefixed names correctly, stripping the $ prefix...

any combination of characters following.
* win64-dataref.asm: Update to match (has a $-prefixed symbol).

Reported by: Nils Weller <nils@gnulinux.nl>

svn path=/trunk/yasm/; revision=1508

diff --git a/modules/objfmts/win64/tests/win64-dataref.asm b/modules/objfmts/win64/tests/win64-dataref.asm
index a0a6d8e80347bd6ba58adc502416a86a2da210d8..d863dc5acee007c132e3c2c51dc2a048af613456 100644 (file)
--- a/modules/objfmts/win64/tests/win64-dataref.asm
+++ b/modules/objfmts/win64/tests/win64-dataref.asm
@@ -131,10 +131,10 @@ trap:             sub     rsp, 256
 [SECTION .pdata]
 dd     trap
 dd     trap.end wrt trap
-dd     $xdatasym
+dd     $$xdatasym
 
 [SECTION .xdata]
-$xdatasym:
+$$xdatasym:
 db     1, 7, 2, 0, 7, 1, 0x20, 0
 
 [SECTION _FOO]

diff --git a/modules/parsers/nasm/nasm-token.re b/modules/parsers/nasm/nasm-token.re
index 4ece0095e25091e0d9afe438233e348b191f8a14..34e24c2676f9fd0649f89555f6f63a94b40d2b06 100644 (file)
--- a/modules/parsers/nasm/nasm-token.re
+++ b/modules/parsers/nasm/nasm-token.re
@@ -374,8 +374,8 @@ scan:
        }
 
        /* forced identifier */
-       "$" [a-zA-Z_?][a-zA-Z0-9_$#@~.?]* {
-           lvalp->str_val = yasm__xstrndup(TOK, TOKLEN);
+       "$" [a-zA-Z0-9_$#@~.?]+ {
+           lvalp->str_val = yasm__xstrndup(TOK+1, TOKLEN-1);
            RETURN(ID);
        }