summaryrefslogtreecommitdiff
path: root/scan.l
diff options
context:
space:
mode:
authorWill Estes <wlestes@users.sourceforge.net>2001-09-20 16:29:09 +0000
committerWill Estes <wlestes@users.sourceforge.net>2001-09-20 16:29:09 +0000
commit4ff80380ff7f3c9bb963aaf9ffb349d76932521b (patch)
treee6d0a4401ae595b2a7a1d9e3c0e6c304a6e11966 /scan.l
parentadffe2a8c59d8438b4c03f449ca50829d575390a (diff)
now flex recognizes \r as an eol character
Diffstat (limited to 'scan.l')
-rw-r--r--scan.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/scan.l b/scan.l
index 6f8b26d..22b2e48 100644
--- a/scan.l
+++ b/scan.l
@@ -77,7 +77,7 @@
WS [[:blank:]]+
OPTWS [[:blank:]]*
-NOT_WS [^[:blank:]\n]
+NOT_WS [^[:blank:]\r\n]
NL \r?\n
@@ -186,7 +186,7 @@ LEXOPT [aceknopr]
<PICKUPDEF>{
{WS} /* separates name and definition */
- {NOT_WS}.* {
+ {NOT_WS}[^\r\n]* {
strcpy( (char *) nmdef, yytext );
/* Skip trailing whitespace. */