From: Peter Johnson <peter@tortall.net>
Date: Sun, 16 Sep 2001 17:27:56 +0000 (-0000)
Subject: Allow whitespace before a directive.
X-Git-Tag: v0.1.0~350
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca16006ce9fa878941f822b4b1639d6732121f2a;p=yasm

Allow whitespace before a directive.

svn path=/trunk/yasm/; revision=162
---

diff --git a/modules/parsers/nasm/token.l.in b/modules/parsers/nasm/token.l.in
index 137c596e..6e2c49bc 100644
--- a/modules/parsers/nasm/token.l.in
+++ b/modules/parsers/nasm/token.l.in
@@ -1,4 +1,4 @@
-/* $Id: token.l.in,v 1.16 2001/08/30 03:45:26 peter Exp $
+/* $Id: token.l.in,v 1.17 2001/09/16 17:27:56 peter Exp $
  * Main lexer
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -42,7 +42,7 @@
 
 #include "bison.h"
 
-RCSID("$Id: token.l.in,v 1.16 2001/08/30 03:45:26 peter Exp $");
+RCSID("$Id: token.l.in,v 1.17 2001/09/16 17:27:56 peter Exp $");
 
 #define yylval	nasm_parser_lval
 
@@ -147,7 +147,7 @@ WS       [ \t\r]
 }
 
     /* directive: [name value] */
-^"["	{ BEGIN DIRECTIVE; return '['; }
+^{WS}*"["	    { BEGIN DIRECTIVE; return '['; }
 <DIRECTIVE>"]"	    { BEGIN INITIAL; return ']'; }
 <DIRECTIVE2>"]"	    { BEGIN INITIAL; return ']'; }
 <DIRECTIVE>\n	    { BEGIN INITIAL; return '\n'; }
diff --git a/src/parsers/nasm/token.l.in b/src/parsers/nasm/token.l.in
index 137c596e..6e2c49bc 100644
--- a/src/parsers/nasm/token.l.in
+++ b/src/parsers/nasm/token.l.in
@@ -1,4 +1,4 @@
-/* $Id: token.l.in,v 1.16 2001/08/30 03:45:26 peter Exp $
+/* $Id: token.l.in,v 1.17 2001/09/16 17:27:56 peter Exp $
  * Main lexer
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -42,7 +42,7 @@
 
 #include "bison.h"
 
-RCSID("$Id: token.l.in,v 1.16 2001/08/30 03:45:26 peter Exp $");
+RCSID("$Id: token.l.in,v 1.17 2001/09/16 17:27:56 peter Exp $");
 
 #define yylval	nasm_parser_lval
 
@@ -147,7 +147,7 @@ WS       [ \t\r]
 }
 
     /* directive: [name value] */
-^"["	{ BEGIN DIRECTIVE; return '['; }
+^{WS}*"["	    { BEGIN DIRECTIVE; return '['; }
 <DIRECTIVE>"]"	    { BEGIN INITIAL; return ']'; }
 <DIRECTIVE2>"]"	    { BEGIN INITIAL; return ']'; }
 <DIRECTIVE>\n	    { BEGIN INITIAL; return '\n'; }