X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2FPSPP.xs;h=8800d0bdf4e0e87cbba8f89ec872029181395f59;hb=cf039918a493868e3b777575b2bc504c3adbb9d5;hp=7577b7ad2c7be4d54b37fad06013aca3d6be0332;hpb=63c7521729b947ace9e192dff9330813ecfb5812;p=pspp
diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs
index 7577b7ad2c..8800d0bdf4 100644
--- a/perl-module/PSPP.xs
+++ b/perl-module/PSPP.xs
@@ -1,22 +1,20 @@
/* PSPP - computes sample statistics.
Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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
/* The Gnulib "strftime" module defines my_strftime in for use by
@@ -32,6 +30,8 @@
#include "ppport.h"
#include "minmax.h"
+#include
+#include
#include
#include
#include
@@ -138,7 +138,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);
}
}
@@ -156,7 +156,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 (val->s, width);
}
}
@@ -271,7 +271,7 @@ CODE:
free (input_format);
}
hmap_destroy (&dict->input_formats);
- dict_destroy (dict->dict);
+ dict_unref (dict->dict);
free (dict);
}
@@ -409,12 +409,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);
@@ -586,7 +589,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 )
@@ -638,14 +640,14 @@ INIT:
}
CODE:
struct file_handle *fh =
- fh_create_file (NULL, name, fh_default_properties () );
+ fh_create_file (NULL, name, "UTF-8", fh_default_properties () );
struct syswriter_info *swi = xmalloc (sizeof (*swi));
swi->writer = sfm_open_writer (fh, dict->dict, opts);
swi->dict = dict;
swi->opened = true;
swi->dict_sv = dict_sv;
SvREFCNT_inc (swi->dict_sv);
-
+
RETVAL = swi;
OUTPUT:
RETVAL
@@ -749,10 +751,9 @@ 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, fh_default_properties () );
+ fh_create_file (NULL, name, "UTF-8", fh_default_properties () );
struct dictionary *dict;
sri = xmalloc (sizeof (*sri));
@@ -786,7 +787,7 @@ CODE:
casenumber n = casereader_get_case_cnt (sfr->reader);
if (n == CASENUMBER_MAX)
ret = &PL_sv_undef;
- else
+ else
ret = newSViv (n);
RETVAL = ret;
OUTPUT: