02110-1301, USA. */
#include <config.h>
-#include "message.h"
+
#include <stdlib.h>
#include <ctype.h>
#include <float.h>
-#include "array.h"
-#include "alloc.h"
-#include "case.h"
-#include "command.h"
-#include "compiler.h"
-#include "data-in.h"
-#include "data-reader.h"
-#include "dictionary.h"
-#include "message.h"
-#include "file-handle.h"
-#include "lexer.h"
-#include "misc.h"
-#include "pool.h"
-#include "str.h"
-#include "variable.h"
-#include "procedure.h"
+
+#include <data/case-source.h>
+#include <data/case.h>
+#include <data/data-in.h>
+#include <data/dictionary.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/data-io/data-reader.h>
+#include <language/data-io/file-handle.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/array.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
+#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include "debug-print.h"
-
/* FIXME: /N subcommand not implemented. It should be pretty simple,
too. */
if (mx->fmt != FREE
&& !force_eol (mx->reader, content_names[content]))
return 0;
- debug_printf (("\n"));
}
if (mx->section == LOWER)
size_t factor;
for (factor = 0; factor < mx->n_factors; factor++)
- {
- case_data_rw (c, mx->factors[factor]->fv)->f
- = nr->factor_values[factor + cell * mx->n_factors];
- debug_printf (("f:%s ", mx->factors[factor]->name));
- }
+ case_data_rw (c, mx->factors[factor]->fv)->f
+ = nr->factor_values[factor + cell * mx->n_factors];
}
{
}
c->n_rows[wr->content]++;
- debug_printf ((" (c=%p,r=%d,n=%d)", c, n_rows + 1, n_cols));
-
/* Read N_COLS items at CP. */
{
int j;
if (mx->fmt != FREE
&& !force_eol (mx->reader, content_names[wr->content]))
return 0;
- debug_printf (("\n"));
}
return 1;