* parser.l (ID_END): Bugfix: ID_END was defined incorrectly

for the current way in which an identifier token is recognized.
As a result @(collect-ing) was being interpreted as @(collect -ing).
It should be the complement of NSCHR.

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 09356ae7..f94493b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-03-13  Kaz Kylheku  <kaz@kylheku.com>
 
+	* parser.l (ID_END): Bugfix: ID_END was defined incorrectly
+	for the current way in which an identifier token is recognized.
+	As a result @(collect-ing) was being interpreted as @(collect -ing).
+	It should be the complement of NSCHR.
+
+2012-03-13  Kaz Kylheku  <kaz@kylheku.com>
+
 	* regex.c (regsub): the replacement argument
 	can now be a function of one argument which maps
 	the original piece of text matched by the regex
diff --git a/parser.l b/parser.l
index 732e2ce0..98a243ec 100644
--- a/parser.l
+++ b/parser.l
@@ -153,12 +153,12 @@ NUM     [+\-]?[0-9]+
 BSCHR   [a-zA-Z0-9!$%&*+\-<=>?\\^_~]
 BSYM    {BSCHR}({BSCHR}|#)*
 NSCHR   [a-zA-Z0-9!$%&*+\-<=>?\\^_~/]
+ID_END  [^a-zA-Z0-9!$%&*+\-<=>?\\^_~/]
 NSYM    {NSCHR}({NSCHR}|#)*
 TOK     :?{SYM}
 ATNUM   @{NUM}
 BTOK    [:@]?{BSYM}
 NTOK    [:@]?{NSYM}
-ID_END  [^a-zA-Z0-9_]
 WS      [\t ]*
 HEX     [0-9A-Fa-f]
 OCT     [0-7]