X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2FPSPP.xs;h=834ec401f483900d5cd1cb5bfb5d3e08045e7e4a;hb=refs%2Fheads%2Flexer;hp=b3ac4cdc31e84670194ede7d254315ab48deea23;hpb=8f04b0ced35a66cfdebefbcb53c81979add36ca3;p=pspp diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs index b3ac4cdc31..834ec401f4 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 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 @@ -81,7 +91,7 @@ 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); @@ -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 @@ -373,6 +388,37 @@ clear_value_labels (var) CODE: var_clear_value_labels (var); +SV * +get_write_format (var) + struct variable *var +CODE: + HV *fmthash = (HV *) sv_2mortal ((SV *) newHV()); + const struct fmt_spec *fmt = var_get_write_format (var); + + hv_store (fmthash, "fmt", 3, newSVnv (fmt->type), 0); + hv_store (fmthash, "decimals", 8, newSVnv (fmt->d), 0); + hv_store (fmthash, "width", 5, newSVnv (fmt->w), 0); + + RETVAL = newRV ((SV *) fmthash); + OUTPUT: +RETVAL + +SV * +get_print_format (var) + struct variable *var +CODE: + HV *fmthash = (HV *) sv_2mortal ((SV *) newHV()); + const struct fmt_spec *fmt = var_get_print_format (var); + + hv_store (fmthash, "fmt", 3, newSVnv (fmt->type), 0); + hv_store (fmthash, "decimals", 8, newSVnv (fmt->d), 0); + hv_store (fmthash, "width", 5, newSVnv (fmt->w), 0); + + RETVAL = newRV ((SV *) fmthash); + OUTPUT: +RETVAL + + void pxs_set_write_format (var, fmt) struct variable *var @@ -613,10 +659,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 (sfi->dict)); + ok = error == NULL; + free (error); + + if ( !ok ) { RETVAL = 0; goto finish; @@ -635,7 +687,8 @@ CODE: union value *val = case_data_rw (c, v); value_set_missing (val, var_get_width (v)); } - RETVAL = casewriter_write (sfi->writer, c); + casewriter_write (sfi->writer, c); + RETVAL = 1; finish: free (vv); OUTPUT: @@ -656,7 +709,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) { @@ -677,6 +730,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) @@ -684,7 +752,7 @@ get_next_case (sfr) PPCODE: struct ccase *c; - if (c = casereader_read (sfr->reader)) + if ((c = casereader_read (sfr->reader)) != NULL) { int v;