Merge commit 'origin/stable'

[pspp-builds.git] / src / language / data-io / print-space.c

diff --git a/src/language/data-io/print-space.c b/src/language/data-io/print-space.c
index 1388f2971294660be67ae8d5a88f6deff5d37488..3f73ee25a8de16fb1f1883608e2c6fa8cf25fdba 100644 (file)
--- a/src/language/data-io/print-space.c
+++ b/src/language/data-io/print-space.c
@@ -1,21 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 2006 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2006, 2009 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 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>
 
@@ -23,6 +20,7 @@
 #include <stdlib.h>
 
 #include <data/procedure.h>
+#include <data/value.h>
 #include <language/command.h>
 #include <language/data-io/data-writer.h>
 #include <language/data-io/file-handle.h>
@@ -41,39 +39,38 @@ struct print_space_trns
   {
     struct dfm_writer *writer;  /* Output data file. */
     struct expression *expr;   /* Number of lines; NULL means 1. */
-  }
-print_space_trns;
+  };
 
 static trns_proc_func print_space_trns_proc;
 static trns_free_func print_space_trns_free;
 
 int
-cmd_print_space (void)
+cmd_print_space (struct lexer *lexer, struct dataset *ds)
 {
   struct print_space_trns *trns;
   struct file_handle *handle;
   struct expression *expr;
   struct dfm_writer *writer;
 
-  if (lex_match_id ("OUTFILE"))
+  if (lex_match_id (lexer, "OUTFILE"))
     {
-      lex_match ('=');
+      lex_match (lexer, '=');
 
-      handle = fh_parse (FH_REF_FILE);
+      handle = fh_parse (lexer, FH_REF_FILE);
       if (handle == NULL)
        return CMD_FAILURE;
-      lex_get ();
+      lex_get (lexer);
     }
   else
     handle = NULL;
 
-  if (token != '.')
+  if (lex_token (lexer) != '.')
     {
-      expr = expr_parse (default_dict, EXPR_NUMBER);
-      if (token != '.')
+      expr = expr_parse (lexer, ds, EXPR_NUMBER);
+      if (lex_token (lexer) != '.')
        {
          expr_free (expr);
-         lex_error (_("expecting end of command"));
+         lex_error (lexer, _("expecting end of command"));
          return CMD_FAILURE;
        }
     }
@@ -83,27 +80,30 @@ cmd_print_space (void)
   if (handle != NULL)
     {
       writer = dfm_open_writer (handle);
-      if (writer == NULL) 
+      if (writer == NULL)
         {
+          fh_unref (handle);
           expr_free (expr);
           return CMD_FAILURE;
-        } 
+        }
     }
   else
     writer = NULL;
-  
+
   trns = xmalloc (sizeof *trns);
   trns->writer = writer;
   trns->expr = expr;
 
-  add_transformation (print_space_trns_proc, print_space_trns_free, trns);
+  add_transformation (ds,
+                     print_space_trns_proc, print_space_trns_free, trns);
+  fh_unref (handle);
   return CMD_SUCCESS;
 }
 
 /* Executes a PRINT SPACE transformation. */
 static int
-print_space_trns_proc (void *t_, struct ccase *c,
-                       int case_num UNUSED)
+print_space_trns_proc (void *t_, struct ccase **c,
+                       casenumber case_num UNUSED)
 {
   struct print_space_trns *trns = t_;
   int n;
@@ -111,8 +111,8 @@ print_space_trns_proc (void *t_, struct ccase *c,
   n = 1;
   if (trns->expr)
     {
-      double f = expr_evaluate_num (trns->expr, c, case_num);
-      if (f == SYSMIS) 
+      double f = expr_evaluate_num (trns->expr, *c, case_num);
+      if (f == SYSMIS)
         msg (SW, _("The expression on PRINT SPACE evaluated to the "
                    "system-missing value."));
       else if (f < 0 || f > INT_MAX)
@@ -125,7 +125,7 @@ print_space_trns_proc (void *t_, struct ccase *c,
     if (trns->writer == NULL)
       som_blank_line ();
     else
-      dfm_put_record (trns->writer, "\n", 1);
+      dfm_put_record (trns->writer, " ", 1);
 
   if (trns->writer != NULL && dfm_write_error (trns->writer))
     return TRNS_ERROR;