Made var_is_valid_name more permissive.

[pspp] / src / data / identifier.c

diff --git a/src/data/identifier.c b/src/data/identifier.c
index 5c25cd0781c6520a7a525d778f2855a47f6a99f0..37384b6d7786f24f46f6b5e6a785ffc87f44116e 100644 (file)
--- a/src/data/identifier.c
+++ b/src/data/identifier.c
@@ -35,7 +35,7 @@ bool
 lex_is_id1 (char c_)
 {
   unsigned char c = c_;
-  return isalpha (c) || c == '@' || c == '#' || c == '$';
+  return isalpha (c) || c == '@' || c == '#' || c == '$' || c >= 128;
 }
 
 
@@ -45,7 +45,7 @@ bool
 lex_is_idn (char c_)
 {
   unsigned char c = c_;
-  return lex_is_id1 (c) || isdigit (c) || c == '.' || c == '_';
+  return lex_is_id1 (c) || isdigit (c) || c == '.' || c == '_' || c >= 128;
 }
 
 /* Returns the length of the longest prefix of STRING that forms
@@ -74,11 +74,19 @@ lex_id_get_length (struct substring string)
    and those characters are identical to KEYWORD. */
 bool
 lex_id_match (struct substring keyword, struct substring token)
+{
+  return lex_id_match_n (keyword, token, 3);
+}
+
+/* Returns true if TOKEN is a case-insensitive match for at least
+   the first N characters of KEYWORD. */
+bool
+lex_id_match_n (struct substring keyword, struct substring token, size_t n)
 {
   size_t token_len = ss_length (token);
   size_t keyword_len = ss_length (keyword);
 
-  if (token_len >= 3 && token_len < keyword_len)
+  if (token_len >= n && token_len < keyword_len)
     return ss_equals_case (ss_head (keyword, token_len), token);
   else
     return ss_equals_case (keyword, token);