Added src/ui/terminal/automake.mk and src/ui/gui/automake.mk

[pspp] / src / vars-atr.c

diff --git a/src/vars-atr.c b/src/vars-atr.c
index adaa6a4cc2c46deca2c00269a793bcaead0ba6fa..970ce5673f45c0154ae08640b28bcb92171cc99b 100644 (file)
--- a/src/vars-atr.c
+++ b/src/vars-atr.c
@@ -22,22 +22,31 @@
 #include "error.h"
 #include <stdlib.h>
 #include "alloc.h"
-#include "command.h"
 #include "dictionary.h"
-#include "do-ifP.h"
-#include "expressions/public.h"
-#include "file-handle.h"
 #include "hash.h"
-#include "lexer.h"
+#include "lex-def.h"
 #include "misc.h"
 #include "str.h"
 #include "value-labels.h"
-#include "vfm.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
+/* Returns an adjective describing the given variable TYPE,
+   suitable for use in phrases like "numeric variable". */
+const char *
+var_type_adj (enum var_type type) 
+{
+  return type == NUMERIC ? _("numeric") : _("string");
+}
+
+/* Returns a noun describing a value of the given variable TYPE,
+   suitable for use in phrases like "a number". */
+const char *
+var_type_noun (enum var_type type) 
+{
+  return type == NUMERIC ? _("number") : _("string");
+}
 
 /* Assign auxiliary data AUX to variable V, which must not
    already have auxiliary data.  Before V's auxiliary data is
@@ -162,7 +171,7 @@ var_is_valid_name (const char *name, bool issue_error)
   if (lex_id_to_token (name, strlen (name)) != T_ID) 
     {
       if (issue_error)
-        msg (SE, _("%s may not be used as a variable name because it "
+        msg (SE, _("`%s' may not be used as a variable name because it "
                    "is a reserved word."), name);
       return false;
     }