Delete trailing whitespace at end of lines.

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

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index e6afcb98f596a547c32716a8d7b6e132ef4a858e..2754c71e66b486a7ec12a9b9037fb3b4c7a45fb8 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    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
@@ -49,7 +48,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 +56,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 +98,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 +133,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 +141,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 +152,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) == '/')