VARIABLE ROLE: New command.

[pspp] / src / language / dictionary / variable-display.c

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index 8351ff613d69155a05fe816028d983260a7c48d2..9e50551c92b9a17359af658d947014762fb78bc2 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,16 +19,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/dataset.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -183,3 +183,40 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
   while (lex_token (lexer) != T_ENDCMD);
   return CMD_SUCCESS;
 }
+
+/* Set variables' role */
+int
+cmd_variable_role (struct lexer *lexer, struct dataset *ds)
+{
+  while (lex_match (lexer, T_SLASH))
+    {
+      struct variable **v;
+      size_t nv;
+      enum var_role role;
+      size_t i;
+
+      if ( lex_match_id (lexer, "INPUT"))
+        role = ROLE_INPUT;
+      else if ( lex_match_id (lexer, "TARGET"))
+        role = ROLE_OUTPUT;
+      else if ( lex_match_id (lexer, "BOTH"))
+        role = ROLE_BOTH;
+      else if ( lex_match_id (lexer, "NONE"))
+        role = ROLE_NONE;
+      else if ( lex_match_id (lexer, "PARTITION"))
+        role = ROLE_PARTITION;
+      else if ( lex_match_id (lexer, "SPLIT"))
+        role = ROLE_SPLIT;
+      else
+        return CMD_FAILURE;
+
+      if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
+        return CMD_FAILURE;
+
+      for (i = 0; i < nv; i++)
+       var_set_role (v[i], role);
+      free (v);
+    }
+
+  return CMD_SUCCESS;
+}