X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fvalue.c;h=49555d9a4ea3b11ce15149ebdca388722af6dcb4;hb=ee7be3e962a4faba54d7bc01364365b51167242c;hp=cd52f147ca3a0f4fd924c40861788cfc22081623;hpb=d22c3971e926ceaf62416c6482fe0fb1dc5407f0;p=pspp
diff --git a/src/data/value.c b/src/data/value.c
index cd52f147ca..49555d9a4e 100644
--- a/src/data/value.c
+++ b/src/data/value.c
@@ -15,8 +15,9 @@
along with this program. If not, see . */
#include
-#include "value.h"
+#include
+#include
#include
#include
@@ -62,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
@@ -83,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);
+}