X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.h;h=c40915d939a3e3a9cd874dd985e5e0774f629ec7;hb=981adc6169ffe7227de286f92f70edf684d37a2b;hp=8cde5779143773e5dd3aeb02d914a01a4740ae16;hpb=61d50bb6faca2b65483ee1eac6a214a5a1263a13;p=pspp

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index 8cde577914..c40915d939 100644
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -118,8 +118,9 @@ void ss_advance (struct substring *, size_t);
 bool ss_match_byte (struct substring *, char);
 int ss_match_byte_in (struct substring *, struct substring);
 bool ss_match_string (struct substring *, const struct substring);
+bool ss_match_string_case (struct substring *, const struct substring);
 int ss_get_byte (struct substring *);
-size_t ss_get_bytes (struct substring *, size_t cnt, struct substring *);
+size_t ss_get_bytes (struct substring *, size_t n, struct substring *);
 bool ss_get_until (struct substring *, char delimiter, struct substring *);
 size_t ss_get_long (struct substring *, long *);
 
@@ -132,7 +133,9 @@ int ss_at (struct substring, size_t idx);
 int ss_first (struct substring);
 int ss_last (struct substring);
 bool ss_starts_with (struct substring, struct substring prefix);
+bool ss_starts_with_case (struct substring, struct substring prefix);
 bool ss_ends_with (struct substring, struct substring suffix);
+bool ss_ends_with_case (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);
@@ -150,6 +153,8 @@ 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);
+size_t ss_utf8_count_columns (struct substring);
+struct substring ss_utf8_columns (struct substring, size_t start, size_t n);
 
 /* Variable length strings. */
 
@@ -230,7 +235,7 @@ char *ds_steal_cstr (struct string *);
 /* File input. */
 bool ds_read_line (struct string *, FILE *, size_t max_length);
 bool ds_read_config_line (struct string *, int *line_number, FILE *);
-bool ds_read_stream (struct string *, size_t size, size_t cnt, FILE *stream);
+bool ds_read_stream (struct string *, size_t size, size_t n, FILE *stream);
 
 /* Append. */
 void ds_put_byte (struct string *, int ch);
@@ -238,6 +243,7 @@ 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_substring_multiple (struct string *, struct substring, size_t n);
 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)
@@ -279,14 +285,14 @@ ss_cstr (const char *cstr)
   return ss_buffer (cstr, strlen (cstr));
 }
 
-/* Returns a substring whose contents are the CNT characters in
+/* Returns a substring whose contents are the N characters in
    BUFFER. */
 static inline struct substring
-ss_buffer (const char *buffer, size_t cnt)
+ss_buffer (const char *buffer, size_t n)
 {
   struct substring ss;
   ss.string = (char *) buffer;
-  ss.length = cnt;
+  ss.length = n;
   return ss;
 }