X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fprint-space.c;h=f077e9c39573e30760303704d0c356e95895bbf7;hb=510cc9dd9baf3108ba55cfb7893384517c9930b4;hp=adeb92ba5b656f7391dd75bc1736469d59c00dd7;hpb=2814862a2c45a39f9822cf4c64ca3884822d064d;p=pspp diff --git a/src/language/data-io/print-space.c b/src/language/data-io/print-space.c index adeb92ba5b..f077e9c395 100644 --- a/src/language/data-io/print-space.c +++ b/src/language/data-io/print-space.c @@ -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" @@ -77,7 +77,7 @@ cmd_print_space (struct lexer *lexer, struct dataset *ds) if (lex_token (lexer) != T_ENDCMD) { - expr = expr_parse (lexer, ds, EXPR_NUMBER); + expr = expr_parse (lexer, NULL, ds, VAL_NUMERIC); if (lex_token (lexer) != T_ENDCMD) { lex_error (lexer, _("expecting end of command")); @@ -124,17 +124,17 @@ 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); /* XXX */