* parser.y (regtoken): New nonterminal symbol.

(regterm): REGTOKEN production factored out to regtoken.
(regclass): Reverted prior commmit's changes.
(regclassterm): Reverted prior commit, removing REGTOKEN
production for character classes, and introduced a regtoken
production. So now the keyword symbols are part of the
character class abstract syntax.
(regtoken): New production rule.

* regex.c (regex_space_chars): Converted to internal linkage.
(char_set_compile): Handle token keywords in character class
abstract syntax.

* regex.h (regex_space_chars): External declaration removed.

1 files changed, 0 insertions, 1 deletions

diff --git a/regex.h b/regex.h
index 4d137a0f..962a2846 100644
--- a/regex.h
+++ b/regex.h
@@ -26,7 +26,6 @@
 
 extern val space_k, digit_k, word_char_k;
 extern val cspace_k, cdigit_k, cword_char_k;
-extern val regex_space_chars;
 
 val regex_compile(val regex_sexp);
 val regexp(val);