X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvalue.c;h=49555d9a4ea3b11ce15149ebdca388722af6dcb4;hb=c400888ac9d64228138f69b473afb0083c6ca37c;hp=b4613e4ce3099ec7e8a3a18178958e5179dda5b9;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp
diff --git a/src/data/value.c b/src/data/value.c
index b4613e4ce3..49555d9a4e 100644
--- a/src/data/value.c
+++ b/src/data/value.c
@@ -1,24 +1,23 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 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 . */
#include
-#include "value.h"
+#include
+#include
#include
#include
@@ -32,6 +31,16 @@ value_dup (const union value *val, int width)
return xmemdup (val, MAX (width, sizeof *val));
}
+
+/* Create a value of specified width.
+ The caller is responsible for freeing the returned value. */
+union value *
+value_create (int width)
+{
+ return xnmalloc (value_cnt_from_width (width), sizeof (union value));
+}
+
+
/* Compares A and B, which both have the given WIDTH, and returns
a strcmp()-type result.
Only the short string portion of longer strings are
@@ -54,6 +63,20 @@ hash_value (const union value *v, int width)
: hsh_hash_bytes (v->s, MIN (MAX_SHORT_STRING, width)));
}
+
+int
+compare_ptr_values (const union value **v1, const union value **v2, int width)
+{
+ return compare_values (*v1, *v2, width);
+}
+
+unsigned
+hash_ptr_value (const union value **v, int width)
+{
+ return hash_value (*v, width);
+}
+
+
/* Copies SRC to DST, given that they both contain data of the
given WIDTH. */
void
@@ -75,3 +98,32 @@ value_set_missing (union value *v, int width)
else
memset (v->s, ' ', width);
}
+
+/* Tests whether VALUE may be resized from OLD_WIDTH to
+ NEW_WIDTH, using the following rules that match those for
+ resizing missing values and value labels. First, OLD_WIDTH
+ and NEW_WIDTH must be both numeric or both string. Second, if
+ NEW_WIDTH is less than OLD_WIDTH, then the bytes that would be
+ trimmed off the right end of VALUE must be all spaces. */
+bool
+value_is_resizable (const union value *value, int old_width, int new_width)
+{
+ int i;
+
+ if (val_type_from_width (old_width) != val_type_from_width (new_width))
+ return false;
+ for (i = new_width; i < old_width; i++)
+ if (value->s[i] != ' ')
+ return false;
+ return true;
+}
+
+/* Resizes VALUE from OLD_WIDTH to NEW_WIDTH. The arguments must
+ satisfy the rules specified above for value_is_resizable. */
+void
+value_resize (union value *value, int old_width, int new_width)
+{
+ assert (value_is_resizable (value, old_width, new_width));
+ if (new_width > old_width)
+ memset (&value->s[old_width], ' ', new_width - old_width);
+}