Clean up how transformations work.

[pspp] / 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 b7245e629bdc2c551efe30950434cacee9877127..b908927bdf6415438542a708f92050761575b9e0 100644 (file)
--- a/src/language/data-io/print-space.c
+++ b/src/language/data-io/print-space.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010, 2011, 2012 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
@@ -27,7 +27,7 @@
 #include "language/expressions/public.h"
 #include "language/lexer/lexer.h"
 #include "libpspp/message.h"
-#include "output/text-item.h"
+#include "output/driver.h"
 
 #include "gl/xalloc.h"
 
@@ -41,16 +41,16 @@ struct print_space_trns
     struct expression *expr;   /* Number of lines; NULL means 1. */
   };
 
-static trns_proc_func print_space_trns_proc;
-static trns_free_func print_space_trns_free;
+static const struct trns_class print_space_class;
 
 int
 cmd_print_space (struct lexer *lexer, struct dataset *ds)
 {
   struct print_space_trns *trns;
-  struct file_handle *handle;
-  struct expression *expr;
+  struct file_handle *handle = NULL;
+  struct expression *expr = NULL;
   struct dfm_writer *writer;
+  char *encoding = NULL;
 
   if (lex_match_id (lexer, "OUTFILE"))
     {
@@ -59,18 +59,28 @@ cmd_print_space (struct lexer *lexer, struct dataset *ds)
       handle = fh_parse (lexer, FH_REF_FILE, NULL);
       if (handle == NULL)
        return CMD_FAILURE;
+
+      if (lex_match_id (lexer, "ENCODING"))
+       {
+         lex_match (lexer, T_EQUALS);
+         if (!lex_force_string (lexer))
+           goto error;
+
+          encoding = ss_xstrdup (lex_tokss (lexer));
+
+         lex_get (lexer);
+       }
     }
   else
     handle = NULL;
 
   if (lex_token (lexer) != T_ENDCMD)
     {
-      expr = expr_parse (lexer, ds, EXPR_NUMBER);
+      expr = expr_parse (lexer, ds, VAL_NUMERIC);
       if (lex_token (lexer) != T_ENDCMD)
        {
-         expr_free (expr);
-         lex_error (lexer, _("expecting end of command"));
-         return CMD_FAILURE;
+          lex_error (lexer, _("expecting end of command"));
+          goto error;
        }
     }
   else
@@ -78,13 +88,9 @@ cmd_print_space (struct lexer *lexer, struct dataset *ds)
 
   if (handle != NULL)
     {
-      writer = dfm_open_writer (handle);
+      writer = dfm_open_writer (handle, encoding);
       if (writer == NULL)
-        {
-          fh_unref (handle);
-          expr_free (expr);
-          return CMD_FAILURE;
-        }
+        goto error;
     }
   else
     writer = NULL;
@@ -93,14 +99,18 @@ cmd_print_space (struct lexer *lexer, struct dataset *ds)
   trns->writer = writer;
   trns->expr = expr;
 
-  add_transformation (ds,
-                     print_space_trns_proc, print_space_trns_free, trns);
+  add_transformation (ds, &print_space_class, trns);
   fh_unref (handle);
   return CMD_SUCCESS;
+
+error:
+  fh_unref (handle);
+  expr_free (expr);
+  return CMD_FAILURE;
 }
 
 /* Executes a PRINT SPACE transformation. */
-static int
+static enum trns_result
 print_space_trns_proc (void *t_, struct ccase **c,
                        casenumber case_num UNUSED)
 {
@@ -112,19 +122,19 @@ print_space_trns_proc (void *t_, struct ccase **c,
     {
       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."));
+        msg (SW, _("The expression on %s evaluated to the "
+                   "system-missing value."), "PRINT SPACE");
       else if (f < 0 || f > INT_MAX)
-        msg (SW, _("The expression on PRINT SPACE evaluated to %g."), f);
+        msg (SW, _("The expression on %s evaluated to %g."), "PRINT SPACE", f);
       else
         n = f;
     }
 
   while (n--)
     if (trns->writer == NULL)
-      text_item_submit (text_item_create (TEXT_ITEM_BLANK_LINE, ""));
+      output_log ("%s", "");
     else
-      dfm_put_record (trns->writer, " ", 1);
+      dfm_put_record (trns->writer, " ", 1); /* XXX */
 
   if (trns->writer != NULL && dfm_write_error (trns->writer))
     return TRNS_ERROR;
@@ -142,3 +152,9 @@ print_space_trns_free (void *trns_)
   free (trns);
   return ok;
 }
+
+static const struct trns_class print_space_class = {
+  .name = "PRINT SPACE",
+  .execute = print_space_trns_proc,
+  .destroy = print_space_trns_free,
+};