X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2FPSPP.xs;h=005047f2553f312f21eaca0c87ecc891563de56c;hb=dd6375ffc15396d7afa60a6db16042201c8f871b;hp=36300cc806daa17d022c71d49473108f0834b5f2;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs index 36300cc806..005047f255 100644 --- a/perl-module/PSPP.xs +++ b/perl-module/PSPP.xs @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 @@ -17,24 +17,34 @@ 02110-1301, USA. */ +#include + +/* The Gnulib "strftime" module defines my_strftime in for use by + gl/strftime.c. Perl also defines my_strftime in embed.h for some other + purpose. The former definition doesn't matter in this file, so suppress it + to avoid a compiler warning. */ +#undef my_strftime + #include "EXTERN.h" #include "perl.h" #include "XSUB.h" -#include - #include "ppport.h" #include "minmax.h" #include #include +#include #include #include #include #include +#include #include #include #include +#include +#include #include #include #include @@ -50,7 +60,7 @@ typedef struct fmt_spec output_format ; /* A thin wrapper around sfm_writer */ -struct sysfile_info +struct syswriter_info { bool opened; @@ -81,22 +91,22 @@ struct sysreader_info /* A message handler which writes messages to PSPP::errstr */ static void -message_handler (const struct msg *m) +message_handler (const struct msg *m, void *aux) { SV *errstr = get_sv("PSPP::errstr", TRUE); sv_setpv (errstr, m->text); } static int -sysfile_close (struct sysfile_info *sfi) +sysfile_close (struct syswriter_info *swi) { int retval ; - if ( ! sfi->opened ) + if ( ! swi->opened ) return 0; - retval = casewriter_destroy (sfi->writer); + retval = casewriter_destroy (swi->writer); if (retval > 0 ) - sfi->opened = false; + swi->opened = false; return retval; } @@ -160,14 +170,20 @@ MODULE = PSPP MODULE = PSPP PACKAGE = PSPP +PROTOTYPES: ENABLE + void onBoot (ver) const char *ver CODE: - assert (0 == strcmp (ver, bare_version)); + /* Check that the version is correct up to the length of 'ver'. + This allows PSPP autobuilders to add a "-build#" suffix to the + PSPP version without causing failures here. */ + assert (0 == strncmp (ver, bare_version, strlen (ver))); + i18n_init (); - msg_init (NULL, message_handler); - settings_init (0, 0); + msg_set_handler (message_handler, NULL); + settings_init (); fh_init (); SV * @@ -177,11 +193,10 @@ format_value (val, var) CODE: SV *ret; const struct fmt_spec *fmt = var_get_print_format (var); - const struct dictionary *dict = var_get_vardict (var)->dict; union value uv; char *s; make_value_from_scalar (&uv, val, var); - s = data_out (&uv, dict_get_encoding (dict), fmt); + s = data_out (&uv, var_get_encoding (var), fmt); value_destroy (&uv, var_get_width (var)); ret = newSVpv (s, fmt->w); free (s); @@ -211,7 +226,7 @@ MODULE = PSPP PACKAGE = PSPP::Dict struct dictionary * pxs_dict_new() CODE: - RETVAL = dict_create (); + RETVAL = dict_create ("UTF-8"); OUTPUT: RETVAL @@ -243,7 +258,7 @@ set_documents (dict, docs) struct dictionary *dict char *docs CODE: - dict_set_documents (dict, docs); + dict_set_documents_string (dict, docs); void @@ -251,7 +266,7 @@ add_document (dict, doc) struct dictionary *dict char *doc CODE: - dict_add_document_line (dict, doc); + dict_add_document_line (dict, doc, false); void @@ -314,7 +329,7 @@ pxs_dict_create_var (dict, name, ip_fmt) INIT: SV *errstr = get_sv("PSPP::errstr", TRUE); sv_setpv (errstr, ""); - if ( ! var_is_plausible_name (name, false)) + if ( ! id_is_plausible (name, false)) { sv_setpv (errstr, "The variable name is not valid."); XSRETURN_UNDEF; @@ -364,7 +379,7 @@ set_label (var, label) struct variable *var; char *label CODE: - var_set_label (var, label); + var_set_label (var, label, false); void @@ -552,14 +567,13 @@ RETVAL MODULE = PSPP PACKAGE = PSPP::Sysfile -struct sysfile_info * -pxs_create_sysfile (name, dict_ref, opts_hr) +struct syswriter_info * +pxs_create_sysfile (name, dict, opts_hr) char *name - SV *dict_ref + struct dictionary *dict; SV *opts_hr INIT: - SV *dict_sv = SvRV (dict_ref); - struct dictionary *dict = (void *) SvIV (dict_sv); + SV *dict_sv = ST(1); struct sfm_write_options opts; if (!SvROK (opts_hr)) { @@ -579,36 +593,36 @@ INIT: CODE: struct file_handle *fh = fh_create_file (NULL, name, fh_default_properties () ); - struct sysfile_info *sfi = xmalloc (sizeof (*sfi)); - sfi->writer = sfm_open_writer (fh, dict, opts); - sfi->dict = dict; - sfi->opened = true; - sfi->dict_sv = dict_sv; - SvREFCNT_inc (sfi->dict_sv); + struct syswriter_info *swi = xmalloc (sizeof (*swi)); + swi->writer = sfm_open_writer (fh, dict, opts); + swi->dict = dict; + swi->opened = true; + swi->dict_sv = dict_sv; + SvREFCNT_inc (swi->dict_sv); - RETVAL = sfi; + RETVAL = swi; OUTPUT: RETVAL int -close (sfi) - struct sysfile_info *sfi +close (swi) + struct syswriter_info *swi CODE: - RETVAL = sysfile_close (sfi); + RETVAL = sysfile_close (swi); OUTPUT: RETVAL void -DESTROY (sfi) - struct sysfile_info *sfi +DESTROY (swi) + struct syswriter_info *swi CODE: - sysfile_close (sfi); - SvREFCNT_dec (sfi->dict_sv); - free (sfi); + sysfile_close (swi); + SvREFCNT_dec (swi->dict_sv); + free (swi); int -append_case (sfi, ccase) - struct sysfile_info *sfi +append_case (swi, ccase) + struct syswriter_info *swi SV *ccase INIT: SV *errstr = get_sv("PSPP::errstr", TRUE); @@ -626,12 +640,12 @@ CODE: struct ccase *c; SV *sv; - if ( av_len (av_case) >= dict_get_var_cnt (sfi->dict)) + if ( av_len (av_case) >= dict_get_var_cnt (swi->dict)) XSRETURN_UNDEF; - c = case_create (dict_get_proto (sfi->dict)); + c = case_create (dict_get_proto (swi->dict)); - dict_get_vars (sfi->dict, &vv, &nv, 1u << DC_ORDINARY | 1u << DC_SYSTEM); + dict_get_vars (swi->dict, &vv, &nv, 1u << DC_ORDINARY | 1u << DC_SYSTEM); for (sv = av_shift (av_case); SvOK (sv); sv = av_shift (av_case)) { @@ -644,10 +658,16 @@ CODE: if ( ifmt ) { struct substring ss = ss_cstr (SvPV_nolen (sv)); - if ( ! data_in (ss, LEGACY_NATIVE, ifmt->type, 0, 0, 0, - sfi->dict, - case_data_rw (c, v), - var_get_width (v)) ) + 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)); + ok = error == NULL; + free (error); + + if ( !ok ) { RETVAL = 0; goto finish; @@ -660,13 +680,14 @@ CODE: } /* The remaining variables must be sysmis or blank string */ - while (i < dict_get_var_cnt (sfi->dict)) + while (i < dict_get_var_cnt (swi->dict)) { const struct variable *v = vv[i++]; union value *val = case_data_rw (c, v); value_set_missing (val, var_get_width (v)); } - RETVAL = casewriter_write (sfi->writer, c); + casewriter_write (swi->writer, c); + RETVAL = 1; finish: free (vv); OUTPUT: @@ -687,7 +708,7 @@ CODE: fh_create_file (NULL, name, fh_default_properties () ); sri = xmalloc (sizeof (*sri)); - sri->reader = sfm_open_reader (fh, &sri->dict, &sri->opts); + sri->reader = sfm_open_reader (fh, NULL, &sri->dict, &sri->opts); if ( NULL == sri->reader) { @@ -708,6 +729,21 @@ CODE: OUTPUT: RETVAL +SV * +get_case_cnt (sfr) + struct sysreader_info *sfr; +CODE: + SV *ret; + casenumber n = casereader_get_case_cnt (sfr->reader); + if (n == CASENUMBER_MAX) + ret = &PL_sv_undef; + else + ret = newSViv (n); + RETVAL = ret; + OUTPUT: +RETVAL + + void get_next_case (sfr) @@ -715,7 +751,7 @@ get_next_case (sfr) PPCODE: struct ccase *c; - if (c = casereader_read (sfr->reader)) + if ((c = casereader_read (sfr->reader)) != NULL) { int v;