X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=dd41ede819a04c27cc15407167f7f4106fa8bbc0;hb=8b585b7a6ae9d1a90386d56e3ce484cf8204743a;hp=ecf9e6eb3fe44cb2fb9658cf539a797433ead671;hpb=d8493b3b0617cc447446a70b031a69079bc19002;p=pspp

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index ecf9e6eb3f..dd41ede819 100644
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2014 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
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <unitypes.h>
 
 #include "compiler.h"
 #include "memcasecmp.h"
@@ -46,7 +47,8 @@ void str_copy_buf_trunc (char *, size_t, const char *, size_t);
 void str_uppercase (char *);
 void str_lowercase (char *);
 
-bool str_format_26adic (unsigned long int number, char buffer[], size_t);
+bool str_format_26adic (unsigned long int number, bool uppercase,
+                        char buffer[], size_t);
 
 void *mempset (void *, int, size_t);
 
@@ -84,6 +86,7 @@ struct substring ss_tail (struct substring, size_t);
 struct pool;
 void ss_alloc_substring (struct substring *, struct substring);
 void ss_alloc_uninit (struct substring *, size_t);
+void ss_realloc (struct substring *, size_t);
 void ss_alloc_substring_pool (struct substring *, struct substring,
                               struct pool *);
 void ss_alloc_uninit_pool (struct substring *, size_t, struct pool *);
@@ -96,7 +99,8 @@ void ss_truncate (struct substring *, size_t);
 size_t ss_rtrim (struct substring *, struct substring trim_set);
 size_t ss_ltrim (struct substring *, struct substring trim_set);
 void ss_trim (struct substring *, struct substring trim_set);
-bool ss_chomp (struct substring *, char);
+bool ss_chomp_byte (struct substring *, char);
+bool ss_chomp (struct substring *, struct substring);
 bool ss_separate (struct substring src, struct substring delimiters,
                   size_t *save_idx, struct substring *token);
 bool ss_tokenize (struct substring src, struct substring delimiters,
@@ -118,6 +122,7 @@ char *ss_end (struct substring);
 int ss_at (struct substring, size_t idx);
 int ss_first (struct substring);
 int ss_last (struct substring);
+bool ss_ends_with (struct substring, struct substring suffix);
 size_t ss_span (struct substring, struct substring skip_set);
 size_t ss_cspan (struct substring, struct substring stop_set);
 size_t ss_find_byte (struct substring, char);
@@ -127,6 +132,13 @@ int ss_equals (struct substring, struct substring);
 int ss_equals_case (struct substring, struct substring);
 size_t ss_pointer_to_position (struct substring, const char *);
 char *ss_xstrdup (struct substring);
+
+/* UTF-8. */
+ucs4_t ss_first_mb (struct substring);
+int ss_first_mblen (struct substring);
+ucs4_t ss_get_mb (struct substring *);
+ucs4_t ss_at_mb (struct substring, size_t ofs);
+int ss_at_mblen (struct substring, size_t ofs);
 
 /* Variable length strings. */
 
@@ -168,7 +180,8 @@ void ds_truncate (struct string *, size_t);
 size_t ds_rtrim (struct string *, struct substring trim_set);
 size_t ds_ltrim (struct string *, struct substring trim_set);
 size_t ds_trim (struct string *, struct substring trim_set);
-bool ds_chomp (struct string *, char);
+bool ds_chomp_byte (struct string *, char);
+bool ds_chomp (struct string *, struct substring);
 bool ds_separate (const struct string *src, struct substring delimiters,
                   size_t *save_idx, struct substring *token);
 bool ds_tokenize (const struct string *src, struct substring delimiters,
@@ -191,6 +204,7 @@ char *ds_end (const struct string *);
 int ds_at (const struct string *, size_t idx);
 int ds_first (const struct string *);
 int ds_last (const struct string *);
+bool ds_ends_with (const struct string *, struct substring suffix);
 size_t ds_span (const struct string *, struct substring skip_set);
 size_t ds_cspan (const struct string *, struct substring stop_set);
 size_t ds_find_byte (const struct string *, char);
@@ -210,14 +224,24 @@ bool ds_read_stream (struct string *, size_t size, size_t cnt, FILE *stream);
 /* Append. */
 void ds_put_byte (struct string *, int ch);
 void ds_put_byte_multiple (struct string *, int ch, size_t);
+void ds_put_unichar (struct string *, ucs4_t uc);
 void ds_put_cstr (struct string *, const char *);
 void ds_put_substring (struct string *, struct substring);
 void ds_put_vformat (struct string *st, const char *, va_list)
      PRINTF_FORMAT (2, 0);
+void ds_put_c_vformat (struct string *st, const char *, va_list)
+     PRINTF_FORMAT (2, 0);
+
 void ds_put_format (struct string *, const char *, ...)
      PRINTF_FORMAT (2, 3);
+void ds_put_c_format (struct string *, const char *, ...)
+     PRINTF_FORMAT (2, 3);
+
 char *ds_put_uninit (struct string *st, size_t incr);
 
+char *ds_splice_uninit (struct string *, size_t ofs, size_t old_len,
+                        size_t new_len);
+
 /* Other */
 /* calls relocate from gnulib on ST */
 void ds_relocate (struct string *st);
@@ -227,7 +251,7 @@ void u8_buf_copy_rpad (uint8_t *dst, size_t dst_size,
 		       const uint8_t *src, size_t src_size,
 		       char pad);
 
-struct substring
+static inline struct substring
 ss_empty (void)
 {
   struct substring ss;