From: Mark Thom <markjordanthom@gmail.com>
Date: Sat, 25 Mar 2023 23:22:16 +0000 (-0600)
Subject: broaden the definition of alpha_char! (#1749, #1515, #1591)
X-Git-Tag: v0.9.2~160
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=adc77985d7fc69cea354c4aaa6a833c2fc50ab7d;p=scryer-prolog.git

broaden the definition of alpha_char! (#1749, #1515, #1591)
---

diff --git a/src/parser/macros.rs b/src/parser/macros.rs
index 326772cf..27b106fc 100644
--- a/src/parser/macros.rs
+++ b/src/parser/macros.rs
@@ -7,7 +7,13 @@ macro_rules! char_class {
 #[macro_export]
 macro_rules! alpha_char {
     ($c: expr) => {
-        $c.is_alphabetic() || $c == '_'
+        (!$c.is_numeric() &&
+         !$c.is_whitespace() &&
+         !$c.is_control() &&
+         !$crate::graphic_token_char!($c) &&
+         !$crate::layout_char!($c) &&
+         !$crate::meta_char!($c) &&
+         !$crate::solo_char!($c)) || $c == '_'
     };
 }