X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fvalue-labels.h;h=f0f7ce01264c392552f7b96d130be6577ddb50a9;hb=7c21ea20071516164a23ddd576ba394996368dbc;hp=6cb5259edb2fe22a28b53b49bba4a8e2e9fb1b1c;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp

diff --git a/src/data/value-labels.h b/src/data/value-labels.h
index 6cb5259edb..f0f7ce0126 100644
--- a/src/data/value-labels.h
+++ b/src/data/value-labels.h
@@ -39,6 +39,7 @@ struct val_lab
     struct hmap_node node;      /* Node in hash map. */
     union value value;          /* The value being labeled. */
     const char *label;          /* An interned string. */
+    const char *escaped_label;  /* An interned string. */
   };
 
 /* Returns the value in VL.  The caller must not modify or free
@@ -52,19 +53,33 @@ static inline const union value *val_lab_get_value (const struct val_lab *vl)
   return &vl->value;
 }
 
-/* Returns the label in VL.  The caller must not modify or free the returned
-   value. */
+/* Returns the label in VL as a UTF-8 encoded interned string, in a format
+   appropriate for use in output.  The caller must not modify or free the
+   returned value. */
 static inline const char *
 val_lab_get_label (const struct val_lab *vl)
 {
   return vl->label;
 }
+
+/* Returns the label in VL as a UTF-8 encoded interned string.  Any new-line
+   characters in the label's usual output form are represented in the returned
+   string as the two-byte sequence "\\n".  This form is used on the VALUE
+   LABELS command, in system and portable files, and passed to val_labs_add()
+   and val_labs_replace().
+
+   The caller must not modify or free the returned value. */
+static inline const char *
+val_lab_get_escaped_label (const struct val_lab *vl)
+{
+  return vl->escaped_label;
+}
 
 /* A set of value labels. */
 struct val_labs
   {
     int width;                  /* 0=numeric, otherwise string width. */
-    struct hmap labels;         /* Hash table of `struct int_val_lab's. */
+    struct hmap labels;         /* Hash table of `struct val_lab's. */
   };
 
 /* Creating and destroying sets of value labels. */
@@ -77,7 +92,7 @@ size_t val_labs_count (const struct val_labs *);
 /* Looking up value labels. */
 const char *val_labs_find (const struct val_labs *, const union value *);
 struct val_lab *val_labs_lookup (const struct val_labs *,
-                                       const union value *);
+                                 const union value *);
 
 /* Basic properties. */
 size_t val_labs_count (const struct val_labs *);
@@ -96,4 +111,8 @@ const struct val_lab *val_labs_next (const struct val_labs *,
                                      const struct val_lab *);
 const struct val_lab **val_labs_sorted (const struct val_labs *);
 
+/* Properties of entire sets. */
+unsigned int val_labs_hash (const struct val_labs *, unsigned int basis);
+bool val_labs_equal (const struct val_labs *, const struct val_labs *);
+
 #endif /* data/value-labels.h */