Fixed regex match for DIRECTIVE_VAL.

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

diff --git a/modules/parsers/nasm/token.l.in b/modules/parsers/nasm/token.l.in
index cafa6ba94c7dec7c9317d95bc057f908864b7586..0ab8de9d1880903ab787875a51595ba8165207dd 100644 (file)
--- a/modules/parsers/nasm/token.l.in
+++ b/modules/parsers/nasm/token.l.in
@@ -1,4 +1,4 @@
-/* $Id: token.l.in,v 1.2 2001/05/20 08:35:18 peter Exp $
+/* $Id: token.l.in,v 1.3 2001/05/20 08:39:48 peter Exp $
  * Main lexer
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -94,7 +94,7 @@ WS       [ \t\r]
     return DIRECTIVE_NAME;
 }
     /* everything printable except for ' ', '[' and ']'. */
-<DIRECTIVE2>[!-Z\^-~]+ {
+<DIRECTIVE2>[!-@a-z\\^-`{|}~]+ {
     yylval.str_val = strdup(yytext);
     if(!yylval.str_val)
        Fatal(FATAL_NOMEM);

diff --git a/src/parsers/nasm/token.l.in b/src/parsers/nasm/token.l.in
index cafa6ba94c7dec7c9317d95bc057f908864b7586..0ab8de9d1880903ab787875a51595ba8165207dd 100644 (file)
--- a/src/parsers/nasm/token.l.in
+++ b/src/parsers/nasm/token.l.in
@@ -1,4 +1,4 @@
-/* $Id: token.l.in,v 1.2 2001/05/20 08:35:18 peter Exp $
+/* $Id: token.l.in,v 1.3 2001/05/20 08:39:48 peter Exp $
  * Main lexer
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -94,7 +94,7 @@ WS       [ \t\r]
     return DIRECTIVE_NAME;
 }
     /* everything printable except for ' ', '[' and ']'. */
-<DIRECTIVE2>[!-Z\^-~]+ {
+<DIRECTIVE2>[!-@a-z\\^-`{|}~]+ {
     yylval.str_val = strdup(yytext);
     if(!yylval.str_val)
        Fatal(FATAL_NOMEM);

diff --git a/src/token.l b/src/token.l
index 2c0ff312da3249eb2d5a7981ad84c0bd28411a99..f374a8d3bb0646b0e1d13d8f7e0e9e33bb23a7c0 100644 (file)
--- a/src/token.l
+++ b/src/token.l
@@ -1,4 +1,4 @@
-/* $Id: token.l,v 1.2 2001/05/20 08:35:18 peter Exp $
+/* $Id: token.l,v 1.3 2001/05/20 08:39:48 peter Exp $
  * Main lexer
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -94,7 +94,7 @@ WS       [ \t\r]
     return DIRECTIVE_NAME;
 }
     /* everything printable except for ' ', '[' and ']'. */
-<DIRECTIVE2>[!-Z\^-~]+ {
+<DIRECTIVE2>[!-@a-z\\^-`{|}~]+ {
     yylval.str_val = strdup(yytext);
     if(!yylval.str_val)
        Fatal(FATAL_NOMEM);

diff --git a/src/token.l.in b/src/token.l.in
index cafa6ba94c7dec7c9317d95bc057f908864b7586..0ab8de9d1880903ab787875a51595ba8165207dd 100644 (file)
--- a/src/token.l.in
+++ b/src/token.l.in
@@ -1,4 +1,4 @@
-/* $Id: token.l.in,v 1.2 2001/05/20 08:35:18 peter Exp $
+/* $Id: token.l.in,v 1.3 2001/05/20 08:39:48 peter Exp $
  * Main lexer
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -94,7 +94,7 @@ WS       [ \t\r]
     return DIRECTIVE_NAME;
 }
     /* everything printable except for ' ', '[' and ']'. */
-<DIRECTIVE2>[!-Z\^-~]+ {
+<DIRECTIVE2>[!-@a-z\\^-`{|}~]+ {
     yylval.str_val = strdup(yytext);
     if(!yylval.str_val)
        Fatal(FATAL_NOMEM);