X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2FPSPP.xs;h=077bf581f0031cfe27332efbbf54c2dbec6e04a3;hb=refs%2Fheads%2Fctables10;hp=ea2907ffe9b68ca7a69a43291b26a9c57af42ba6;hpb=8d6bfdd2a100bf8166b3b0b3f006d46f3e7a59e9;p=pspp
diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs
index ea2907ffe9..077bf581f0 100644
--- a/perl-module/PSPP.xs
+++ b/perl-module/PSPP.xs
@@ -1,21 +1,19 @@
/* PSPP - computes sample statistics.
- Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+ 2020 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
-
+ along with this program. If not, see . */
#undef VERSION
#include
@@ -141,7 +139,7 @@ scalar_to_value (union value *val, SV *scalar, const struct variable *var)
const char *p = SvPV (scalar, len);
int width = var_get_width (var);
value_set_missing (val, width);
- memcpy (value_str_rw (val, width), p, len);
+ memcpy (val->s, p, len);
}
}
@@ -151,7 +149,7 @@ value_to_scalar (const union value *val, const struct variable *var)
{
if ( var_is_numeric (var))
{
- if ( var_is_value_missing (var, val, MV_SYSTEM))
+ if (var_is_value_missing (var, val) == MV_SYSTEM)
return newSVpvn ("", 0);
return newSVnv (val->f);
@@ -159,7 +157,7 @@ value_to_scalar (const union value *val, const struct variable *var)
else
{
int width = var_get_width (var);
- return newSVpvn (value_str (val, width), width);
+ return newSVpvn ((char *) val->s, width);
}
}
@@ -210,7 +208,8 @@ CODE:
assert (0 == strncmp (ver, bare_version, strlen (ver)));
i18n_init ();
- msg_set_handler (message_handler, NULL);
+const struct msg_handler mh = { .output_msg = message_handler };
+ msg_set_handler (&mh);
settings_init ();
fh_init ();
@@ -224,7 +223,7 @@ CODE:
union value uv;
char *s;
make_value_from_scalar (&uv, val, var);
- s = data_out (&uv, var_get_encoding (var), fmt);
+ s = data_out (&uv, var_get_encoding (var), fmt, settings_get_fmt_settings ());
value_destroy (&uv, var_get_width (var));
ret = newSVpv (s, fmt->w);
free (s);
@@ -241,7 +240,7 @@ CODE:
union value uv;
int ret;
make_value_from_scalar (&uv, val, var);
- ret = var_is_value_missing (var, &uv, MV_ANY);
+ ret = var_is_value_missing (var, &uv) != 0;
value_destroy (&uv, var_get_width (var));
RETVAL = ret;
OUTPUT:
@@ -282,7 +281,7 @@ int
get_var_cnt (dict)
struct pspp_dict *dict
CODE:
- RETVAL = dict_get_var_cnt (dict->dict);
+ RETVAL = dict_get_n_vars (dict->dict);
OUTPUT:
RETVAL
@@ -331,7 +330,7 @@ pxs_get_variable (dict, idx)
INIT:
SV *errstr = get_sv("PSPP::errstr", TRUE);
sv_setpv (errstr, "");
- if ( SvIV (idx) >= dict_get_var_cnt (dict->dict))
+ if ( SvIV (idx) >= dict_get_n_vars (dict->dict))
{
sv_setpv (errstr, "The dictionary doesn't have that many variables.");
XSRETURN_UNDEF;
@@ -379,7 +378,7 @@ CODE:
struct input_format *input_format;
struct variable *v;
- op_fmt = fmt_for_output_from_input (&ip_fmt);
+ op_fmt = fmt_for_output_from_input (&ip_fmt, settings_get_fmt_settings ());
v = dict_create_var (dict->dict, name,
fmt_is_string (op_fmt.type) ? op_fmt.w : 0);
if ( NULL == v )
@@ -412,12 +411,15 @@ INIT:
croak ("No more than 3 missing values are permitted");
for (i = 0; i < items - 1; ++i)
- scalar_to_value (&val[i], ST(i+1), var);
+ make_value_from_scalar (&val[i], ST(i+1), var);
CODE:
struct missing_values mv;
mv_init (&mv, var_get_width (var));
for (i = 0 ; i < items - 1; ++i )
- mv_add_value (&mv, &val[i]);
+ {
+ mv_add_value (&mv, &val[i]);
+ value_destroy (&val[i], var_get_width (var));
+ }
var_set_missing_values (var, &mv);
@@ -589,7 +591,6 @@ get_value_labels (var)
CODE:
HV *labelhash = (HV *) sv_2mortal ((SV *) newHV());
const struct val_lab *vl;
- struct val_labs_iterator *viter = NULL;
const struct val_labs *labels = var_get_value_labels (var);
if ( labels )
@@ -648,7 +649,7 @@ CODE:
swi->opened = true;
swi->dict_sv = dict_sv;
SvREFCNT_inc (swi->dict_sv);
-
+
RETVAL = swi;
OUTPUT:
RETVAL
@@ -687,9 +688,8 @@ CODE:
const struct variable **vv;
size_t nv;
struct ccase *c;
- SV *sv;
- if ( av_len (av_case) >= dict_get_var_cnt (swi->dict->dict))
+ if ( av_len (av_case) >= dict_get_n_vars (swi->dict->dict))
XSRETURN_UNDEF;
c = case_create (dict_get_proto (swi->dict->dict));
@@ -697,40 +697,41 @@ CODE:
dict_get_vars (swi->dict->dict, &vv, &nv,
1u << DC_ORDINARY | 1u << DC_SYSTEM);
- for (sv = av_shift (av_case); SvOK (sv); sv = av_shift (av_case))
- {
+ for (SV *sv = av_shift (av_case); SvOK (sv); sv = av_shift (av_case))
+ {
const struct variable *v = vv[i++];
const struct fmt_spec *ifmt = find_input_format (swi->dict, v);
/* If an input format has been set, then use it.
- Otherwise just convert the raw value.
- */
- if ( ifmt )
+ Otherwise just convert the raw value. */
+ if (ifmt)
{
- struct substring ss = ss_cstr (SvPV_nolen (sv));
- char *error;
- bool ok;
-
- error = data_in (ss, SvUTF8(sv) ? UTF8: "iso-8859-1", ifmt->type,
- case_data_rw (c, v), var_get_width (v),
- dict_get_encoding (swi->dict->dict));
- ok = error == NULL;
- free (error);
-
- if ( !ok )
- {
- RETVAL = 0;
- goto finish;
- }
+ struct substring ss = ss_cstr (SvPV_nolen (sv));
+ char *error = data_in (ss,
+ SvUTF8(sv) ? UTF8: "iso-8859-1",
+ ifmt->type,
+ settings_get_fmt_settings (),
+ case_data_rw (c, v),
+ var_get_width (v),
+ dict_get_encoding (swi->dict->dict));
+ if (error)
+ {
+ free (error);
+ RETVAL = 0;
+ SvREFCNT_dec_NN (sv);
+ case_unref (c);
+ goto finish;
+ }
}
else
{
- scalar_to_value (case_data_rw (c, v), sv, v);
+ scalar_to_value (case_data_rw (c, v), sv, v);
}
- }
+ SvREFCNT_dec_NN (sv);
+ }
/* The remaining variables must be sysmis or blank string */
- while (i < dict_get_var_cnt (swi->dict->dict))
+ while (i < dict_get_n_vars (swi->dict->dict))
{
const struct variable *v = vv[i++];
union value *val = case_data_rw (c, v);
@@ -752,7 +753,6 @@ struct sysreader_info *
pxs_open_sysfile (name)
char * name
CODE:
- struct casereader *reader;
struct sysreader_info *sri = NULL;
struct file_handle *fh =
fh_create_file (NULL, name, "UTF-8", fh_default_properties () );
@@ -786,10 +786,10 @@ get_case_cnt (sfr)
struct sysreader_info *sfr;
CODE:
SV *ret;
- casenumber n = casereader_get_case_cnt (sfr->reader);
+ casenumber n = casereader_get_n_cases (sfr->reader);
if (n == CASENUMBER_MAX)
ret = &PL_sv_undef;
- else
+ else
ret = newSViv (n);
RETVAL = ret;
OUTPUT:
@@ -807,8 +807,8 @@ PPCODE:
{
int v;
- EXTEND (SP, dict_get_var_cnt (sfr->dict->dict));
- for (v = 0; v < dict_get_var_cnt (sfr->dict->dict); ++v )
+ EXTEND (SP, dict_get_n_vars (sfr->dict->dict));
+ for (v = 0; v < dict_get_n_vars (sfr->dict->dict); ++v )
{
const struct variable *var = dict_get_var (sfr->dict->dict, v);
const union value *val = case_data (c, var);