X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=1df9411163a5d81b82dc0da670aa702601ac4fa4;hb=a708c1fad686def9790bb06529e3371f4c67bd33;hp=50fe1201f80139d623f9df7013ef58d4296a6b9e;hpb=48386ee68a5283653435d05a9ea4e449710fd370;p=pspp-builds.git
diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index 50fe1201..1df94111 100644
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 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 . */
#include
@@ -23,7 +21,8 @@
#include "intprops.h"
#include "size_max.h"
-#include
+#include
+#include
#include
#include
#include
@@ -73,9 +72,6 @@ struct list_ext
/* Parsed command. */
static struct cmd_list cmd;
-/* Current case number. */
-static int case_idx;
-
/* Line buffer. */
static struct string line_buffer;
@@ -85,11 +81,12 @@ static unsigned n_chars_width (struct outp_driver *d);
static void write_line (struct outp_driver *d, const char *s);
/* Other functions. */
-static bool list_cases (const struct ccase *, void *, const struct dataset *);
+static void list_case (struct ccase *, casenumber case_idx,
+ const struct dataset *);
static void determine_layout (void);
static void clean_up (void);
static void write_header (struct outp_driver *);
-static void write_all_headers (const struct ccase *, void *, const struct dataset*);
+static void write_all_headers (struct casereader *, const struct dataset*);
/* Returns the number of text lines that can fit on the remainder of
the page. */
@@ -116,7 +113,7 @@ static void
write_line (struct outp_driver *d, const char *s)
{
struct outp_text text;
-
+
assert (d->cp_y + d->font_height <= d->length);
text.font = OUTP_FIXED;
text.justification = OUTP_LEFT;
@@ -128,17 +125,21 @@ write_line (struct outp_driver *d, const char *s)
d->cp_x = 0;
d->cp_y += d->font_height;
}
-
+
/* Parses and executes the LIST procedure. */
int
cmd_list (struct lexer *lexer, struct dataset *ds)
{
+ struct dictionary *dict = dataset_dict (ds);
struct variable *casenum_var = NULL;
+ struct casegrouper *grouper;
+ struct casereader *group;
+ casenumber case_idx;
bool ok;
if (!parse_list (lexer, ds, &cmd, NULL))
return CMD_FAILURE;
-
+
/* Fill in defaults. */
if (cmd.step == NOT_LONG)
cmd.step = 1;
@@ -147,7 +148,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
if (cmd.last == NOT_LONG)
cmd.last = LONG_MAX;
if (!cmd.sbc_variables)
- dict_get_vars (dataset_dict (ds), &cmd.v_variables, &cmd.n_variables,
+ dict_get_vars (dict, &cmd.v_variables, &cmd.n_variables,
(1u << DC_SYSTEM) | (1u << DC_SCRATCH));
if (cmd.n_variables == 0)
{
@@ -187,12 +188,12 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
/* Weighting variable. */
if (cmd.weight == LST_WEIGHT)
{
- if (dict_get_weight (dataset_dict (ds)) != NULL)
+ if (dict_get_weight (dict) != NULL)
{
size_t i;
for (i = 0; i < cmd.n_variables; i++)
- if (cmd.v_variables[i] == dict_get_weight (dataset_dict (ds)))
+ if (cmd.v_variables[i] == dict_get_weight (dict))
break;
if (i >= cmd.n_variables)
{
@@ -201,7 +202,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
cmd.v_variables = xnrealloc (cmd.v_variables, cmd.n_variables,
sizeof *cmd.v_variables);
cmd.v_variables[cmd.n_variables - 1]
- = dict_get_weight (dataset_dict (ds));
+ = dict_get_weight (dict);
}
}
else
@@ -229,12 +230,29 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
determine_layout ();
case_idx = 0;
- ok = procedure_with_splits (ds, write_all_headers, list_cases, NULL, NULL);
+ for (grouper = casegrouper_create_splits (proc_open (ds), dict);
+ casegrouper_get_next_group (grouper, &group);
+ casereader_destroy (group))
+ {
+ struct ccase c;
+
+ write_all_headers (group, ds);
+ for (; casereader_read (group, &c); case_destroy (&c))
+ {
+ case_idx++;
+ if (case_idx >= cmd.first && case_idx <= cmd.last
+ && (case_idx - cmd.first) % cmd.step == 0)
+ list_case (&c, case_idx, ds);
+ }
+ }
+ ok = casegrouper_destroy (grouper);
+ ok = proc_commit (ds) && ok;
+
ds_destroy(&line_buffer);
clean_up ();
- var_destroy (casenum_var);
+ var_destroy (casenum_var);
return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
}
@@ -242,11 +260,16 @@ cmd_list (struct lexer *lexer, struct dataset *ds)
/* Writes headers to all devices. This is done at the beginning of
each SPLIT FILE group. */
static void
-write_all_headers (const struct ccase *c, void *aux UNUSED, const struct dataset *ds)
+write_all_headers (struct casereader *input, const struct dataset *ds)
{
struct outp_driver *d;
+ struct ccase c;
+
+ if (!casereader_peek (input, 0, &c))
+ return;
+ output_split_file_values (ds, &c);
+ case_destroy (&c);
- output_split_file_values (ds, c);
for (d = outp_drivers (NULL); d; d = outp_drivers (d))
{
if (!d->class->special)
@@ -257,9 +280,9 @@ write_all_headers (const struct ccase *c, void *aux UNUSED, const struct dataset
else if (d->class == &html_class)
{
struct html_driver_ext *x = d->ext;
-
+
fputs ("\n \n", x->file);
-
+
{
size_t i;
@@ -284,7 +307,7 @@ write_header (struct outp_driver *d)
if (!prc->header_rows)
return;
-
+
if (n_lines_remaining (d) < prc->header_rows + 1)
{
outp_eject_page (d);
@@ -296,7 +319,7 @@ write_header (struct outp_driver *d)
{
size_t i;
size_t x;
-
+
/* Allocate, initialize header. */
prc->header = xnmalloc (prc->header_rows, sizeof *prc->header);
{
@@ -331,7 +354,7 @@ write_header (struct outp_driver *d)
const char *name = var_get_name (v);
size_t name_len = strlen (name);
const struct fmt_spec *print = var_get_print_format (v);
-
+
memset (&prc->header[prc->header_rows - 1][x], '-',
MAX (print->w, (int) name_len));
if ((int) name_len < print->w)
@@ -354,23 +377,23 @@ write_header (struct outp_driver *d)
}
/* Write out the header, in back-to-front order except for the last line. */
- if (prc->header_rows >= 2)
+ if (prc->header_rows >= 2)
{
size_t i;
-
+
for (i = prc->header_rows - 1; i-- != 0; )
- write_line (d, prc->header[i]);
+ write_line (d, prc->header[i]);
}
write_line (d, prc->header[prc->header_rows - 1]);
}
-
-
+
+
/* Frees up all the memory we've allocated. */
static void
clean_up (void)
{
struct outp_driver *d;
-
+
for (d = outp_drivers (NULL); d; d = outp_drivers (d))
if (d->class->special == 0)
{
@@ -396,7 +419,7 @@ clean_up (void)
}
else
NOT_REACHED ();
-
+
free (cmd.v_variables);
}
@@ -408,7 +431,7 @@ write_varname (struct outp_driver *d, char *string, int indent)
{
struct outp_text text;
int width;
-
+
if (d->cp_x + outp_string_width (d, string, OUTP_FIXED) > d->width)
{
d->cp_y += d->font_height;
@@ -434,7 +457,7 @@ static void
write_fallback_headers (struct outp_driver *d)
{
const int max_width = n_chars_width(d) - 10;
-
+
int index = 0;
int width = 0;
int line_number = 0;
@@ -442,7 +465,7 @@ write_fallback_headers (struct outp_driver *d)
const char *Line = _("Line");
char *leader = local_alloc (strlen (Line)
+ INT_STRLEN_BOUND (line_number) + 1 + 1);
-
+
while (index < cmd.n_variables)
{
struct outp_text text;
@@ -451,7 +474,7 @@ write_fallback_headers (struct outp_driver *d)
/* Ensure that there is enough room for a line of text. */
if (d->cp_y + d->font_height > d->length)
outp_eject_page (d);
-
+
/* The leader is a string like `Line 1: '. Write the leader. */
sprintf (leader, "%s %d:", Line, ++line_number);
text.font = OUTP_FIXED;
@@ -481,7 +504,7 @@ write_fallback_headers (struct outp_driver *d)
}
width += var_width;
}
-
+
{
char varname[LONG_NAME_LEN + 2];
snprintf (varname, sizeof varname,
@@ -494,7 +517,7 @@ write_fallback_headers (struct outp_driver *d)
}
d->cp_x = 0;
d->cp_y += d->font_height;
-
+
local_free (leader);
}
@@ -518,11 +541,11 @@ static void
determine_layout (void)
{
struct outp_driver *d;
-
+
/* This is the largest page width of any driver, so we can tell what
size buffer to allocate. */
int largest_page_width = 0;
-
+
for (d = outp_drivers (NULL); d; d = outp_drivers (d))
{
size_t column; /* Current column. */
@@ -534,11 +557,11 @@ determine_layout (void)
if (d->class == &html_class)
continue;
-
+
assert (d->class->special == 0);
outp_open_page (d);
-
+
max_width = n_chars_width (d);
largest_page_width = MAX (largest_page_width, max_width);
@@ -564,7 +587,7 @@ determine_layout (void)
/* Try layout #2. */
for (width = cmd.n_variables - 1, height = 0, column = 0;
column < cmd.n_variables && width <= max_width;
- column++)
+ column++)
{
const struct variable *v = cmd.v_variables[column];
int fmt_width = var_get_print_format (v)->w;
@@ -573,7 +596,7 @@ determine_layout (void)
if (name_len > height)
height = name_len;
}
-
+
/* If it fit then we need to determine how many labels can be
written horizontally. */
if (width <= max_width && height <= SHORT_NAME_LEN)
@@ -600,11 +623,11 @@ determine_layout (void)
/* Finally determine the length of the headers. */
for (prc->header_rows = 0, column = 0;
column < prc->n_vertical;
- column++)
+ column++)
{
const struct variable *var = cmd.v_variables[column];
size_t name_len = strlen (var_get_name (var));
- prc->header_rows = MAX (prc->header_rows, name_len);
+ prc->header_rows = MAX (prc->header_rows, name_len);
}
prc->header_rows++;
continue;
@@ -623,15 +646,11 @@ determine_layout (void)
}
/* Writes case C to output. */
-static bool
-list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds)
+static void
+list_case (struct ccase *c, casenumber case_idx, const struct dataset *ds)
{
+ struct dictionary *dict = dataset_dict (ds);
struct outp_driver *d;
-
- case_idx++;
- if (case_idx < cmd.first || case_idx > cmd.last
- || (cmd.step != 1 && (case_idx - cmd.first) % cmd.step))
- return true;
for (d = outp_drivers (NULL); d; d = outp_drivers (d))
if (d->class->special == 0)
@@ -645,23 +664,23 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds)
ds_put_format(&line_buffer, "%8s: ",
var_get_name (cmd.v_variables[0]));
}
-
-
+
+
for (column = 0; column < cmd.n_variables; column++)
{
const struct variable *v = cmd.v_variables[column];
const struct fmt_spec *print = var_get_print_format (v);
int width;
- if (prc->type == 0 && column >= prc->n_vertical)
+ if (prc->type == 0 && column >= prc->n_vertical)
{
int name_len = strlen (var_get_name (v));
- width = MAX (name_len, print->w);
+ width = MAX (name_len, print->w);
}
else
width = print->w;
- if (width + ds_length(&line_buffer) > max_width &&
+ if (width + ds_length(&line_buffer) > max_width &&
ds_length(&line_buffer) != 0)
{
if (!n_lines_remaining (d))
@@ -669,7 +688,7 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds)
outp_eject_page (d);
write_header (d);
}
-
+
write_line (d, ds_cstr (&line_buffer));
ds_clear(&line_buffer);
@@ -681,28 +700,28 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds)
ds_put_char_multiple(&line_buffer, ' ', width - print->w);
if (fmt_is_string (print->type)
- || dict_contains_var (dataset_dict (ds), v))
+ || dict_contains_var (dict, v))
{
data_out (case_data (c, v), print,
ds_put_uninit (&line_buffer, print->w));
}
- else
+ else
{
union value case_idx_value;
case_idx_value.f = case_idx;
data_out (&case_idx_value, print,
- ds_put_uninit (&line_buffer,print->w));
+ ds_put_uninit (&line_buffer,print->w));
}
ds_put_char(&line_buffer, ' ');
}
-
+
if (!n_lines_remaining (d))
{
outp_eject_page (d);
write_header (d);
}
-
+
write_line (d, ds_cstr (&line_buffer));
ds_clear(&line_buffer);
}
@@ -712,17 +731,17 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds)
int column;
fputs ("
\n", x->file);
-
+
for (column = 0; column < cmd.n_variables; column++)
{
const struct variable *v = cmd.v_variables[column];
const struct fmt_spec *print = var_get_print_format (v);
char buf[256];
-
+
if (fmt_is_string (print->type)
- || dict_contains_var (dataset_dict (ds), v))
+ || dict_contains_var (dict, v))
data_out (case_data (c, v), print, buf);
- else
+ else
{
union value case_idx_value;
case_idx_value.f = case_idx;
@@ -733,16 +752,14 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds)
html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, print->w));
fputs ("\n", x->file);
}
-
+
fputs ("
\n", x->file);
}
else
NOT_REACHED ();
-
- return true;
}
-/*
+/*
Local Variables:
mode: c
End: