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

svn path=/trunk/yasm/; revision=1649
0.6.0
Peter Johnson 18 years ago
parent e9637080fc
commit 013251513e
  1. 9
      modules/parsers/nasm/nasm-token.re

@ -575,7 +575,6 @@ directive2:
">>" { RETURN(RIGHT_OP); } ">>" { RETURN(RIGHT_OP); }
"//" { RETURN(SIGNDIV); } "//" { RETURN(SIGNDIV); }
"%%" { RETURN(SIGNMOD); } "%%" { RETURN(SIGNMOD); }
"$$" { RETURN(START_SECTION_ID); }
[-+|^*&/%~$():=,\[] { RETURN(s->tok[0]); } [-+|^*&/%~$():=,\[] { RETURN(s->tok[0]); }
/* handle ] for directives */ /* handle ] for directives */
@ -584,14 +583,8 @@ directive2:
RETURN(s->tok[0]); 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 */ /* 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); lvalp->str_val = yasm__xstrndup(TOK, TOKLEN);
RETURN(ID); RETURN(ID);
} }

Loading…
Cancel
Save