[svn:parrot] r36273 - in branches/pdd28str_part2: include/parrot languages/perl6/src/pmc src/ops src/pmc src/string src/string/encoding
allison at svn.parrot.org
allison at svn.parrot.org
Mon Feb 2 06:31:26 UTC 2009
Author: allison
Date: Mon Feb 2 06:31:25 2009
New Revision: 36273
URL: https://trac.parrot.org/parrot/changeset/36273
Log:
[pdd28str] Renaming 'string_replace' to 'Parrot_str_replace'.
Modified:
branches/pdd28str_part2/include/parrot/string_funcs.h
branches/pdd28str_part2/languages/perl6/src/pmc/perl6str.pmc
branches/pdd28str_part2/src/ops/string.ops
branches/pdd28str_part2/src/pmc/codestring.pmc
branches/pdd28str_part2/src/pmc/string.pmc
branches/pdd28str_part2/src/string/api.c
branches/pdd28str_part2/src/string/encoding/fixed_8.c
Modified: branches/pdd28str_part2/include/parrot/string_funcs.h
==============================================================================
--- branches/pdd28str_part2/include/parrot/string_funcs.h Mon Feb 2 06:03:57 2009 (r36272)
+++ branches/pdd28str_part2/include/parrot/string_funcs.h Mon Feb 2 06:31:25 2009 (r36273)
@@ -411,7 +411,7 @@
PARROT_EXPORT
PARROT_CAN_RETURN_NULL
-STRING * string_replace(PARROT_INTERP,
+STRING * Parrot_str_replace(PARROT_INTERP,
ARGIN(STRING *src),
INTVAL offset,
INTVAL length,
@@ -678,7 +678,7 @@
#define ASSERT_ARGS_string_repeat __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(s)
-#define ASSERT_ARGS_string_replace __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_str_replace __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(src) \
|| PARROT_ASSERT_ARG(rep)
Modified: branches/pdd28str_part2/languages/perl6/src/pmc/perl6str.pmc
==============================================================================
--- branches/pdd28str_part2/languages/perl6/src/pmc/perl6str.pmc Mon Feb 2 06:03:57 2009 (r36272)
+++ branches/pdd28str_part2/languages/perl6/src/pmc/perl6str.pmc Mon Feb 2 06:31:25 2009 (r36273)
@@ -358,8 +358,8 @@
if (isalpha((unsigned char)start[a]))
c = start[a];
- string_replace(INTERP, str, a + 1, b, rep, 0);
- string_replace(INTERP, str, a, 1, string_chr(INTERP, c), 0);
+ Parrot_str_replace(INTERP, str, a + 1, b, rep, 0);
+ Parrot_str_replace(INTERP, str, a, 1, string_chr(INTERP, c), 0);
}
}
Modified: branches/pdd28str_part2/src/ops/string.ops
==============================================================================
--- branches/pdd28str_part2/src/ops/string.ops Mon Feb 2 06:03:57 2009 (r36272)
+++ branches/pdd28str_part2/src/ops/string.ops Mon Feb 2 06:31:25 2009 (r36273)
@@ -268,11 +268,11 @@
}
inline op substr(out STR, inout STR, in INT, in INT, in STR) :base_core {
- $1 = string_replace(interp, $2, $3, $4, $5, &$1);
+ $1 = Parrot_str_replace(interp, $2, $3, $4, $5, &$1);
}
inline op substr(inout STR, in INT, in INT, in STR) :base_core {
- (void)string_replace(interp, $1, $2, $3, $4, NULL);
+ (void)Parrot_str_replace(interp, $1, $2, $3, $4, NULL);
}
inline op substr(out STR, invar PMC, in INT, in INT) :base_core {
Modified: branches/pdd28str_part2/src/pmc/codestring.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/codestring.pmc Mon Feb 2 06:03:57 2009 (r36272)
+++ branches/pdd28str_part2/src/pmc/codestring.pmc Mon Feb 2 06:31:25 2009 (r36273)
@@ -108,7 +108,7 @@
continue;
}
- (void) string_replace(INTERP, fmt, pos, 2, repl, NULL);
+ (void) Parrot_str_replace(INTERP, fmt, pos, 2, repl, NULL);
replen = Parrot_str_byte_length(INTERP, repl);
}
Modified: branches/pdd28str_part2/src/pmc/string.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/string.pmc Mon Feb 2 06:03:57 2009 (r36272)
+++ branches/pdd28str_part2/src/pmc/string.pmc Mon Feb 2 06:31:25 2009 (r36273)
@@ -626,14 +626,14 @@
void set_string_keyed(PMC *key, STRING * const value) {
STRING * const s = SELF.get_string();
const INTVAL len = Parrot_str_byte_length(INTERP, value);
- string_replace(INTERP, s, key_integer(INTERP, key), len, value, NULL);
+ Parrot_str_replace(INTERP, s, key_integer(INTERP, key), len, value, NULL);
VTABLE_set_string_native(INTERP, SELF, s);
}
VTABLE void set_integer_keyed(PMC *key, INTVAL value) {
STRING * const s = SELF.get_string();
STRING * const c = string_chr(INTERP, (UINTVAL) value);
- string_replace(INTERP, s, key_integer(INTERP, key), 1, c, NULL);
+ Parrot_str_replace(INTERP, s, key_integer(INTERP, key), 1, c, NULL);
VTABLE_set_string_native(INTERP, SELF, s);
}
/*
@@ -653,7 +653,7 @@
INTVAL i = 0;
while (-1 != (i = Parrot_str_find_index(INTERP, s, orig, i))) {
- (void)string_replace(INTERP, s, i, old_len, _new, NULL);
+ (void)Parrot_str_replace(INTERP, s, i, old_len, _new, NULL);
i += new_len;
}
Modified: branches/pdd28str_part2/src/string/api.c
==============================================================================
--- branches/pdd28str_part2/src/string/api.c Mon Feb 2 06:03:57 2009 (r36272)
+++ branches/pdd28str_part2/src/string/api.c Mon Feb 2 06:31:25 2009 (r36273)
@@ -1187,7 +1187,7 @@
/*
-=item C<STRING * string_replace>
+=item C<STRING * Parrot_str_replace>
Replaces a sequence of C<length> characters from C<offset> in the first
Parrot string with the second Parrot string, returning what was
@@ -1212,10 +1212,10 @@
PARROT_EXPORT
PARROT_CAN_RETURN_NULL
STRING *
-string_replace(PARROT_INTERP, ARGIN(STRING *src),
+Parrot_str_replace(PARROT_INTERP, ARGIN(STRING *src),
INTVAL offset, INTVAL length, ARGIN(STRING *rep), ARGOUT_NULLOK(STRING **d))
{
- ASSERT_ARGS(string_replace)
+ ASSERT_ARGS(Parrot_str_replace)
UINTVAL start_byte, end_byte;
INTVAL diff;
String_iter iter;
Modified: branches/pdd28str_part2/src/string/encoding/fixed_8.c
==============================================================================
--- branches/pdd28str_part2/src/string/encoding/fixed_8.c Mon Feb 2 06:03:57 2009 (r36272)
+++ branches/pdd28str_part2/src/string/encoding/fixed_8.c Mon Feb 2 06:31:25 2009 (r36273)
@@ -469,7 +469,7 @@
UINTVAL offset, UINTVAL count, ARGMOD(STRING *new_bytes))
{
ASSERT_ARGS(set_bytes)
- string_replace(interp, source_string, offset, count, new_bytes, NULL);
+ Parrot_str_replace(interp, source_string, offset, count, new_bytes, NULL);
}
/*
More information about the parrot-commits
mailing list