/* PSPP - a program for statistical analysis.
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 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 <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <output/table-provider.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "output/table-provider.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
static struct table_select *
table_select_cast (const struct table *table)
{
- assert (table->class == &table_select_class);
+ assert (table->klass == &table_select_class);
return UP_CAST (table, struct table_select, table);
}
&& rect[TABLE_VERT][1] == subtable->n[TABLE_VERT])
return subtable;
- if (!table_is_shared (subtable) && subtable->class->select != NULL)
+ if (!table_is_shared (subtable) && subtable->klass->select != NULL)
{
- struct table *selected = subtable->class->select (subtable, rect);
+ struct table *selected = subtable->klass->select (subtable, rect);
if (selected != NULL)
return selected;
}
if (add_headers)
{
- if (z0 == subtable->h[axis][0] && z1 == subtable->h[axis][1])
+ if (z0 == subtable->h[axis][0]
+ && z1 == subtable->n[axis] - subtable->h[axis][1])
return subtable;
if (subtable->h[axis][0])