projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve VECTOR implementation.
[pspp-builds.git]
/
src
/
output
/
table.c
diff --git
a/src/output/table.c
b/src/output/table.c
index 461a2d843a57312e5c0df5765ff41e0d341c99ab..d488f3aa68b60e590709b442cc79e3e433d620c4 100644
(file)
--- a/
src/output/table.c
+++ b/
src/output/table.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
+ 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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-18,27
+17,33
@@
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include "table.h"
#include "table.h"
+
#include <ctype.h>
#include <stdarg.h>
#include <limits.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h>
#include <limits.h>
#include <stdlib.h>
+
+#include "output.h"
+#include "manager.h"
+
+#include <data/data-out.h>
+#include <data/format.h>
+#include <data/value.h>
#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
-#include <data/format.h>
#include <libpspp/magic.h>
#include <libpspp/misc.h>
#include <libpspp/magic.h>
#include <libpspp/misc.h>
-#include "minmax.h"
-#include "output.h"
#include <libpspp/pool.h>
#include <libpspp/pool.h>
-#include "manager.h"
-#include
<data/variable.h>
+
+#include
"minmax.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
\f
#include "gettext.h"
#define _(msgid) gettext (msgid)
\f
-struct som_table_class tab_table_class;
+
const
struct som_table_class tab_table_class;
static char *command_name;
/* Returns the font to use for a cell with the given OPTIONS. */
static char *command_name;
/* Returns the font to use for a cell with the given OPTIONS. */
@@
-136,8
+141,8
@@
tab_realloc (struct tab_table *t, int nc, int nr)
if (nc > t->cf)
{
if (nc > t->cf)
{
- int mr1 =
min
(nr, t->nr);
- int mc1 =
min
(nc, t->nc);
+ int mr1 =
MIN
(nr, t->nr);
+ int mc1 =
MIN
(nc, t->nc);
struct substring *new_cc;
unsigned char *new_ct;
struct substring *new_cc;
unsigned char *new_ct;
@@
-269,7
+274,7
@@
tab_hline (struct tab_table * t, int style, int x1, int x2, int y)
y += t->row_ofs;
assert (y >= 0);
y += t->row_ofs;
assert (y >= 0);
- assert (y < t->nr);
+ assert (y <
=
t->nr);
assert (x2 >= x1 );
assert (x1 >= 0 );
assert (x2 < t->nc);
assert (x2 >= x1 );
assert (x1 >= 0 );
assert (x2 < t->nc);
@@
-536,7
+541,7
@@
tab_value (struct tab_table *table, int c, int r, unsigned char opt,
table->cc[c + r * table->cf] = ss_buffer (contents, f->w);
table->ct[c + r * table->cf] = opt;
table->cc[c + r * table->cf] = ss_buffer (contents, f->w);
table->ct[c + r * table->cf] = opt;
- data_out (
contents, f, v
);
+ data_out (
v, f, contents
);
}
/* Sets cell (C,R) in TABLE, with options OPT, to have value VAL
}
/* Sets cell (C,R) in TABLE, with options OPT, to have value VAL
@@
-558,7
+563,7
@@
tab_float (struct tab_table *table, int c, int r, unsigned char opt,
assert (r >= 0);
assert (r < table->nr);
assert (r >= 0);
assert (r < table->nr);
- f =
make_output_forma
t (FMT_F, w, d);
+ f =
fmt_for_outpu
t (FMT_F, w, d);
#if DEBUGGING
if (c + table->col_ofs < 0 || r + table->row_ofs < 0
#if DEBUGGING
if (c + table->col_ofs < 0 || r + table->row_ofs < 0
@@
-575,7
+580,7
@@
tab_float (struct tab_table *table, int c, int r, unsigned char opt,
#endif
double_value.f = val;
#endif
double_value.f = val;
- data_out (
buf, &f, &double_value
);
+ data_out (
&double_value, &f, buf
);
cp = buf;
while (isspace ((unsigned char) *cp) && cp < &buf[w])
cp = buf;
while (isspace ((unsigned char) *cp) && cp < &buf[w])
@@
-1220,7
+1225,7
@@
tabi_render (int c0, int r0, int c1, int r1)
y = render_rows (y, c0, c1, (t->nr - t->b) * 2, t->nr * 2 + 1);
}
y = render_rows (y, c0, c1, (t->nr - t->b) * 2, t->nr * 2 + 1);
}
-struct som_table_class tab_table_class =
+
const
struct som_table_class tab_table_class =
{
tabi_table,
tabi_driver,
{
tabi_table,
tabi_driver,