From 013251513efb6f3eaa0427e1dab31a37dbe497df Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Tue, 17 Oct 2006 05:14:27 +0000 Subject: [PATCH] nasm-token.re: Be even more pedantic and pass through $-prefixed ids as-is. svn path=/trunk/yasm/; revision=1649 --- modules/parsers/nasm/nasm-token.re | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/parsers/nasm/nasm-token.re b/modules/parsers/nasm/nasm-token.re index 2d150e3e..ebb28061 100644 --- 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); }