X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=cf3bad79449adf25cebccfb2830e61d075fc07c2;hb=83ad8f5b760cb46bd1d86f60a40d6aace21118ef;hp=e6afcb98f596a547c32716a8d7b6e132ef4a858e;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index e6afcb98..cf3bad79 100644
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
 
-   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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -49,7 +46,7 @@ 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, '(') ) 
+      if ( lex_force_match (lexer, '(') )
 	{
 	  if ( lex_match_id (lexer, "LEFT"))
 	    align = ALIGN_LEFT;
@@ -57,23 +54,22 @@ cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
 	    align = ALIGN_RIGHT;
 	  else if ( lex_match_id (lexer, "CENTER"))
 	    align = ALIGN_CENTRE;
-	  else 
+	  else
             {
               free (v);
-              return CMD_FAILURE; 
+              return CMD_FAILURE;
             }
 
 	  lex_force_match (lexer, ')');
 	}
-      else 
+      else
         {
           free (v);
-          return CMD_FAILURE; 
+          return CMD_FAILURE;
         }
 
-      for( i = 0 ; i < nv ; ++i ) 
-	v[i]->alignment = align;
-
+      for( i = 0 ; i < nv ; ++i )
+        var_set_alignment (v[i], align);
 
       while (lex_token (lexer) == '/')
 	lex_get (lexer);
@@ -100,17 +96,17 @@ 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, '(') ) 
+      if ( lex_force_match (lexer, '(') )
 	{
-	  if ( lex_force_int (lexer)) 
+	  if ( lex_force_int (lexer))
 	    lex_get (lexer);
 	  else
 	    return CMD_FAILURE;
 	  lex_force_match (lexer, ')');
 	}
 
-      for( i = 0 ; i < nv ; ++i ) 
-	  v[i]->display_width = lex_tokval (lexer);
+      for( i = 0 ; i < nv ; ++i )
+        var_set_display_width (v[i], lex_integer (lexer));
 
       while (lex_token (lexer) == '/')
 	lex_get (lexer);
@@ -135,7 +131,7 @@ 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, '(') ) 
+      if ( lex_force_match (lexer, '(') )
 	{
 	  if ( lex_match_id (lexer, "SCALE"))
 	    level = MEASURE_SCALE;
@@ -143,10 +139,10 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
 	    level = MEASURE_ORDINAL;
 	  else if ( lex_match_id (lexer, "NOMINAL"))
 	    level = MEASURE_NOMINAL;
-	  else 
+	  else
             {
               free (v);
-              return CMD_FAILURE; 
+              return CMD_FAILURE;
             }
 
 	  lex_force_match (lexer, ')');
@@ -154,11 +150,11 @@ cmd_variable_level (struct lexer *lexer, struct dataset *ds)
       else
         {
           free (v);
-          return CMD_FAILURE; 
+          return CMD_FAILURE;
         }
-      
-      for( i = 0 ; i < nv ; ++i ) 
-	v[i]->measure = level ;
+
+      for( i = 0 ; i < nv ; ++i )
+	var_set_measure (v[i], level);
 
 
       while (lex_token (lexer) == '/')