X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=461648557a05eaf017ffd1e67f8280c0a99fd3e6;hb=57e8789ebade6b927fbd85fd9a0738748e51daa4;hp=8351ff613d69155a05fe816028d983260a7c48d2;hpb=691c25e36fd1ee722dd35419d6110e3876b99f9c;p=pspp

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index 8351ff613d..461648557a 100644
--- 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)
@@ -51,13 +51,13 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         return CMD_FAILURE;
 
-      if ( lex_force_match (lexer, T_LPAREN) )
+      if (lex_force_match (lexer, T_LPAREN))
 	{
-	  if ( lex_match_id (lexer, "LEFT"))
+	  if (lex_match_id (lexer, "LEFT"))
 	    align = ALIGN_LEFT;
-	  else if ( lex_match_id (lexer, "RIGHT"))
+	  else if (lex_match_id (lexer, "RIGHT"))
 	    align = ALIGN_RIGHT;
-	  else if ( lex_match_id (lexer, "CENTER"))
+	  else if (lex_match_id (lexer, "CENTER"))
 	    align = ALIGN_CENTRE;
 	  else
             {
@@ -65,7 +65,8 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
               return CMD_FAILURE;
             }
 
-	  lex_force_match (lexer, T_RPAREN);
+	  if (!lex_force_match (lexer, T_RPAREN))
+	    return CMD_FAILURE;
 	}
       else
         {
@@ -73,7 +74,7 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
           return CMD_FAILURE;
         }
 
-      for( i = 0 ; i < nv ; ++i )
+      for(i = 0 ; i < nv ; ++i)
         var_set_alignment (v[i], align);
 
       while (lex_token (lexer) == T_SLASH)
@@ -102,7 +103,8 @@ cmd_variable_width (struct lexer *lexer, struct dataset *ds)
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         return CMD_FAILURE;
 
-      if (!lex_force_match (lexer, T_LPAREN) || !lex_force_int (lexer))
+      if (!lex_force_match (lexer, T_LPAREN)
+          || !lex_force_int_range (lexer, NULL, 1, INT_MAX))
         {
           free (v);
           return CMD_FAILURE;
@@ -115,15 +117,9 @@ cmd_variable_width (struct lexer *lexer, struct dataset *ds)
           return CMD_FAILURE;
         }
 
-      if (width < 0)
-        {
-          msg (SE, _("Variable display width must be a positive integer."));
-          free (v);
-          return CMD_FAILURE;
-        }
       width = MIN (width, 2 * MAX_STRING);
 
-      for( i = 0 ; i < nv ; ++i )
+      for(i = 0 ; i < nv ; ++i)
         var_set_display_width (v[i], width);
 
       while (lex_token (lexer) == T_SLASH)
@@ -149,13 +145,13 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
       if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
         return CMD_FAILURE;
 
-      if ( lex_force_match (lexer, T_LPAREN) )
+      if (lex_force_match (lexer, T_LPAREN))
 	{
-	  if ( lex_match_id (lexer, "SCALE"))
+	  if (lex_match_id (lexer, "SCALE"))
 	    level = MEASURE_SCALE;
-	  else if ( lex_match_id (lexer, "ORDINAL"))
+	  else if (lex_match_id (lexer, "ORDINAL"))
 	    level = MEASURE_ORDINAL;
-	  else if ( lex_match_id (lexer, "NOMINAL"))
+	  else if (lex_match_id (lexer, "NOMINAL"))
 	    level = MEASURE_NOMINAL;
 	  else
             {
@@ -163,7 +159,8 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
               return CMD_FAILURE;
             }
 
-	  lex_force_match (lexer, T_RPAREN);
+	  if (!lex_force_match (lexer, T_RPAREN))
+	    return CMD_FAILURE;
 	}
       else
         {
@@ -171,7 +168,7 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
           return CMD_FAILURE;
         }
 
-      for( i = 0 ; i < nv ; ++i )
+      for(i = 0 ; i < nv ; ++i)
 	var_set_measure (v[i], level);
 
 
@@ -183,3 +180,43 @@ 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_TARGET;
+      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
+        {
+          lex_error (lexer, NULL);
+          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;
+}