Mercurial > hg > octave-nkf > gnulib-hg
changeset 8127:127a096061c8
Support for copying multibyte string iterators.
Cvs: ----------------------------------------------------------------------
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 11 Feb 2007 17:17:09 +0000 |
parents | c534d48f4224 |
children | a6a0a5670762 |
files | ChangeLog lib/mbiter.h lib/mbuiter.h |
diffstat | 3 files changed, 51 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-02-11 Bruno Haible <bruno@clisp.org> + + Support for copying multibyte string iterators. + * lib/mbiter.h: Include <string.h>. + (mbiter_multi_copy): New function. + (mbi_copy): New macro. + * lib/mbuiter.h: Include <string.h>. + (mbuiter_multi_copy): New function. + (mbui_copy): New macro. + 2007-02-11 Bruno Haible <bruno@clisp.org> New module mbslen.
--- a/lib/mbiter.h +++ b/lib/mbiter.h @@ -1,5 +1,5 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007 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 @@ -65,6 +65,9 @@ mbi_reloc (iter, ptrdiff) relocates iterator when the string is moved by ptrdiff bytes. + mbi_copy (&destiter, &srciter) + copies srciter to destiter. + Here are the function prototypes of the macros. extern void mbi_init (mbi_iterator_t iter, @@ -74,6 +77,7 @@ extern mbchar_t mbi_cur (mbi_iterator_t iter); extern const char * mbi_cur_ptr (mbi_iterator_t iter); extern void mbi_reloc (mbi_iterator_t iter, ptrdiff_t ptrdiff); + extern void mbi_copy (mbi_iterator_t *new, const mbi_iterator_t *old); */ #ifndef _MBITER_H @@ -81,6 +85,7 @@ #include <assert.h> #include <stdbool.h> +#include <string.h> /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before <wchar.h>. @@ -174,6 +179,18 @@ iter->limit += ptrdiff; } +static inline void +mbiter_multi_copy (struct mbiter_multi *new_iter, const struct mbiter_multi *old_iter) +{ + new_iter->limit = old_iter->limit; + if ((new_iter->in_shift = old_iter->in_shift)) + memcpy (&new_iter->state, &old_iter->state, sizeof (mbstate_t)); + else + memset (&new_iter->state, 0, sizeof (mbstate_t)); + new_iter->next_done = old_iter->next_done; + mb_copy (&new_iter->cur, &old_iter->cur); +} + /* Iteration macros. */ typedef struct mbiter_multi mbi_iterator_t; #define mbi_init(iter, startptr, length) \ @@ -192,4 +209,7 @@ /* Relocation. */ #define mbi_reloc(iter, ptrdiff) mbiter_multi_reloc (&iter, ptrdiff) +/* Copying an iterator. */ +#define mbi_copy mbiter_multi_copy + #endif /* _MBITER_H */
--- a/lib/mbuiter.h +++ b/lib/mbuiter.h @@ -1,5 +1,5 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007 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 @@ -73,6 +73,9 @@ mbui_reloc (iter, ptrdiff) relocates iterator when the string is moved by ptrdiff bytes. + mbui_copy (&destiter, &srciter) + copies srciter to destiter. + Here are the function prototypes of the macros. extern void mbui_init (mbui_iterator_t iter, const char *startptr); @@ -81,6 +84,7 @@ extern mbchar_t mbui_cur (mbui_iterator_t iter); extern const char * mbui_cur_ptr (mbui_iterator_t iter); extern void mbui_reloc (mbui_iterator_t iter, ptrdiff_t ptrdiff); + extern void mbui_copy (mbui_iterator_t *new, const mbui_iterator_t *old); */ #ifndef _MBUITER_H @@ -89,6 +93,7 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> +#include <string.h> /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before <wchar.h>. @@ -182,6 +187,17 @@ iter->cur.ptr += ptrdiff; } +static inline void +mbuiter_multi_copy (struct mbuiter_multi *new_iter, const struct mbuiter_multi *old_iter) +{ + if ((new_iter->in_shift = old_iter->in_shift)) + memcpy (&new_iter->state, &old_iter->state, sizeof (mbstate_t)); + else + memset (&new_iter->state, 0, sizeof (mbstate_t)); + new_iter->next_done = old_iter->next_done; + mb_copy (&new_iter->cur, &old_iter->cur); +} + /* Iteration macros. */ typedef struct mbuiter_multi mbui_iterator_t; #define mbui_init(iter, startptr) \ @@ -200,4 +216,7 @@ /* Relocation. */ #define mbui_reloc(iter, ptrdiff) mbuiter_multi_reloc (&iter, ptrdiff) +/* Copying an iterator. */ +#define mbui_copy mbuiter_multi_copy + #endif /* _MBUITER_H */