/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2009, 2011 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
#include <config.h>
-#include <data/casewriter.h>
-#include <data/casewriter-provider.h>
+#include "data/casewriter.h"
+#include "data/casewriter-provider.h"
#include <assert.h>
#include <stdlib.h>
-#include <data/casereader.h>
-#include <data/casereader-provider.h>
-#include <data/casewindow.h>
-#include <data/settings.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/taint.h>
+#include "data/casereader.h"
+#include "data/casereader-provider.h"
+#include "data/casewindow.h"
+#include "data/settings.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/taint.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
/* A casewriter. */
struct casewriter
{
struct taint *taint;
struct caseproto *proto;
- casenumber case_cnt;
+ casenumber n_cases;
const struct casewriter_class *class;
void *aux;
};
casewriter_write (struct casewriter *writer, struct ccase *c)
{
size_t n_widths UNUSED = caseproto_get_n_widths (writer->proto);
- assert (case_get_value_cnt (c) >= n_widths);
+ assert (case_get_n_values (c) >= n_widths);
expensive_assert (caseproto_equal (case_get_proto (c), 0,
writer->proto, 0, n_widths));
writer->class->write (writer, writer->aux, c);
{
struct casereader *reader = writer->class->convert_to_reader (writer, writer->aux);
taint_propagate (writer->taint, casereader_get_taint (reader));
+
+ caseproto_unref (writer->proto);
taint_destroy (writer->taint);
free (writer);
return reader;
struct casewriter *writer = xmalloc (sizeof *writer);
writer->taint = taint_create ();
writer->proto = caseproto_ref (proto);
- writer->case_cnt = 0;
+ writer->n_cases = 0;
writer->class = class;
writer->aux = aux;
return writer;
struct casewindow *window = window_;
struct casereader *reader =
casereader_create_random (casewindow_get_proto (window),
- casewindow_get_case_cnt (window),
+ casewindow_get_n_cases (window),
&casereader_window_class, window);
taint_propagate (casewindow_get_taint (window),
casenumber offset)
{
struct casewindow *window = window_;
- if (offset >= casewindow_get_case_cnt (window))
+ if (offset >= casewindow_get_n_cases (window))
return NULL;
return casewindow_get_case (window, offset);
}
/* Discards CASE_CNT cases from the front of WINDOW. */
static void
casereader_window_advance (struct casereader *reader UNUSED, void *window_,
- casenumber case_cnt)
+ casenumber n_cases)
{
struct casewindow *window = window_;
- casewindow_pop_tail (window, case_cnt);
+ casewindow_pop_tail (window, n_cases);
}
/* Class for casewindow writer. */