(var_name_is_insertable): New function.

(make_hinted_name): Don't accept variable names that match PSPP
keywords.  Thanks to Jason Stover for reporting the problem.

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index f209233b1bbc0db32ed065a7d8465bf7c426eba3..75313fee5526edc8e5c799f23a6ee17208a5d031 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-06  Ben Pfaff  <blp@gnu.org>
+
+       * dictionary.c (var_name_is_insertable): New function.
+       (make_hinted_name): Don't accept variable names that match PSPP
+       keywords.  Thanks to Jason Stover for reporting the problem.
+
 2008-03-06  Ben Pfaff  <blp@gnu.org>
 
        * format-guesser.c (syntax): Require month names to be spelled out

diff --git a/src/data/dictionary.c b/src/data/dictionary.c
index 0856df93618b4569e2809457a5617eec73efeb32..526bb280a0956b70a24f4db3e32943f98701a7ec 100644 (file)
--- a/src/data/dictionary.c
+++ b/src/data/dictionary.c
@@ -729,6 +729,18 @@ dict_rename_vars (struct dictionary *d,
   return true;
 }
 
+/* Returns true if a variable named NAME may be inserted in DICT;
+   that is, if there is not already a variable with that name in
+   DICT and if NAME is not a reserved word.  (The caller's checks
+   have already verified that NAME is otherwise acceptable as a
+   variable name.) */
+static bool
+var_name_is_insertable (const struct dictionary *dict, const char *name)
+{
+  return (dict_lookup_var (dict, name) == NULL
+          && lex_id_to_token (ss_cstr (name)) == T_ID);
+}
+
 static bool
 make_hinted_name (const struct dictionary *dict, const char *hint,
                   char name[VAR_NAME_LEN + 1])
@@ -760,7 +772,7 @@ make_hinted_name (const struct dictionary *dict, const char *hint,
       size_t len = strlen (name);
       unsigned long int i;
 
-      if (dict_lookup_var (dict, name) == NULL)
+      if (var_name_is_insertable (dict, name))
         return true;
 
       for (i = 0; i < ULONG_MAX; i++)
@@ -775,7 +787,7 @@ make_hinted_name (const struct dictionary *dict, const char *hint,
           ofs = MIN (VAR_NAME_LEN - strlen (suffix), len);
           strcpy (&name[ofs], suffix);
 
-          if (dict_lookup_var (dict, name) == NULL)
+          if (var_name_is_insertable (dict, name))
             return true;
         }
     }