projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite formatted data input routines to conform to SPSS data formats
[pspp-builds.git]
/
src
/
language
/
utilities
/
set.q
diff --git
a/src/language/utilities/set.q
b/src/language/utilities/set.q
index ed7bbbf74fa77a1a2743070ba218083ba5caa95f..8a79b1947e3f1491874492d79a570b42d6c16f46 100644
(file)
--- a/
src/language/utilities/set.q
+++ b/
src/language/utilities/set.q
@@
-24,6
+24,7
@@
#include <stdlib.h>
#include <time.h>
#include <stdlib.h>
#include <time.h>
+#include <data/data-in.h>
#include <data/data-out.h>
#include <data/dictionary.h>
#include <data/format.h>
#include <data/data-out.h>
#include <data/dictionary.h>
#include <data/format.h>
@@
-102,6
+103,8
@@
int tgetnum (const char *);
printback=prtbck:on/off;
prompt=string;
results=res:on/off/terminal/listing/both/on/none/off;
printback=prtbck:on/off;
prompt=string;
results=res:on/off/terminal/listing/both/on/none/off;
+ rib=rib:msbfirst/lsbfirst/vax/native;
+ rrb=rrb:native/isl/isb/idl/idb/vf/vd/vg/zs/zl;
safer=safe:on;
scompression=scompress:on/off;
scripttab=string "x==1" "one character long";
safer=safe:on;
scompression=scompress:on/off;
scripttab=string "x==1" "one character long";
@@
-177,6
+180,10
@@
cmd_set (struct lexer *lexer, struct dataset *ds)
set_mxwarns (cmd.n_mxwarns[0]);
if (cmd.sbc_nulline)
set_nulline (cmd.null == STC_ON);
set_mxwarns (cmd.n_mxwarns[0]);
if (cmd.sbc_nulline)
set_nulline (cmd.null == STC_ON);
+ if (cmd.sbc_rib)
+ data_in_set_integer_format (stc_to_integer_format (cmd.rib));
+ if (cmd.sbc_rrb)
+ data_in_set_float_format (stc_to_float_format (cmd.rrb));
if (cmd.sbc_safer)
set_safer_mode ();
if (cmd.sbc_scompression)
if (cmd.sbc_safer)
set_safer_mode ();
if (cmd.sbc_scompression)
@@
-730,6
+737,18
@@
show_float_format (const char *setting, enum float_format float_format)
float_format == FLOAT_NATIVE_DOUBLE ? "NATIVE" : "nonnative");
}
float_format == FLOAT_NATIVE_DOUBLE ? "NATIVE" : "nonnative");
}
+static void
+show_rib (const struct dataset *ds UNUSED)
+{
+ show_integer_format ("RIB", data_in_get_integer_format ());
+}
+
+static void
+show_rrb (const struct dataset *ds UNUSED)
+{
+ show_float_format ("RRB", data_in_get_float_format ());
+}
+
static void
show_scompression (const struct dataset *ds UNUSED)
{
static void
show_scompression (const struct dataset *ds UNUSED)
{
@@
-798,6
+817,8
@@
const struct show_sbc show_table[] =
{"MXERRS", show_mxerrs},
{"MXLOOPS", show_mxloops},
{"MXWARNS", show_mxwarns},
{"MXERRS", show_mxerrs},
{"MXLOOPS", show_mxloops},
{"MXWARNS", show_mxwarns},
+ {"RIB", show_rib},
+ {"RRB", show_rrb},
{"SCOMPRESSION", show_scompression},
{"UNDEFINED", show_undefined},
{"WEIGHT", show_weight},
{"SCOMPRESSION", show_scompression},
{"UNDEFINED", show_undefined},
{"WEIGHT", show_weight},