nasm-token.re: Be even more pedantic and pass through $-prefixed ids as-is.

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

diff --git a/modules/parsers/nasm/nasm-token.re b/modules/parsers/nasm/nasm-token.re
index 2d150e3ead30d043f7469cee22f5d91a294f0b37..ebb280616a5dc2430ab0bb31c2776ca446762def 100644 (file)
--- a/modules/parsers/nasm/nasm-token.re
+++ b/modules/parsers/nasm/nasm-token.re
@@ -575,7 +575,6 @@ directive2:
        ">>"                    { RETURN(RIGHT_OP); }
        "//"                    { RETURN(SIGNDIV); }
        "%%"                    { RETURN(SIGNMOD); }
-       "$$"                    { RETURN(START_SECTION_ID); }
        [-+|^*&/%~$():=,\[]     { RETURN(s->tok[0]); }
 
        /* handle ] for directives */
@@ -584,14 +583,8 @@ directive2:
            RETURN(s->tok[0]);
        }
 
-       /* forced identifier */
-       "$" [a-zA-Z0-9_$#@~.?]+ {
-           lvalp->str_val = yasm__xstrndup(TOK+1, TOKLEN-1);
-           RETURN(ID);
-       }
-
        /* identifier; within directive, no local label mechanism */
-       [a-zA-Z_.?][a-zA-Z0-9_$#@~.?]* {
+       [a-zA-Z_$.?][a-zA-Z0-9_$#@~.?]* {
            lvalp->str_val = yasm__xstrndup(TOK, TOKLEN);
            RETURN(ID);
        }