X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvector.c;h=c88d236df6c942057425baa7227cbf23ee02a49f;hb=3c7e6939901e8c2f24eb4975e6feb68e74678f92;hp=cc4c96f0ab8744538fafb4e4e35d9dd1e99bf832;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp

diff --git a/src/data/vector.c b/src/data/vector.c
index cc4c96f0ab..c88d236df6 100644
--- a/src/data/vector.c
+++ b/src/data/vector.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006  Free Software Foundation, Inc.
+   Copyright (C) 2006, 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 published by
@@ -15,21 +15,25 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "vector.h"
 
-#include "dictionary.h"
+#include "data/vector.h"
 
-#include <libpspp/assertion.h>
-#include <libpspp/str.h>
+#include <stdlib.h>
 
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/identifier.h"
+#include "libpspp/assertion.h"
+#include "libpspp/i18n.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 /* Vector of variables. */
 struct vector
   {
-    char name[LONG_NAME_LEN + 1];       /* Name. */
+    char *name;                         /* Name. */
     struct variable **vars;             /* Set of variables. */
-    size_t var_cnt;                     /* Number of variables. */
+    size_t n_vars;                      /* Number of variables. */
   };
 
 /* Checks that all the variables in VECTOR have consistent
@@ -40,25 +44,24 @@ check_widths (const struct vector *vector)
   int width = var_get_width (vector->vars[0]);
   size_t i;
 
-  for (i = 1; i < vector->var_cnt; i++)
+  for (i = 1; i < vector->n_vars; i++)
     assert (width == var_get_width (vector->vars[i]));
 }
 
-/* Creates and returns a new vector with the given NAME
-   that contains the VAR_CNT variables in VARS.
+/* Creates and returns a new vector with the given UTF-8 encoded NAME
+   that contains the N_VARS variables in VARS.
    All variables in VARS must have the same type and width. */
 struct vector *
-vector_create (const char *name,
-               struct variable **vars, size_t var_cnt)
+vector_create (const char *name, struct variable **vars, size_t n_vars)
 {
   struct vector *vector = xmalloc (sizeof *vector);
 
-  assert (var_cnt > 0);
-  assert (var_is_plausible_name (name, false));
-  str_copy_trunc (vector->name, sizeof vector->name, name);
+  assert (n_vars > 0);
+  assert (id_is_plausible (name, false));
 
-  vector->vars = xmemdup (vars, var_cnt * sizeof *vector->vars);
-  vector->var_cnt = var_cnt;
+  vector->name = xstrdup (name);
+  vector->vars = xmemdup (vars, n_vars * sizeof *vector->vars);
+  vector->n_vars = n_vars;
   check_widths (vector);
 
   return vector;
@@ -77,11 +80,10 @@ vector_clone (const struct vector *old,
   struct vector *new = xmalloc (sizeof *new);
   size_t i;
 
-  strcpy (new->name, old->name);
-
-  new->vars = xnmalloc (old->var_cnt, sizeof *new->vars);
-  new->var_cnt = old->var_cnt;
-  for (i = 0; i < new->var_cnt; i++)
+  new->name = xstrdup (old->name);
+  new->vars = xnmalloc (old->n_vars, sizeof *new->vars);
+  new->n_vars = old->n_vars;
+  for (i = 0; i < new->n_vars; i++)
     {
       assert (dict_contains_var (old_dict, old->vars[i]));
       new->vars[i] = dict_get_var (new_dict,
@@ -96,11 +98,12 @@ vector_clone (const struct vector *old,
 void
 vector_destroy (struct vector *vector)
 {
+  free (vector->name);
   free (vector->vars);
   free (vector);
 }
 
-/* Returns VECTOR's name. */
+/* Returns VECTOR's name, as a UTF-8 encoded string. */
 const char *
 vector_get_name (const struct vector *vector)
 {
@@ -108,7 +111,7 @@ vector_get_name (const struct vector *vector)
 }
 
 /* Returns the type of the variables in VECTOR. */
-enum var_type vector_get_type (const struct vector *vector)
+enum val_type vector_get_type (const struct vector *vector)
 {
   return var_get_type (vector->vars[0]);
 }
@@ -117,15 +120,15 @@ enum var_type vector_get_type (const struct vector *vector)
 struct variable *
 vector_get_var (const struct vector *vector, size_t index)
 {
-  assert (index < vector->var_cnt);
+  assert (index < vector->n_vars);
   return vector->vars[index];
 }
 
 /* Returns the number of variables in VECTOR. */
 size_t
-vector_get_var_cnt (const struct vector *vector)
+vector_get_n_vars (const struct vector *vector)
 {
-  return vector->var_cnt;
+  return vector->n_vars;
 }
 
 /* Compares two pointers to vectors represented by A and B and
@@ -138,6 +141,6 @@ compare_vector_ptrs_by_name (const void *a_, const void *b_)
   struct vector *a = *pa;
   struct vector *b = *pb;
 
-  return strcasecmp (a->name, b->name);
+  return utf8_strcasecmp (a->name, b->name);
 }