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=fef855106de4347ba324e59434e2e4dd94941b54;hpb=93b5d67c0fdc08137f308f332fede32543e7bc8e;p=pspp

diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs
index fef855106d..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
@@ -19,6 +19,12 @@
 
 #include <config.h>
 
+/* The Gnulib "strftime" module defines my_strftime in <config.h> 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"
@@ -28,13 +34,17 @@
 #include "minmax.h"
 #include <libpspp/message.h>
 #include <libpspp/version.h>
+#include <libpspp/i18n.h>
 #include <gl/xalloc.h>
 #include <data/dictionary.h>
 #include <data/case.h>
 #include <data/casereader.h>
+#include <data/casewriter.h>
 #include <data/variable.h>
 #include <data/attributes.h>
 #include <data/file-handle-def.h>
+#include <data/identifier.h>
+#include <data/settings.h>
 #include <data/sys-file-writer.h>
 #include <data/sys-file-reader.h>
 #include <data/value.h>
@@ -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,6 +170,8 @@ MODULE = PSPP
 
 MODULE = PSPP		PACKAGE = PSPP
 
+PROTOTYPES: ENABLE
+
 void
 onBoot (ver)
  const char *ver
@@ -170,8 +182,8 @@ CODE:
  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 *
@@ -181,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);
@@ -215,7 +226,7 @@ MODULE = PSPP		PACKAGE = PSPP::Dict
 struct dictionary *
 pxs_dict_new()
 CODE:
- RETVAL = dict_create ();
+ RETVAL = dict_create ("UTF-8");
 OUTPUT:
  RETVAL
 
@@ -247,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
@@ -255,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
@@ -318,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;
@@ -368,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
@@ -584,7 +595,6 @@ CODE:
  struct file_handle *fh =
   fh_create_file (NULL, name, fh_default_properties () );
  struct sysfile_info *sfi = xmalloc (sizeof (*sfi));
- dict_set_encoding (dict, "UTF-8");
  sfi->writer = sfm_open_writer (fh, dict, opts);
  sfi->dict = dict;
  sfi->opened = true;
@@ -649,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;
@@ -671,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:
@@ -692,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)
  {
@@ -713,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)
@@ -720,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;