Author: allison Date: Wed Jan 28 19:49:28 2009 New Revision: 36130 Modified: branches/pdd28str_part2/include/parrot/string_funcs.h branches/pdd28str_part2/src/string/api.c branches/pdd28str_part2/src/string/encoding/fixed_8.c branches/pdd28str_part2/src/string/encoding/utf16.c branches/pdd28str_part2/src/string/encoding/utf8.c
Log: [pdd28str] Renaming 'Parrot_str_reuse_COW'. Modified: branches/pdd28str_part2/include/parrot/string_funcs.h ============================================================================== --- branches/pdd28str_part2/include/parrot/string_funcs.h (original) +++ branches/pdd28str_part2/include/parrot/string_funcs.h Wed Jan 28 19:49:28 2009 @@ -43,7 +43,7 @@ PARROT_EXPORT PARROT_CANNOT_RETURN_NULL -STRING * Parrot_reuse_COW_reference(SHIM_INTERP, +STRING * Parrot_str_reuse_COW(SHIM_INTERP, ARGMOD(STRING *s), ARGOUT(STRING *d)) __attribute__nonnull__(2) @@ -563,7 +563,7 @@ #define ASSERT_ARGS_Parrot_str_new_COW __attribute__unused__ int _ASSERT_ARGS_CHECK = \ PARROT_ASSERT_ARG(interp) \ || PARROT_ASSERT_ARG(s) -#define ASSERT_ARGS_Parrot_reuse_COW_reference __attribute__unused__ int _ASSERT_ARGS_CHECK = \ +#define ASSERT_ARGS_Parrot_str_reuse_COW __attribute__unused__ int _ASSERT_ARGS_CHECK = \ PARROT_ASSERT_ARG(s) \ || PARROT_ASSERT_ARG(d) #define ASSERT_ARGS_Parrot_str_repeat __attribute__unused__ int _ASSERT_ARGS_CHECK = \ Modified: branches/pdd28str_part2/src/string/api.c ============================================================================== --- branches/pdd28str_part2/src/string/api.c (original) +++ branches/pdd28str_part2/src/string/api.c Wed Jan 28 19:49:28 2009 @@ -173,7 +173,7 @@ /* -=item C<STRING * Parrot_reuse_COW_reference> +=item C<STRING * Parrot_str_reuse_COW> Creates a copy-on-write string by cloning a string header without allocating a new buffer. Doesn't allocate a new string header, instead @@ -186,9 +186,9 @@ PARROT_EXPORT PARROT_CANNOT_RETURN_NULL STRING * -Parrot_reuse_COW_reference(SHIM_INTERP, ARGMOD(STRING *s), ARGOUT(STRING *d)) +Parrot_str_reuse_COW(SHIM_INTERP, ARGMOD(STRING *s), ARGOUT(STRING *d)) { - ASSERT_ARGS(Parrot_reuse_COW_reference) + ASSERT_ARGS(Parrot_str_reuse_COW) if (PObj_constant_TEST(s)) { PObj_COW_SET(s); @@ -230,7 +230,7 @@ mem_sys_free(PObj_bufallocstart(dest)); } #endif - dest = Parrot_reuse_COW_reference(interp, src, dest); + dest = Parrot_str_reuse_COW(interp, src, dest); } else dest = Parrot_str_new_COW(interp, src); @@ -2980,7 +2980,7 @@ */ if (dest) { if (new_charset == src->charset) { - dest = Parrot_reuse_COW_reference(interp, src, dest); + dest = Parrot_str_reuse_COW(interp, src, dest); dest->charset = new_charset; /* keep encoding */ return dest; @@ -3039,7 +3039,7 @@ if (dest) { dest->encoding = new_encoding; if (new_encoding == src->encoding) { - dest = Parrot_reuse_COW_reference(interp, src, dest); + dest = Parrot_str_reuse_COW(interp, src, dest); return dest; } } Modified: branches/pdd28str_part2/src/string/encoding/fixed_8.c ============================================================================== --- branches/pdd28str_part2/src/string/encoding/fixed_8.c (original) +++ branches/pdd28str_part2/src/string/encoding/fixed_8.c Wed Jan 28 19:49:28 2009 @@ -424,7 +424,7 @@ UINTVAL offset, UINTVAL count, ARGMOD(STRING *return_string)) { ASSERT_ARGS(get_bytes_inplace) - Parrot_reuse_COW_reference(interp, source_string, return_string); + Parrot_str_reuse_COW(interp, source_string, return_string); return_string->strstart = (char *)return_string->strstart + offset ; return_string->bufused = count; Modified: branches/pdd28str_part2/src/string/encoding/utf16.c ============================================================================== --- branches/pdd28str_part2/src/string/encoding/utf16.c (original) +++ branches/pdd28str_part2/src/string/encoding/utf16.c Wed Jan 28 19:49:28 2009 @@ -489,7 +489,7 @@ ASSERT_ARGS(get_codepoints_inplace) String_iter iter; UINTVAL start; - Parrot_reuse_COW_reference(interp, src, return_string); + Parrot_str_reuse_COW(interp, src, return_string); iter_init(interp, src, &iter); iter.set_position(interp, &iter, offset); start = iter.bytepos; Modified: branches/pdd28str_part2/src/string/encoding/utf8.c ============================================================================== --- branches/pdd28str_part2/src/string/encoding/utf8.c (original) +++ branches/pdd28str_part2/src/string/encoding/utf8.c Wed Jan 28 19:49:28 2009 @@ -813,7 +813,7 @@ String_iter iter; UINTVAL start; - Parrot_reuse_COW_reference(interp, src, return_string); + Parrot_str_reuse_COW(interp, src, return_string); iter_init(interp, src, &iter); iter.set_position(interp, &iter, offset);