Author: allison
Date: Wed Jan 28 21:44:50 2009
New Revision: 36135
Modified:
branches/pdd28str_part2/include/parrot/string_funcs.h
branches/pdd28str_part2/languages/dotnet/pmc/dotnetassembly.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luanumber.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc
branches/pdd28str_part2/src/dynext.c
branches/pdd28str_part2/src/multidispatch.c
branches/pdd28str_part2/src/ops/string.ops
branches/pdd28str_part2/src/pmc/codestring.pmc
branches/pdd28str_part2/src/pmc/fixedbooleanarray.pmc
branches/pdd28str_part2/src/pmc/scalar.pmc
branches/pdd28str_part2/src/spf_render.c
branches/pdd28str_part2/src/string/api.c
branches/pdd28str_part2/tools/build/nativecall.pl
Log:
[pdd28str] Renaming 'Parrot_str_concat'.
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
21:44:50 2009
@@ -223,7 +223,7 @@
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
-STRING * string_concat(PARROT_INTERP,
+STRING * Parrot_str_concat(PARROT_INTERP,
ARGIN_NULLOK(STRING *a),
ARGIN_NULLOK(STRING *b),
UINTVAL Uflags)
@@ -616,7 +616,7 @@
#define ASSERT_ARGS_string_compute_strlen __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(s)
-#define ASSERT_ARGS_string_concat __attribute__unused__ int _ASSERT_ARGS_CHECK
= \
+#define ASSERT_ARGS_Parrot_str_concat __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
#define ASSERT_ARGS_string_copy __attribute__unused__ int _ASSERT_ARGS_CHECK =
\
PARROT_ASSERT_ARG(interp) \
Modified: branches/pdd28str_part2/languages/dotnet/pmc/dotnetassembly.pmc
==============================================================================
--- branches/pdd28str_part2/languages/dotnet/pmc/dotnetassembly.pmc
(original)
+++ branches/pdd28str_part2/languages/dotnet/pmc/dotnetassembly.pmc Wed Jan
28 21:44:50 2009
@@ -1194,9 +1194,9 @@
{
type->str_namespace = string_from_cstring(INTERP,
ass->strings + pos_namespace, 0);
- type->str_fullname = string_concat(INTERP, type->str_namespace,
+ type->str_fullname = Parrot_str_concat(INTERP, type->str_namespace,
string_from_literal(INTERP, "."), 0);
- type->str_fullname = string_concat(INTERP, type->str_fullname,
+ type->str_fullname = Parrot_str_concat(INTERP, type->str_fullname,
type->str_name, 0);
}
else
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
21:44:50 2009
@@ -795,7 +795,7 @@
*/
MULTI PMC *concatenate(LuaNumber value, PMC *dest) {
- STRING *s = string_concat(INTERP, SELF.get_string(),
+ STRING *s = Parrot_str_concat(INTERP, SELF.get_string(),
VTABLE_get_string(INTERP, value), 0);
dest = pmc_new(INTERP, dynpmc_LuaNumber);
@@ -805,7 +805,7 @@
}
MULTI PMC *concatenate(LuaString value, PMC *dest) {
- STRING *s = string_concat(INTERP, SELF.get_string(),
+ STRING *s = Parrot_str_concat(INTERP, SELF.get_string(),
VTABLE_get_string(INTERP, value), 0);
dest = pmc_new(INTERP, dynpmc_LuaNumber);
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
21:44:50 2009
@@ -890,7 +890,7 @@
*/
MULTI PMC* concatenate(LuaNumber value, PMC *dest) {
- STRING *s = string_concat(INTERP,
+ STRING *s = Parrot_str_concat(INTERP,
SELF.get_string(), VTABLE_get_string(INTERP, value), 0);
dest = pmc_new(INTERP, dynpmc_LuaString);
@@ -899,7 +899,7 @@
}
MULTI PMC* concatenate(LuaString value, PMC *dest) {
- STRING *s = string_concat(INTERP,
+ STRING *s = Parrot_str_concat(INTERP,
SELF.get_string(), VTABLE_get_string(INTERP, value), 0);
dest = pmc_new(INTERP, dynpmc_LuaString);
Modified: branches/pdd28str_part2/src/dynext.c
==============================================================================
--- branches/pdd28str_part2/src/dynext.c (original)
+++ branches/pdd28str_part2/src/dynext.c Wed Jan 28 21:44:50 2009
@@ -249,7 +249,7 @@
for (i = 0; i < n; ++i) {
ext = VTABLE_get_string_keyed_int(interp, share_ext, i);
- full_name = string_concat(interp, wo_ext, ext, 0);
+ full_name = Parrot_str_concat(interp, wo_ext, ext, 0);
path = Parrot_locate_runtime_file_str(interp, full_name,
PARROT_RUNTIME_FT_DYNEXT);
if (path) {
Modified: branches/pdd28str_part2/src/multidispatch.c
==============================================================================
--- branches/pdd28str_part2/src/multidispatch.c (original)
+++ branches/pdd28str_part2/src/multidispatch.c Wed Jan 28 21:44:50 2009
@@ -386,7 +386,7 @@
/* Check if we have an invocant, and add it to the front of the arguments
*/
if (!PMC_IS_NULL(obj)) {
- string_sig = string_concat(interp, CONST_STRING(interp, "Pi"),
string_sig, 0);
+ string_sig = Parrot_str_concat(interp, CONST_STRING(interp, "Pi"),
string_sig, 0);
VTABLE_set_string_native(interp, call_object, string_sig);
VTABLE_unshift_pmc(interp, call_object, obj);
}
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 21:44:50 2009
@@ -113,7 +113,7 @@
}
inline op concat(out STR, in STR, in STR) :base_mem {
- $1 = string_concat(interp, $2, $3, 1);
+ $1 = Parrot_str_concat(interp, $2, $3, 1);
}
inline op concat(invar PMC, invar PMC, in STR) :base_core {
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 21:44:50 2009
@@ -114,9 +114,9 @@
/* Add a newline if necessary */
if ('\n' != string_index(INTERP, fmt, string_length(interp, fmt) - 1))
- fmt = string_concat(INTERP, fmt, newline, 0);
+ fmt = Parrot_str_concat(INTERP, fmt, newline, 0);
- S1 = string_concat(INTERP, SELF.get_string(), fmt, 0);
+ S1 = Parrot_str_concat(INTERP, SELF.get_string(), fmt, 0);
VTABLE_set_string_native(INTERP, SELF, S1);
RETURN(PMC *SELF);
@@ -150,7 +150,7 @@
}
else {
STRING *result = string_copy(INTERP, format);
- result = string_concat(INTERP, result, counter_as_string, 1);
+ result = Parrot_str_concat(INTERP, result, counter_as_string,
1);
RETURN(STRING *result);
}
}
@@ -175,8 +175,8 @@
INTVAL is_unicode = 0;
UNUSED(SELF);
- escaped_str = string_concat(INTERP, quote, escaped_str, 1);
- escaped_str = string_concat(INTERP, escaped_str, quote, 1);
+ escaped_str = Parrot_str_concat(INTERP, quote, escaped_str, 1);
+ escaped_str = Parrot_str_concat(INTERP, escaped_str, quote, 1);
x_pos = string_str_index(INTERP, escaped_str, x, 0);
if (x_pos != -1) {
@@ -192,7 +192,7 @@
if (is_unicode) {
STRING *unicode = CONST_STRING(INTERP, "unicode:");
- escaped_str = string_concat(INTERP, unicode, escaped_str, 1);
+ escaped_str = Parrot_str_concat(INTERP, unicode, escaped_str, 1);
}
RETURN(STRING *escaped_str);
Modified: branches/pdd28str_part2/src/pmc/fixedbooleanarray.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/fixedbooleanarray.pmc (original)
+++ branches/pdd28str_part2/src/pmc/fixedbooleanarray.pmc Wed Jan 28
21:44:50 2009
@@ -241,9 +241,9 @@
for (i = 0; i < elems; i++) {
if (SELF.get_integer_keyed_int((INTVAL)i))
- str = string_concat(INTERP, str, one, 0);
+ str = Parrot_str_concat(INTERP, str, one, 0);
else
- str = string_concat(INTERP, str, zero, 0);
+ str = Parrot_str_concat(INTERP, str, zero, 0);
}
return str;
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 21:44:50 2009
@@ -1098,7 +1098,7 @@
*/
VTABLE PMC *concatenate(PMC *value, PMC *dest) {
- STRING * const s = string_concat(INTERP, SELF.get_string(),
+ STRING * const s = Parrot_str_concat(INTERP, SELF.get_string(),
VTABLE_get_string(INTERP, value), 0);
dest = pmc_new(INTERP, VTABLE_type(INTERP, SELF));
@@ -1108,7 +1108,7 @@
}
VTABLE PMC *concatenate_str(STRING *value, PMC *dest) {
- STRING * const s = string_concat(INTERP,
+ STRING * const s = Parrot_str_concat(INTERP,
SELF.get_string(), value, 0);
dest = pmc_new(INTERP, VTABLE_type(INTERP, SELF));
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 21:44:50 2009
@@ -142,19 +142,19 @@
if (!len || string_ord(interp, str, 0) != '-') {
if (info->flags & FLAG_PLUS) {
STRING * const cs = CONST_STRING(interp, "+");
- str = string_concat(interp, cs, str, 0);
+ str = Parrot_str_concat(interp, cs, str, 0);
len++;
}
else if (info->flags & FLAG_SPACE) {
STRING * const cs = CONST_STRING(interp, " ");
- str = string_concat(interp, cs, str, 0);
+ str = Parrot_str_concat(interp, cs, str, 0);
len++;
}
}
/* # 0x ... */
if ((info->flags & FLAG_SHARP) && prefix) {
- str = string_concat(interp, prefix, str, 0);
+ str = Parrot_str_concat(interp, prefix, str, 0);
len += string_length(interp, prefix);
}
/* XXX sharp + fill ??? */
@@ -194,7 +194,7 @@
STRING * const fill = Parrot_str_repeat(interp, filler, info->width -
len);
if (info->flags & FLAG_MINUS) { /* left-align */
- str = string_concat(interp, str, fill, 0);
+ str = Parrot_str_concat(interp, str, fill, 0);
}
else { /* right-align */
/* signed and zero padded */
@@ -210,7 +210,7 @@
str = string_append(interp, str, temp);
}
else {
- str = string_concat(interp, fill, str, 0);
+ str = Parrot_str_concat(interp, fill, str, 0);
}
}
}
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 21:44:50 2009
@@ -478,7 +478,7 @@
/*
-=item C<STRING * string_concat>
+=item C<STRING * Parrot_str_concat>
Concatenates two Parrot strings. If necessary, converts the second
string's encoding and/or type to match those of the first string. If
@@ -493,10 +493,10 @@
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
STRING *
-string_concat(PARROT_INTERP, ARGIN_NULLOK(STRING *a),
+Parrot_str_concat(PARROT_INTERP, ARGIN_NULLOK(STRING *a),
ARGIN_NULLOK(STRING *b), UINTVAL Uflags)
{
- ASSERT_ARGS(string_concat)
+ ASSERT_ARGS(Parrot_str_concat)
if (a != NULL && a->strlen != 0) {
if (b != NULL && b->strlen != 0) {
const ENCODING *enc;
@@ -564,9 +564,9 @@
saneify_string(b);
/* If the destination's constant, or external then just fall back to
- string_concat */
+ Parrot_str_concat */
if (PObj_is_cowed_TESTALL(a))
- return string_concat(interp, a, b, 0);
+ return Parrot_str_concat(interp, a, b, 0);
cs = string_rep_compatible(interp, a, b, &enc);
if (cs) {
Modified: branches/pdd28str_part2/tools/build/nativecall.pl
==============================================================================
--- branches/pdd28str_part2/tools/build/nativecall.pl (original)
+++ branches/pdd28str_part2/tools/build/nativecall.pl Wed Jan 28 21:44:50 2009
@@ -560,7 +560,7 @@
/* Try if JIT code can build that signature. If yes, we are done */
jit_key_name = CONST_STRING(interp, "_XJIT_");
- jit_key_name = string_concat(interp, jit_key_name, signature, 0);
+ jit_key_name = Parrot_str_concat(interp, jit_key_name, signature, 0);
b = VTABLE_get_pmc_keyed_str(interp, HashPointer, jit_key_name);
if (b && b->vtable->base_type == enum_class_ManagedStruct) {
@@ -591,14 +591,14 @@
with a neater way to do this.
*/
ns = string_make(interp, " is an unknown signature type", 29, "ascii", 0);
- message = string_concat(interp, signature, ns, 0);
+ message = Parrot_str_concat(interp, signature, ns, 0);
#if defined(CAN_BUILD_CALL_FRAMES)
ns = string_make(interp, ".\\nCAN_BUILD_CALL_FRAMES is enabled, this
should not happen", 58, "ascii", 0);
#else
ns = string_make(interp, ".\\nCAN_BUILD_CALL_FRAMES is disabled, add the
signature to src/call_list.txt", 75, "ascii", 0);
#endif
- message = string_concat(interp, message, ns, 0);
+ message = Parrot_str_concat(interp, message, ns, 0);
/*
* I think there may be memory issues with this but if we get to here we
are
