Author: allison Date: Wed Jan 28 22:16:55 2009 New Revision: 36136 Modified: branches/pdd28str_part2/include/parrot/string_funcs.h branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc branches/pdd28str_part2/languages/perl6/src/pmc/perl6multisub.pmc branches/pdd28str_part2/languages/pipp/src/pmc/phparray.pmc branches/pdd28str_part2/lib/Parrot/Pmc2c/PMCEmitter.pm branches/pdd28str_part2/src/dynext.c branches/pdd28str_part2/src/io/io_string.c branches/pdd28str_part2/src/io/utf8.c branches/pdd28str_part2/src/jit_debug.c branches/pdd28str_part2/src/jit_debug_xcoff.c branches/pdd28str_part2/src/key.c branches/pdd28str_part2/src/library.c branches/pdd28str_part2/src/ops/string.ops branches/pdd28str_part2/src/packdump.c branches/pdd28str_part2/src/pmc/bigint.pmc branches/pdd28str_part2/src/pmc/class.pmc branches/pdd28str_part2/src/pmc/codestring.pmc branches/pdd28str_part2/src/pmc/filehandle.pmc branches/pdd28str_part2/src/pmc/fixedintegerarray.pmc branches/pdd28str_part2/src/pmc/fixedpmcarray.pmc branches/pdd28str_part2/src/pmc/fixedstringarray.pmc branches/pdd28str_part2/src/pmc/hash.pmc branches/pdd28str_part2/src/pmc/object.pmc branches/pdd28str_part2/src/pmc/resizablepmcarray.pmc branches/pdd28str_part2/src/pmc/scalar.pmc branches/pdd28str_part2/src/pmc/stringhandle.pmc branches/pdd28str_part2/src/spf_render.c branches/pdd28str_part2/src/string/api.c
Log: [pdd28str] Renaming 'Parrot_str_append'. 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 22:16:55 2009 @@ -130,7 +130,7 @@ PARROT_EXPORT PARROT_WARN_UNUSED_RESULT PARROT_CAN_RETURN_NULL -STRING * string_append(PARROT_INTERP, +STRING * Parrot_str_append(PARROT_INTERP, ARGMOD_NULLOK(STRING *a), ARGIN_NULLOK(STRING *b)) __attribute__nonnull__(1) @@ -587,7 +587,7 @@ #define ASSERT_ARGS_Parrot_str_write_COW __attribute__unused__ int _ASSERT_ARGS_CHECK = \ PARROT_ASSERT_ARG(interp) \ || PARROT_ASSERT_ARG(s) -#define ASSERT_ARGS_string_append __attribute__unused__ int _ASSERT_ARGS_CHECK = \ +#define ASSERT_ARGS_Parrot_str_append __attribute__unused__ int _ASSERT_ARGS_CHECK = \ PARROT_ASSERT_ARG(interp) #define ASSERT_ARGS_string_bitwise_and __attribute__unused__ int _ASSERT_ARGS_CHECK = \ PARROT_ASSERT_ARG(interp) Modified: branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc ============================================================================== --- branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc (original) +++ branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc Wed Jan 28 22:16:55 2009 @@ -841,13 +841,13 @@ MULTI void i_concatenate(LuaNumber value) { STRING *s = SELF.get_string(); STRING *v = VTABLE_get_string(INTERP, value); - SELF.set_string_native(string_append(INTERP, s, v)); + SELF.set_string_native(Parrot_str_append(INTERP, s, v)); } MULTI void i_concatenate(LuaString value) { STRING *s = SELF.get_string(); STRING *v = VTABLE_get_string(INTERP, value); - SELF.set_string_native(string_append(INTERP, s, v)); + SELF.set_string_native(Parrot_str_append(INTERP, s, v)); } MULTI void i_concatenate(DEFAULT value) { Modified: branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc ============================================================================== --- branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc (original) +++ branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc Wed Jan 28 22:16:55 2009 @@ -933,13 +933,13 @@ MULTI void i_concatenate(LuaNumber value) { STRING *s = SELF.get_string(); STRING *v = VTABLE_get_string(INTERP, value); - SELF.set_string_native(string_append(INTERP, s, v)); + SELF.set_string_native(Parrot_str_append(INTERP, s, v)); } MULTI void i_concatenate(LuaString value) { STRING *s = SELF.get_string(); STRING *v = VTABLE_get_string(INTERP, value); - SELF.set_string_native(string_append(INTERP, s, v)); + SELF.set_string_native(Parrot_str_append(INTERP, s, v)); } MULTI void i_concatenate(DEFAULT value) { Modified: branches/pdd28str_part2/languages/perl6/src/pmc/perl6multisub.pmc ============================================================================== --- branches/pdd28str_part2/languages/perl6/src/pmc/perl6multisub.pmc (original) +++ branches/pdd28str_part2/languages/perl6/src/pmc/perl6multisub.pmc Wed Jan 28 22:16:55 2009 @@ -670,8 +670,8 @@ PMC *perl_meth = VTABLE_find_method(interp, sig_obj, perl_name); STRING *sig_perl = (STRING *)Parrot_run_meth_fromc_args(interp, perl_meth, sig_obj, perl_name, "S"); - signatures = string_append(interp, signatures, sig_perl); - signatures = string_append(interp, signatures, newline); + signatures = Parrot_str_append(interp, signatures, sig_perl); + signatures = Parrot_str_append(interp, signatures, newline); } Parrot_ex_throw_from_c_args(interp, next, 1, "Ambiguous dispatch to multi '%Ss'. Ambiguous candidates had signatures:\n%Ss", Modified: branches/pdd28str_part2/languages/pipp/src/pmc/phparray.pmc ============================================================================== --- branches/pdd28str_part2/languages/pipp/src/pmc/phparray.pmc (original) +++ branches/pdd28str_part2/languages/pipp/src/pmc/phparray.pmc Wed Jan 28 22:16:55 2009 @@ -1832,16 +1832,16 @@ else key_str = Parrot_sprintf_c(INTERP, "\"%Ss\": ", bkt->key); - repr = string_append(INTERP, repr, key_str); + repr = Parrot_str_append(INTERP, repr, key_str); val_str = VTABLE_get_string(INTERP, bkt->value); - repr = string_append(INTERP, repr, val_str); + repr = Parrot_str_append(INTERP, repr, val_str); if (bkt->tableNext != NULL) - repr = string_append(INTERP, repr, CONST_STRING(INTERP, ", ")); + repr = Parrot_str_append(INTERP, repr, CONST_STRING(INTERP, ", ")); bkt = bkt->tableNext; } - repr = string_append(INTERP, repr, CONST_STRING(INTERP, "}")); + repr = Parrot_str_append(INTERP, repr, CONST_STRING(INTERP, "}")); return repr; } Modified: branches/pdd28str_part2/lib/Parrot/Pmc2c/PMCEmitter.pm ============================================================================== --- branches/pdd28str_part2/lib/Parrot/Pmc2c/PMCEmitter.pm (original) +++ branches/pdd28str_part2/lib/Parrot/Pmc2c/PMCEmitter.pm Wed Jan 28 22:16:55 2009 @@ -624,7 +624,7 @@ vt_clone->base_type = entry; vt_clone->whoami = string_make(interp, "$classname", @{[length($classname)]}, "ascii", PObj_constant_FLAG|PObj_external_FLAG); - vt_clone->provides_str = string_append(interp, vt_clone->provides_str, + vt_clone->provides_str = Parrot_str_append(interp, vt_clone->provides_str, string_make(interp, " $provides", @{[length($provides) + 1]}, "ascii", PObj_constant_FLAG|PObj_external_FLAG)); Modified: branches/pdd28str_part2/src/dynext.c ============================================================================== --- branches/pdd28str_part2/src/dynext.c (original) +++ branches/pdd28str_part2/src/dynext.c Wed Jan 28 22:16:55 2009 @@ -305,7 +305,7 @@ /* And on cygwin replace a leading "lib" by "cyg". */ #ifdef __CYGWIN__ if (!STRING_IS_EMPTY(lib) && memcmp(lib->strstart, "lib", 3) == 0) { - path = string_append(interp, CONST_STRING(interp, "cyg"), + path = Parrot_str_append(interp, CONST_STRING(interp, "cyg"), string_substr(interp, lib, 3, lib->strlen - 3, NULL, 0)); *handle = Parrot_dlopen(path->strstart); Modified: branches/pdd28str_part2/src/io/io_string.c ============================================================================== --- branches/pdd28str_part2/src/io/io_string.c (original) +++ branches/pdd28str_part2/src/io/io_string.c Wed Jan 28 22:16:55 2009 @@ -151,7 +151,7 @@ return s->strlen; } - l->self = string_append(interp, old_string, s); + l->self = Parrot_str_append(interp, old_string, s); return string_length(interp, (STRING *)l->self); } Modified: branches/pdd28str_part2/src/io/utf8.c ============================================================================== --- branches/pdd28str_part2/src/io/utf8.c (original) +++ branches/pdd28str_part2/src/io/utf8.c Wed Jan 28 22:16:55 2009 @@ -84,7 +84,7 @@ UNUSED(read); s->strlen = iter.charpos; - s = string_append(interp, s, s2); + s = Parrot_str_append(interp, s, s2); len += len2 + 1; /* check last char */ Modified: branches/pdd28str_part2/src/jit_debug.c ============================================================================== --- branches/pdd28str_part2/src/jit_debug.c (original) +++ branches/pdd28str_part2/src/jit_debug.c Wed Jan 28 22:16:55 2009 @@ -252,7 +252,7 @@ { STRING *ret; ret = string_copy(interp, file); - ret = string_append(interp, ret, + ret = Parrot_str_append(interp, ret, string_make(interp, ext, strlen(ext), NULL, PObj_external_FLAG)); return ret; @@ -297,7 +297,7 @@ else if (ext && STREQ(ext, ".pir")) string_chopn_inplace(interp, file, 3); else if (!ext) /* EVAL_n */ - file = string_append(interp, file, + file = Parrot_str_append(interp, file, string_make(interp, ".", 1, NULL, PObj_external_FLAG)); string_cstring_free(src); Modified: branches/pdd28str_part2/src/jit_debug_xcoff.c ============================================================================== --- branches/pdd28str_part2/src/jit_debug_xcoff.c (original) +++ branches/pdd28str_part2/src/jit_debug_xcoff.c Wed Jan 28 22:16:55 2009 @@ -224,7 +224,7 @@ { STRING *ret; ret = string_copy(interp, file); - ret = string_append(interp, ret, + ret = Parrot_str_append(interp, ret, string_make(interp, ext, strlen(ext), NULL, PObj_external_FLAG)); return ret; @@ -268,7 +268,7 @@ else if (ext && STREQ(ext, ".pir")) string_chopn_inplace(interp, file, 3); else if (!ext) /* EVAL_n */ - file = string_append(interp, file, + file = Parrot_str_append(interp, file, string_make(interp, ".", 1, NULL, PObj_external_FLAG)); string_cstring_free(src); } Modified: branches/pdd28str_part2/src/key.c ============================================================================== --- branches/pdd28str_part2/src/key.c (original) +++ branches/pdd28str_part2/src/key.c Wed Jan 28 22:16:55 2009 @@ -594,46 +594,46 @@ for (; key; key = (PMC *)PMC_data(key)) { switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) { case KEY_integer_FLAG: - value = string_append(interp, value, + value = Parrot_str_append(interp, value, string_from_int(interp, PMC_int_val(key))); break; case KEY_string_FLAG: - value = string_append(interp, value, quote); - value = string_append(interp, value, PMC_str_val(key)); - value = string_append(interp, value, quote); + value = Parrot_str_append(interp, value, quote); + value = Parrot_str_append(interp, value, PMC_str_val(key)); + value = Parrot_str_append(interp, value, quote); break; case KEY_pmc_FLAG: - value = string_append(interp, value, + value = Parrot_str_append(interp, value, VTABLE_get_string(interp, key)); break; case KEY_integer_FLAG | KEY_register_FLAG: - value = string_append(interp, value, + value = Parrot_str_append(interp, value, string_from_int(interp, REG_INT(interp, PMC_int_val(key)))); break; case KEY_string_FLAG | KEY_register_FLAG: - value = string_append(interp, value, quote); - value = string_append(interp, value, + value = Parrot_str_append(interp, value, quote); + value = Parrot_str_append(interp, value, REG_STR(interp, PMC_int_val(key))); - value = string_append(interp, value, quote); + value = Parrot_str_append(interp, value, quote); break; case KEY_pmc_FLAG | KEY_register_FLAG: { PMC * const reg = REG_PMC(interp, PMC_int_val(key)); - value = string_append(interp, value, + value = Parrot_str_append(interp, value, VTABLE_get_string(interp, reg)); } break; default: - value = string_append(interp, value, CONST_STRING(interp, "Key type unknown")); + value = Parrot_str_append(interp, value, CONST_STRING(interp, "Key type unknown")); break; } if (PMC_data(key)) - value = string_append(interp, value, semicolon); + value = Parrot_str_append(interp, value, semicolon); } - value = string_append(interp, value, string_from_cstring(interp, " ]", 2)); + value = Parrot_str_append(interp, value, string_from_cstring(interp, " ]", 2)); return value; } Modified: branches/pdd28str_part2/src/library.c ============================================================================== --- branches/pdd28str_part2/src/library.c (original) +++ branches/pdd28str_part2/src/library.c Wed Jan 28 22:16:55 2009 @@ -367,7 +367,7 @@ STRING * const nul = string_chr(interp, '\0'); - path = string_append(interp, path, nul); + path = Parrot_str_append(interp, path, nul); path->bufused--; path->strlen--; @@ -401,7 +401,7 @@ /* make sure the path has a trailing slash before appending the file */ if (string_index(interp, path , path->strlen - 1) != string_index(interp, path_separator_string, 0)) - path = string_append(interp, path , path_separator_string); + path = Parrot_str_append(interp, path , path_separator_string); return path; } @@ -425,7 +425,7 @@ { ASSERT_ARGS(path_append) l_path = path_guarantee_trailing_separator(interp, l_path); - l_path = string_append(interp, l_path, r_path); + l_path = Parrot_str_append(interp, l_path, r_path); return l_path; } @@ -452,7 +452,7 @@ join = string_copy(interp, l_path); join = path_guarantee_trailing_separator(interp, join); - join = string_append(interp, join, r_path); + join = Parrot_str_append(interp, join, r_path); return join; } @@ -532,7 +532,7 @@ /* First try substituting .pbc for the .pir extension */ if (string_equal(interp, orig_ext, pir_extension) == 0) { STRING *without_ext = string_chopn(interp, test_path, 4); - test_path = string_append(interp, without_ext, bytecode_extension); + test_path = Parrot_str_append(interp, without_ext, bytecode_extension); result = try_load_path(interp, test_path); if (result) return result; @@ -540,12 +540,12 @@ /* Next try substituting .pir, then .pasm for the .pbc extension */ else if (string_equal(interp, orig_ext, bytecode_extension) == 0) { STRING *without_ext = string_chopn(interp, test_path, 4); - test_path = string_append(interp, without_ext, pir_extension); + test_path = Parrot_str_append(interp, without_ext, pir_extension); result = try_load_path(interp, test_path); if (result) return result; - test_path = string_append(interp, without_ext, pasm_extension); + test_path = Parrot_str_append(interp, without_ext, pasm_extension); result = try_load_path(interp, test_path); if (result) return result; @@ -558,7 +558,7 @@ STRING *orig_ext = string_substr(interp, test_path, -5, 5, NULL, 0); if (string_equal(interp, orig_ext, pasm_extension) == 0) { STRING *without_ext = string_chopn(interp, test_path, 5); - test_path = string_append(interp, without_ext, bytecode_extension); + test_path = Parrot_str_append(interp, without_ext, bytecode_extension); result = try_load_path(interp, test_path); if (result) return result; Modified: branches/pdd28str_part2/src/ops/string.ops ============================================================================== --- branches/pdd28str_part2/src/ops/string.ops (original) +++ branches/pdd28str_part2/src/ops/string.ops Wed Jan 28 22:16:55 2009 @@ -101,7 +101,7 @@ =cut inline op concat(inout STR, in STR) :base_mem { - $1 = string_append(interp, $1, $2); + $1 = Parrot_str_append(interp, $1, $2); } inline op concat(invar PMC, invar PMC) :base_core { Modified: branches/pdd28str_part2/src/packdump.c ============================================================================== --- branches/pdd28str_part2/src/packdump.c (original) +++ branches/pdd28str_part2/src/packdump.c Wed Jan 28 22:16:55 2009 @@ -295,10 +295,10 @@ switch (sub->namespace_name->vtable->base_type) { case enum_class_String: namespace_description = string_from_cstring(interp, "'", 1); - namespace_description = string_append(interp, + namespace_description = Parrot_str_append(interp, namespace_description, PMC_str_val(sub->namespace_name)); - namespace_description = string_append(interp, + namespace_description = Parrot_str_append(interp, namespace_description, string_from_cstring(interp, "'", 1)); break; Modified: branches/pdd28str_part2/src/pmc/bigint.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/bigint.pmc (original) +++ branches/pdd28str_part2/src/pmc/bigint.pmc Wed Jan 28 22:16:55 2009 @@ -807,7 +807,7 @@ VTABLE STRING *get_repr() { STRING *s = SELF.get_string(); - return string_append(INTERP, s, CONST_STRING(INTERP, "L")); + return Parrot_str_append(INTERP, s, CONST_STRING(INTERP, "L")); } /* Modified: branches/pdd28str_part2/src/pmc/class.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/class.pmc (original) +++ branches/pdd28str_part2/src/pmc/class.pmc Wed Jan 28 22:16:55 2009 @@ -138,7 +138,7 @@ STRING * const attrib_name = VTABLE_get_string_keyed_str( interp, cur_attrib, name_str); - STRING *full_key = string_append(interp, fq_class, attrib_name); + STRING *full_key = Parrot_str_append(interp, fq_class, attrib_name); /* Insert into hash, along with index. */ VTABLE_set_integer_keyed_str(interp, attrib_index, full_key, cur_index); Modified: branches/pdd28str_part2/src/pmc/codestring.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/codestring.pmc (original) +++ branches/pdd28str_part2/src/pmc/codestring.pmc Wed Jan 28 22:16:55 2009 @@ -94,8 +94,8 @@ while (I0 < I1) { S0 = VTABLE_get_string_keyed_int(INTERP, args, I0); - repl = string_append(INTERP, repl, comma_space); - repl = string_append(INTERP, repl, S0); + repl = Parrot_str_append(INTERP, repl, comma_space); + repl = Parrot_str_append(INTERP, repl, S0); I0++; } } @@ -229,21 +229,21 @@ for (index2 = 0; index2 < elements2; index2++) { STRING *S0 = VTABLE_get_string_keyed_int(INTERP, P0, index2); (STRING *S0) = PCCINVOKE(INTERP, SELF, "escape", STRING *S0); - if (prefix) out = string_append(INTERP, out, prefix); - out = string_append(INTERP, out, S0); + if (prefix) out = Parrot_str_append(INTERP, out, prefix); + out = Parrot_str_append(INTERP, out, S0); prefix = semi; } } else { STRING *S0 = VTABLE_get_string_keyed_int(INTERP, args, index); (STRING *S0) = PCCINVOKE(INTERP, SELF, "escape", STRING *S0); - if (prefix) out = string_append(INTERP, out, prefix); - out = string_append(INTERP, out, S0); + if (prefix) out = Parrot_str_append(INTERP, out, prefix); + out = Parrot_str_append(INTERP, out, S0); prefix = semi; } } - out = string_append(INTERP, out, close_bracket); + out = Parrot_str_append(INTERP, out, close_bracket); RETURN(STRING *out); } Modified: branches/pdd28str_part2/src/pmc/filehandle.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/filehandle.pmc (original) +++ branches/pdd28str_part2/src/pmc/filehandle.pmc Wed Jan 28 22:16:55 2009 @@ -441,7 +441,7 @@ do { STRING * const part = Parrot_io_reads(INTERP, SELF, 0); - result = string_append(INTERP, result, part); + result = Parrot_str_append(INTERP, result, part); if (Parrot_io_eof(INTERP, SELF)) break; } while (1); Modified: branches/pdd28str_part2/src/pmc/fixedintegerarray.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/fixedintegerarray.pmc (original) +++ branches/pdd28str_part2/src/pmc/fixedintegerarray.pmc Wed Jan 28 22:16:55 2009 @@ -340,13 +340,13 @@ for (j = 0; j < n; ++j) { PMC * const val = SELF.get_pmc_keyed_int(j); - res = string_append(INTERP, res, VTABLE_get_repr(INTERP, val)); + res = Parrot_str_append(INTERP, res, VTABLE_get_repr(INTERP, val)); if (j < n - 1) - res = string_append(INTERP, res, CONST_STRING(INTERP, ", ")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, ", ")); } - res = string_append(INTERP, res, CONST_STRING(INTERP, " ]")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, " ]")); return res; } Modified: branches/pdd28str_part2/src/pmc/fixedpmcarray.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/fixedpmcarray.pmc (original) +++ branches/pdd28str_part2/src/pmc/fixedpmcarray.pmc Wed Jan 28 22:16:55 2009 @@ -193,14 +193,14 @@ for (i = 0; i < n; ++i) { PMC * const val = SELF.get_pmc_keyed_int(i); - res = string_append(INTERP, res, VTABLE_get_repr(INTERP, val)); + res = Parrot_str_append(INTERP, res, VTABLE_get_repr(INTERP, val)); if (n == 1) - res = string_append(INTERP, res, CONST_STRING(INTERP, ",")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, ",")); else if (i < n - 1) - res = string_append(INTERP, res, CONST_STRING(INTERP, ", ")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, ", ")); } - res = string_append(INTERP, res, CONST_STRING(INTERP, ")")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, ")")); return res; } Modified: branches/pdd28str_part2/src/pmc/fixedstringarray.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/fixedstringarray.pmc (original) +++ branches/pdd28str_part2/src/pmc/fixedstringarray.pmc Wed Jan 28 22:16:55 2009 @@ -490,15 +490,15 @@ for (j = 0; j < n; ++j) { PMC * const val = SELF.get_pmc_keyed_int(j); - res = string_append(INTERP, res, CONST_STRING(INTERP, "\"")); - res = string_append(INTERP, res, VTABLE_get_repr(INTERP, val)); - res = string_append(INTERP, res, CONST_STRING(INTERP, "\"")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, "\"")); + res = Parrot_str_append(INTERP, res, VTABLE_get_repr(INTERP, val)); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, "\"")); if (j < n - 1) - res = string_append(INTERP, res, CONST_STRING(INTERP, ", ")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, ", ")); } - res = string_append(INTERP, res, CONST_STRING(INTERP, " ]")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, " ]")); return res; } Modified: branches/pdd28str_part2/src/pmc/hash.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/hash.pmc (original) +++ branches/pdd28str_part2/src/pmc/hash.pmc Wed Jan 28 22:16:55 2009 @@ -369,23 +369,23 @@ } if (all_digit) { - res = string_append(INTERP, res, key); + res = Parrot_str_append(INTERP, res, key); } else { - res = string_append(INTERP, res, CONST_STRING(INTERP, "'")); - res = string_append(INTERP, res, key); - res = string_append(INTERP, res, CONST_STRING(INTERP, "'")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, "'")); + res = Parrot_str_append(INTERP, res, key); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, "'")); } - res = string_append(INTERP, res, CONST_STRING(INTERP, ": ")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, ": ")); val = SELF.get_pmc_keyed_str(key); - res = string_append(INTERP, res, VTABLE_get_string(INTERP, val)); + res = Parrot_str_append(INTERP, res, VTABLE_get_string(INTERP, val)); if (j < n - 1) - res = string_append(INTERP, res, CONST_STRING(INTERP, ", ")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, ", ")); } - res = string_append(INTERP, res, CONST_STRING(INTERP, "}")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, "}")); return res; } Modified: branches/pdd28str_part2/src/pmc/object.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/object.pmc (original) +++ branches/pdd28str_part2/src/pmc/object.pmc Wed Jan 28 22:16:55 2009 @@ -52,7 +52,7 @@ /* Build a string representing the fully qualified attribute name. */ STRING *fq_name = VTABLE_get_string(interp, cur_class); - fq_name = string_append(interp, fq_name, name); + fq_name = Parrot_str_append(interp, fq_name, name); /* Look up. */ if (VTABLE_exists_keyed_str(interp, _class->attrib_index, fq_name)) { @@ -91,7 +91,7 @@ /* Build a string representing the fully qualified attribute name. */ parent_class = Parrot_oo_get_class(interp, key); fq_name = VTABLE_get_string(interp, parent_class); - fq_name = string_append(interp, fq_name, name); + fq_name = Parrot_str_append(interp, fq_name, name); /* Look up. */ if (VTABLE_exists_keyed_str(interp, _class->attrib_index, fq_name)) { Modified: branches/pdd28str_part2/src/pmc/resizablepmcarray.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/resizablepmcarray.pmc (original) +++ branches/pdd28str_part2/src/pmc/resizablepmcarray.pmc Wed Jan 28 22:16:55 2009 @@ -664,13 +664,13 @@ for (j = 0; j < n; ++j) { PMC *val = SELF.get_pmc_keyed_int(j); - res = string_append(INTERP, res, VTABLE_get_repr(INTERP, val)); + res = Parrot_str_append(INTERP, res, VTABLE_get_repr(INTERP, val)); if (j < n - 1) - res = string_append(INTERP, res, CONST_STRING(INTERP, ", ")); + res = Parrot_str_append(INTERP, res, CONST_STRING(INTERP, ", ")); } - return string_append(INTERP, res, CONST_STRING(INTERP, " ]")); + return Parrot_str_append(INTERP, res, CONST_STRING(INTERP, " ]")); } /* Modified: branches/pdd28str_part2/src/pmc/scalar.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/scalar.pmc (original) +++ branches/pdd28str_part2/src/pmc/scalar.pmc Wed Jan 28 22:16:55 2009 @@ -1120,12 +1120,12 @@ VTABLE void i_concatenate(PMC *value) { STRING * const s = SELF.get_string(); STRING * const v = VTABLE_get_string(INTERP, value); - SELF.set_string_native(string_append(INTERP, s, v)); + SELF.set_string_native(Parrot_str_append(INTERP, s, v)); } VTABLE void i_concatenate_str(STRING *value) { STRING * const s = SELF.get_string(); - SELF.set_string_native(string_append(INTERP, s, value)); + SELF.set_string_native(Parrot_str_append(INTERP, s, value)); } /* Modified: branches/pdd28str_part2/src/pmc/stringhandle.pmc ============================================================================== --- branches/pdd28str_part2/src/pmc/stringhandle.pmc (original) +++ branches/pdd28str_part2/src/pmc/stringhandle.pmc Wed Jan 28 22:16:55 2009 @@ -405,7 +405,7 @@ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_PIO_ERROR, "Cannot write to a filehandle not opened for write"); - new_string = string_append(interp, old_string, to_print); + new_string = Parrot_str_append(interp, old_string, to_print); SET_ATTR_stringhandle(INTERP, SELF, new_string); Modified: branches/pdd28str_part2/src/spf_render.c ============================================================================== --- branches/pdd28str_part2/src/spf_render.c (original) +++ branches/pdd28str_part2/src/spf_render.c Wed Jan 28 22:16:55 2009 @@ -206,8 +206,8 @@ ignored = string_substr(interp, str, 1, len-1, &temp, 0); UNUSED(ignored); string_chopn_inplace(interp, str, -1); - str = string_append(interp, str, fill); - str = string_append(interp, str, temp); + str = Parrot_str_append(interp, str, fill); + str = Parrot_str_append(interp, str, temp); } else { str = Parrot_str_concat(interp, fill, str, 0); @@ -237,7 +237,7 @@ { ASSERT_ARGS(str_append_w_flags) src = handle_flags(interp, info, src, 1, prefix); - dest = string_append(interp, dest, src); + dest = Parrot_str_append(interp, dest, src); return dest; } @@ -345,7 +345,7 @@ = string_substr(interp, pat, old, len, &substr, 1); UNUSED(ignored); /* XXX This shouldn't modify targ the pointer */ - targ = string_append(interp, targ, substr); + targ = Parrot_str_append(interp, targ, substr); } len = 0; old = i; @@ -713,7 +713,7 @@ #endif string_cstring_free(tempstr); } - targ = string_append(interp, targ, cstr2pstr(tc)); + targ = Parrot_str_append(interp, targ, cstr2pstr(tc)); } break; @@ -813,7 +813,7 @@ } #endif /* WIN32 */ - targ = string_append(interp, targ, cstr2pstr(tc)); + targ = Parrot_str_append(interp, targ, cstr2pstr(tc)); } break; @@ -833,7 +833,7 @@ string, 0, NULL); obj->index++; - targ = string_append(interp, targ, ts); + targ = Parrot_str_append(interp, targ, ts); break; } @@ -844,7 +844,7 @@ info.type, obj); STRING * const ts = handle_flags(interp, &info, string, 0, NULL); - targ = string_append(interp, targ, ts); + targ = Parrot_str_append(interp, targ, ts); } break; @@ -888,7 +888,7 @@ if (len) { STRING *ignored = string_substr(interp, pat, old, len, &substr, 1); UNUSED(ignored); - targ = string_append(interp, targ, substr); + targ = Parrot_str_append(interp, targ, substr); } return targ; 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 22:16:55 2009 @@ -510,8 +510,8 @@ result = string_make_direct(interp, NULL, a->bufused + b->bufused, enc, cs, 0); - result = string_append(interp, result, a); - result = string_append(interp, result, b); + result = Parrot_str_append(interp, result, a); + result = Parrot_str_append(interp, result, b); return result; } @@ -527,7 +527,7 @@ /* -=item C<STRING * string_append> +=item C<STRING * Parrot_str_append> Take in two Parrot strings and append the second to the first. NOTE THAT RETURN VALUE MAY NOT BE THE FIRST STRING, if the first string is COW'd or @@ -541,9 +541,9 @@ PARROT_WARN_UNUSED_RESULT PARROT_CAN_RETURN_NULL STRING * -string_append(PARROT_INTERP, ARGMOD_NULLOK(STRING *a), ARGIN_NULLOK(STRING *b)) +Parrot_str_append(PARROT_INTERP, ARGMOD_NULLOK(STRING *a), ARGIN_NULLOK(STRING *b)) { - ASSERT_ARGS(string_append) + ASSERT_ARGS(Parrot_str_append) UINTVAL a_capacity; UINTVAL total_length; const CHARSET *cs; @@ -2527,7 +2527,7 @@ else hex = Parrot_sprintf_c(interp, "\\u%04x", c); - result = string_append(interp, result, hex); + result = Parrot_str_append(interp, result, hex); /* adjust our insert idx */ i += hex->strlen; @@ -3113,8 +3113,8 @@ for (i = 1; i < ar_len; ++i) { STRING * const next = VTABLE_get_string_keyed_int(interp, ar, i); - res = string_append(interp, res, j); - res = string_append(interp, res, next); + res = Parrot_str_append(interp, res, j); + res = Parrot_str_append(interp, res, next); } return res;