X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fprint.c;h=1bbc5ae6f8df07af94ed6cc0cfd94cd9b07ee7f5;hb=d2f8593a1f1d39a3264682af0da898a3d67b68cf;hp=9c4b63b20aa395eecbc2d6e8408d909cea39e767;hpb=bc963dae9be291ea0a7cccf189d13e00d3797cfd;p=pspp diff --git a/src/print.c b/src/print.c index 9c4b63b20a..1bbc5ae6f8 100644 --- a/src/print.c +++ b/src/print.c @@ -17,10 +17,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* FIXME: seems like a lot of code duplication with data-list.c. */ + #include -#include +#include "error.h" #include #include "alloc.h" +#include "case.h" #include "command.h" #include "dfm.h" #include "error.h" @@ -32,8 +35,6 @@ #include "tab.h" #include "var.h" -#include "debug-print.h" - /* Describes what to do when an output field is encountered. */ enum { @@ -102,10 +103,6 @@ static int parse_specs (void); static void dump_table (void); static void append_var_spec (struct prt_out_spec *spec); static void alloc_line (void); - -#if DEBUGGING -void debug_print (void); -#endif /* Basic parsing. */ @@ -113,7 +110,6 @@ void debug_print (void); int cmd_print (void) { - lex_match_id ("PRINT"); return internal_cmd_print (PRT_PRINT); } @@ -121,7 +117,6 @@ cmd_print (void) int cmd_print_eject (void) { - lex_match_id ("EJECT"); return internal_cmd_print (PRT_PRINT | PRT_EJECT); } @@ -129,7 +124,6 @@ cmd_print_eject (void) int cmd_write (void) { - lex_match_id ("WRITE"); return internal_cmd_print (PRT_WRITE); } @@ -192,6 +186,9 @@ internal_cmd_print (int f) if (!parse_specs ()) goto lossage; + if (prt.handle != NULL && !dfm_open_for_writing (prt.handle)) + goto lossage; + /* Output the variable table if requested. */ if (table) dump_table (); @@ -205,10 +202,6 @@ internal_cmd_print (int f) memcpy (trns, &prt, sizeof *trns); add_transformation ((struct trns_header *) trns); -#if 0 && DEBUGGING - debug_print (); -#endif - return CMD_SUCCESS; lossage: @@ -346,7 +339,7 @@ parse_string_argument (void) { fx.spec.type = PRT_CONST; fx.spec.fc = fx.sc - 1; - fx.spec.u.c = xstrdup (ds_value (&tokstr)); + fx.spec.u.c = xstrdup (ds_c_str (&tokstr)); lex_get (); /* Parse the included column range. */ @@ -717,7 +710,7 @@ dump_fmt_list (struct fmt_list * f) static struct fmt_list * fixed_parse_fortran (void) { - struct fmt_list *head; + struct fmt_list *head = NULL; struct fmt_list *fl = NULL; lex_get (); /* skip opening parenthesis */ @@ -785,7 +778,6 @@ static void dump_table (void) { struct prt_out_spec *spec; - const char *filename; struct tab_table *t; int recno; int nspec; @@ -839,13 +831,12 @@ dump_table (void) assert (0); } - filename = fh_handle_name (prt.handle); - tab_title (t, 1, (prt.handle != NULL - ? _("Writing %3d records to file %s.") - : _("Writing %3d records to the listing file.")), - recno, filename); + if (prt.handle != NULL) + tab_title (t, 1, _("Writing %d record(s) to file %s."), + recno, handle_get_filename (prt.handle)); + else + tab_title (t, 1, _("Writing %d record(s) to the listing file."), recno); tab_submit (t); - fh_handle_name (NULL); } /* PORTME: The number of characters in a line terminator. */ @@ -886,8 +877,9 @@ alloc_line (void) pot_w = i->fc + 1; break; case PRT_ERROR: + default: assert (0); - break; + abort (); } if (pot_w > w) w = pot_w; @@ -935,7 +927,7 @@ print_trns_proc (struct trns_header * trns, struct ccase * c, else { if ((t->options & PRT_CMD_MASK) == PRT_PRINT - || t->handle->mode != FH_MD_BINARY) + || handle_get_mode (t->handle) != MODE_BINARY) { /* PORTME: Line ends. */ #ifdef __MSDOS__ @@ -959,7 +951,7 @@ print_trns_proc (struct trns_header * trns, struct ccase * c, break; case PRT_VAR: - data_out (&buf[i->fc], &i->u.v.f, &c->data[i->u.v.v->fv]); + data_out (&buf[i->fc], &i->u.v.f, case_data (c, i->u.v.v->fv)); len = i->fc + i->u.v.f.w; break; @@ -1026,23 +1018,12 @@ cmd_print_space (void) struct file_handle *handle; struct expression *e; - lex_match_id ("SPACE"); if (lex_match_id ("OUTFILE")) { lex_match ('='); - if (token == T_ID) - handle = fh_get_handle_by_name (tokid); - else if (token == T_STRING) - handle = fh_get_handle_by_filename (tokid); - else - { - msg (SE, _("A file name or handle was expected in the " - "OUTFILE subcommand.")); - return CMD_FAILURE; - } - - if (!handle) + handle = fh_parse_file_handle (); + if (handle == NULL) return CMD_FAILURE; lex_get (); } @@ -1051,7 +1032,7 @@ cmd_print_space (void) if (token != '.') { - e = expr_parse (PXP_NUMERIC); + e = expr_parse (EXPR_NUMERIC); if (token != '.') { expr_free (e); @@ -1062,6 +1043,12 @@ cmd_print_space (void) else e = NULL; + if (handle != NULL && !dfm_open_for_writing (handle)) + { + expr_free (e); + return CMD_FAILURE; + } + t = xmalloc (sizeof *t); t->h.proc = print_space_trns_proc; if (e) @@ -1126,45 +1113,3 @@ print_space_trns_free (struct trns_header * trns) { expr_free (((struct print_space_trns *) trns)->e); } - -/* Debugging code. */ - -#if 0 && DEBUGGING -void -debug_print (void) -{ - struct prt_out_spec *p; - - if (prt.handle == NULL) - { - printf ("PRINT"); - if (prt.eject) - printf (" EJECT"); - } - else - printf ("WRITE OUTFILE=%s", handle_name (prt.handle)); - printf (" MAX_WIDTH=%d", prt.max_width); - printf (" /"); - for (p = prt.spec; p; p = p->next) - switch (p->type) - { - case PRT_ERROR: - printf (_("")); - break; - case PRT_NEWLINE: - printf ("\n /"); - break; - case PRT_CONST: - printf (" \"%s\" %d-%d", p->u.c, p->fc + 1, p->fc + strlen (p->u.c)); - break; - case PRT_VAR: - printf (" %s %d %d-%d (%s)", p->u.v.v->name, p->u.v.v->fv, p->fc + 1, - p->fc + p->u.v.v->print.w, fmt_to_string (&p->u.v.v->print)); - break; - case PRT_SPACE: - printf (" \" \" %d", p->fc + 1); - break; - } - printf (".\n"); -} -#endif /* DEBUGGING */