Author: allison
Date: Wed Jan 28 20:14:19 2009
New Revision: 36131
Modified:
branches/pdd28str_part2/include/parrot/string_funcs.h
branches/pdd28str_part2/src/ops/set.ops
branches/pdd28str_part2/src/pmc/string.pmc
branches/pdd28str_part2/src/string/api.c
Log:
[pdd28str] Renaming 'Parrot_str_set'.
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
20:14:19 2009
@@ -434,7 +434,7 @@
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
-STRING * string_set(PARROT_INTERP,
+STRING * Parrot_str_set(PARROT_INTERP,
ARGIN_NULLOK(STRING *dest),
ARGMOD(STRING *src))
__attribute__nonnull__(1)
@@ -692,7 +692,7 @@
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(src) \
|| PARROT_ASSERT_ARG(rep)
-#define ASSERT_ARGS_string_set __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_str_set __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(src)
#define ASSERT_ARGS_string_split __attribute__unused__ int _ASSERT_ARGS_CHECK
= \
Modified: branches/pdd28str_part2/src/ops/set.ops
==============================================================================
--- branches/pdd28str_part2/src/ops/set.ops (original)
+++ branches/pdd28str_part2/src/ops/set.ops Wed Jan 28 20:14:19 2009
@@ -246,7 +246,7 @@
}
inline op assign(out STR, in STR) :base_core {
- $1 = string_set(interp, $1, $2);
+ $1 = Parrot_str_set(interp, $1, $2);
}
inline op setref(invar PMC, invar PMC) :base_core {
Modified: branches/pdd28str_part2/src/pmc/string.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/string.pmc (original)
+++ branches/pdd28str_part2/src/pmc/string.pmc Wed Jan 28 20:14:19 2009
@@ -235,7 +235,7 @@
*/
VTABLE void assign_string_native(STRING *value) {
- PMC_str_val(SELF) = string_set(INTERP, SELF.get_string(), value);
+ PMC_str_val(SELF) = Parrot_str_set(INTERP, SELF.get_string(), value);
}
/*
@@ -251,7 +251,7 @@
VTABLE void set_string_same(PMC *value) {
PMC_str_val(SELF) =
- string_set(INTERP, SELF.get_string(), VTABLE_get_string(INTERP,
value));
+ Parrot_str_set(INTERP, SELF.get_string(),
VTABLE_get_string(INTERP, value));
}
/*
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 20:14:19 2009
@@ -206,7 +206,7 @@
/*
-=item C<STRING * string_set>
+=item C<STRING * Parrot_str_set>
Makes the contents of first Parrot string a copy of the contents of
second.
@@ -218,9 +218,9 @@
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
STRING *
-string_set(PARROT_INTERP, ARGIN_NULLOK(STRING *dest), ARGMOD(STRING *src))
+Parrot_str_set(PARROT_INTERP, ARGIN_NULLOK(STRING *dest), ARGMOD(STRING *src))
{
- ASSERT_ARGS(string_set)
+ ASSERT_ARGS(Parrot_str_set)
if (dest == src)
return dest;
if (dest) { /* && dest != src */
