[svn:parrot] r36238 - in branches/pdd28str_part2: include/parrot languages/dotnet/pmc languages/lua/src/pmc languages/perl6/src/pmc src src/io src/jit/i386 src/ops src/pmc src/string src/string/charset tools/build
allison at svn.parrot.org
allison at svn.parrot.org
Sun Feb 1 08:02:57 UTC 2009
Author: allison
Date: Sun Feb 1 08:02:55 2009
New Revision: 36238
URL: https://trac.parrot.org/parrot/changeset/36238
Log:
[pdd28str] Renaming 'Parrot_str_byte_length'.
Modified:
branches/pdd28str_part2/include/parrot/string_funcs.h
branches/pdd28str_part2/languages/dotnet/pmc/dotnetsignature.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luabytecode.pmc
branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc
branches/pdd28str_part2/languages/perl6/src/pmc/perl6str.pmc
branches/pdd28str_part2/src/debug.c
branches/pdd28str_part2/src/hll.c
branches/pdd28str_part2/src/io/filehandle.c
branches/pdd28str_part2/src/io/io_string.c
branches/pdd28str_part2/src/jit/i386/core.jit
branches/pdd28str_part2/src/library.c
branches/pdd28str_part2/src/multidispatch.c
branches/pdd28str_part2/src/oo.c
branches/pdd28str_part2/src/ops/io.ops
branches/pdd28str_part2/src/ops/string.ops
branches/pdd28str_part2/src/pmc/codestring.pmc
branches/pdd28str_part2/src/pmc/default.pmc
branches/pdd28str_part2/src/pmc/filehandle.pmc
branches/pdd28str_part2/src/pmc/fixedintegerarray.pmc
branches/pdd28str_part2/src/pmc/namespace.pmc
branches/pdd28str_part2/src/pmc/nci.pmc
branches/pdd28str_part2/src/pmc/packfile.pmc
branches/pdd28str_part2/src/pmc/string.pmc
branches/pdd28str_part2/src/pmc/stringhandle.pmc
branches/pdd28str_part2/src/pmc_freeze.c
branches/pdd28str_part2/src/spf_render.c
branches/pdd28str_part2/src/string/api.c
branches/pdd28str_part2/src/string/charset/ascii.c
branches/pdd28str_part2/src/string/charset/iso-8859-1.c
branches/pdd28str_part2/src/string/charset/unicode.c
branches/pdd28str_part2/src/string/primitives.c
branches/pdd28str_part2/tools/build/nativecall.pl
Modified: branches/pdd28str_part2/include/parrot/string_funcs.h
==============================================================================
--- branches/pdd28str_part2/include/parrot/string_funcs.h Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/include/parrot/string_funcs.h Sun Feb 1 08:02:55 2009 (r36238)
@@ -337,7 +337,7 @@
PARROT_EXPORT
PARROT_PURE_FUNCTION
-UINTVAL string_length(SHIM_INTERP, ARGIN(const STRING *s))
+UINTVAL Parrot_str_byte_length(SHIM_INTERP, ARGIN(const STRING *s))
__attribute__nonnull__(2);
PARROT_EXPORT
@@ -659,7 +659,7 @@
#define ASSERT_ARGS_string_join __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(ar)
-#define ASSERT_ARGS_string_length __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+#define ASSERT_ARGS_Parrot_str_byte_length __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(s)
#define ASSERT_ARGS_string_make __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp)
Modified: branches/pdd28str_part2/languages/dotnet/pmc/dotnetsignature.pmc
==============================================================================
--- branches/pdd28str_part2/languages/dotnet/pmc/dotnetsignature.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/languages/dotnet/pmc/dotnetsignature.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -59,7 +59,7 @@
/* Get blob data and its size and reset current position. */
sig->data = string_to_cstring(INTERP, s);
- sig->data_size = string_length(INTERP, s);
+ sig->data_size = Parrot_str_byte_length(INTERP, s);
sig->cur_pos = 0;
}
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luabytecode.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luabytecode.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luabytecode.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -66,7 +66,7 @@
static void _init(Interp *interp, STRING *str)
{
bytecode = Parrot_string_cstring(interp, str);
- maxi = string_length(interp, str);
+ maxi = Parrot_str_byte_length(interp, str);
fp = (const char *)bytecode;
}
Modified: branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc
==============================================================================
--- branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/languages/lua/src/pmc/luastring.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -228,7 +228,7 @@
*/
VTABLE INTVAL elements() {
- return string_length(INTERP, PMC_str_val(SELF));
+ return Parrot_str_byte_length(INTERP, PMC_str_val(SELF));
}
/*
Modified: branches/pdd28str_part2/languages/perl6/src/pmc/perl6str.pmc
==============================================================================
--- branches/pdd28str_part2/languages/perl6/src/pmc/perl6str.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/languages/perl6/src/pmc/perl6str.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -272,7 +272,7 @@
VTABLE void increment() {
STRING *str = Parrot_unCOW_string(interp, PMC_str_val(SELF));
char *start = str->strstart;
- const char * const end = start + string_length(INTERP, str);
+ const char * const end = start + Parrot_str_byte_length(INTERP, str);
/* pointer to the substring we're going to increment */
char *substr;
@@ -367,7 +367,7 @@
VTABLE void decrement() {
STRING *str = Parrot_unCOW_string(interp, PMC_str_val(SELF));
char *start = str->strstart;
- char * const end = start + string_length(INTERP, str);
+ char * const end = start + Parrot_str_byte_length(INTERP, str);
/* pointer to the substring we're going to decrement */
char *substr;
Modified: branches/pdd28str_part2/src/debug.c
==============================================================================
--- branches/pdd28str_part2/src/debug.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/debug.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -2764,7 +2764,7 @@
strcpy(&dest[size], temp);
string_cstring_free(temp);
}
- size += string_length(interp, PMC_str_val(k));
+ size += Parrot_str_byte_length(interp, PMC_str_val(k));
dest[size++] = '"';
break;
case KEY_integer_FLAG|KEY_register_FLAG:
Modified: branches/pdd28str_part2/src/hll.c
==============================================================================
--- branches/pdd28str_part2/src/hll.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/hll.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -96,7 +96,7 @@
if (entry_name && !STRING_IS_EMPTY(entry_name)) {
char * const cstring = string_to_cstring(interp, entry_name);
- const UINTVAL len = string_length(interp, entry_name);
+ const UINTVAL len = Parrot_str_byte_length(interp, entry_name);
STRING *const_name = Parrot_str_new_init(interp, cstring,
len, PARROT_DEFAULT_ENCODING, PARROT_DEFAULT_CHARSET,
PObj_constant_FLAG);
Modified: branches/pdd28str_part2/src/io/filehandle.c
==============================================================================
--- branches/pdd28str_part2/src/io/filehandle.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/io/filehandle.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -48,7 +48,7 @@
if (STRING_IS_NULL(mode_str))
return PIO_F_READ;
- mode_len = string_length(interp, mode_str);
+ mode_len = Parrot_str_byte_length(interp, mode_str);
for (i = 0; i < mode_len; ++i) {
INTVAL s = string_index(interp, mode_str, i);
Modified: branches/pdd28str_part2/src/io/io_string.c
==============================================================================
--- branches/pdd28str_part2/src/io/io_string.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/io/io_string.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -152,7 +152,7 @@
}
l->self = Parrot_str_append(interp, old_string, s);
- return string_length(interp, (STRING *)l->self);
+ return Parrot_str_byte_length(interp, (STRING *)l->self);
}
/*
Modified: branches/pdd28str_part2/src/jit/i386/core.jit
==============================================================================
--- branches/pdd28str_part2/src/jit/i386/core.jit Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/jit/i386/core.jit Sun Feb 1 08:02:55 2009 (r36238)
@@ -1299,7 +1299,7 @@
/*
* movl $2, %ecx # %ecx := string
* movl $3, %edx # %edx := offset
- * movl %ecx, %eax # %eax := string_length
+ * movl %ecx, %eax # %eax := Parrot_str_byte_length
* cmpl #0, %ecx
* je L1
*/
Modified: branches/pdd28str_part2/src/library.c
==============================================================================
--- branches/pdd28str_part2/src/library.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/library.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -527,7 +527,7 @@
*/
if (!STRING_IS_NULL(test_path)) {
- if (string_length(interp, test_path) > 4) {
+ if (Parrot_str_byte_length(interp, test_path) > 4) {
STRING *orig_ext = string_substr(interp, test_path, -4, 4, NULL, 0);
/* First try substituting .pbc for the .pir extension */
if (string_equal(interp, orig_ext, pir_extension) == 0) {
@@ -554,7 +554,7 @@
}
/* Finally, try substituting .pbc for the .pasm extension. */
- if (string_length(interp, test_path) > 5) {
+ if (Parrot_str_byte_length(interp, test_path) > 5) {
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);
@@ -649,7 +649,7 @@
for (i = 0; i < n; ++i) {
STRING * const path = VTABLE_get_string_keyed_int(interp, paths, i);
- if (string_length(interp, prefix) && !is_abs_path(path))
+ if (Parrot_str_byte_length(interp, prefix) && !is_abs_path(path))
full_name = path_concat(interp, prefix, path);
else
full_name = string_copy(interp, path);
@@ -807,7 +807,7 @@
STRING * const dot = string_make(interp, ".", 1, charset,
PObj_external_FLAG|PObj_constant_FLAG);
- const INTVAL len = string_length(interp, in);
+ const INTVAL len = Parrot_str_byte_length(interp, in);
STRING *stem;
INTVAL pos_sl, pos_dot;
Modified: branches/pdd28str_part2/src/multidispatch.c
==============================================================================
--- branches/pdd28str_part2/src/multidispatch.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/multidispatch.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -305,7 +305,7 @@
PMC *returns = PMCNULL;
PMC *call_object = pmc_new(interp, enum_class_CallSignature);
STRING *string_sig = Parrot_str_new_constant(interp, sig);
- const INTVAL sig_len = string_length(interp, string_sig);
+ const INTVAL sig_len = Parrot_str_byte_length(interp, string_sig);
INTVAL in_return_sig = 0;
INTVAL i;
@@ -836,7 +836,7 @@
ASSERT_ARGS(Parrot_mmd_build_type_tuple_from_sig_obj)
PMC * const type_tuple = pmc_new(interp, enum_class_FixedIntegerArray);
STRING *string_sig = VTABLE_get_string(interp, sig_obj);
- const INTVAL sig_len = string_length(interp, string_sig);
+ const INTVAL sig_len = Parrot_str_byte_length(interp, string_sig);
INTVAL tuple_size = 0;
INTVAL args_ended = 0;
INTVAL i;
Modified: branches/pdd28str_part2/src/oo.c
==============================================================================
--- branches/pdd28str_part2/src/oo.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/oo.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -138,7 +138,7 @@
/* Strip leading underscores in the vtable name */
if (string_str_index(interp, vtable_name, CONST_STRING(interp, "__"), 0) == 0) {
vtable_name = string_substr(interp, vtable_name, 2,
- string_length(interp, vtable_name) - 2, NULL, 0);
+ Parrot_str_byte_length(interp, vtable_name) - 2, NULL, 0);
}
VTABLE_add_vtable_override(interp, self, vtable_name, vtable_sub);
Modified: branches/pdd28str_part2/src/ops/io.ops
==============================================================================
--- branches/pdd28str_part2/src/ops/io.ops Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/ops/io.ops Sun Feb 1 08:02:55 2009 (r36238)
@@ -157,7 +157,7 @@
op print(in STR) :base_io {
STRING * const s = $1;
- if (s && string_length(interp, s))
+ if (s && Parrot_str_byte_length(interp, s))
Parrot_io_putps(interp, _PIO_STDOUT(interp), s);
}
@@ -190,7 +190,7 @@
op say(in STR) :base_io {
STRING * const s = $1;
- if (s && string_length(interp, s))
+ if (s && Parrot_str_byte_length(interp, s))
Parrot_io_putps(interp, _PIO_STDOUT(interp), s);
Parrot_io_puts(interp, _PIO_STDOUT(interp), "\n");
}
@@ -239,7 +239,7 @@
op printerr(in STR) :base_io {
STRING * const s = $1;
- if (s && string_length(interp, s))
+ if (s && Parrot_str_byte_length(interp, s))
Parrot_io_putps(interp, _PIO_STDERR(interp), s);
}
Modified: branches/pdd28str_part2/src/ops/string.ops
==============================================================================
--- branches/pdd28str_part2/src/ops/string.ops Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/ops/string.ops Sun Feb 1 08:02:55 2009 (r36238)
@@ -184,7 +184,7 @@
=cut
inline op length(out INT, in STR) :base_mem {
- $1 = $2 ? string_length(interp, $2) : 0;
+ $1 = $2 ? Parrot_str_byte_length(interp, $2) : 0;
}
inline op bytelength(out INT, in STR) :base_mem {
@@ -259,7 +259,7 @@
=cut
inline op substr(out STR, in STR, in INT) :base_core {
- const INTVAL len = string_length(interp, $2);
+ const INTVAL len = Parrot_str_byte_length(interp, $2);
$1 = string_substr(interp, $2, $3, len, &$1, 0);
}
Modified: branches/pdd28str_part2/src/pmc/codestring.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/codestring.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/codestring.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -109,11 +109,11 @@
}
(void) string_replace(INTERP, fmt, pos, 2, repl, NULL);
- replen = string_length(INTERP, repl);
+ replen = Parrot_str_byte_length(INTERP, repl);
}
/* Add a newline if necessary */
- if ('\n' != string_index(INTERP, fmt, string_length(interp, fmt) - 1))
+ if ('\n' != string_index(INTERP, fmt, Parrot_str_byte_length(interp, fmt) - 1))
fmt = Parrot_str_concat(INTERP, fmt, newline, 0);
S1 = Parrot_str_concat(INTERP, SELF.get_string(), fmt, 0);
Modified: branches/pdd28str_part2/src/pmc/default.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/default.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/default.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -233,7 +233,7 @@
does_isa(PARROT_INTERP, const STRING *method, const STRING *what)
{
INTVAL pos = 0;
- INTVAL length = string_length(interp, what);
+ INTVAL length = Parrot_str_byte_length(interp, what);
do {
INTVAL len;
@@ -247,7 +247,7 @@
if (pos >= length)
return 0;
- len = string_length(interp, method);
+ len = Parrot_str_byte_length(interp, method);
if (pos && string_index(interp, what, pos - 1) != 32) {
pos += len;
Modified: branches/pdd28str_part2/src/pmc/filehandle.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/filehandle.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/filehandle.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -366,7 +366,7 @@
string_result = Parrot_io_reads(INTERP, SELF, 0);
if (!string_result)
RETURN(PMC *PMCNULL);
- len = string_length(INTERP, string_result);
+ len = Parrot_str_byte_length(INTERP, string_result);
if (len < 1)
RETURN(PMC *PMCNULL);
while (len > 0 &&
Modified: branches/pdd28str_part2/src/pmc/fixedintegerarray.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/fixedintegerarray.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/fixedintegerarray.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -71,7 +71,7 @@
else
SELF = pmc_new(INTERP, type);
- l = string_length(INTERP, rep);
+ l = Parrot_str_byte_length(INTERP, rep);
if (!l)
return SELF;
Modified: branches/pdd28str_part2/src/pmc/namespace.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/namespace.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/namespace.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -63,7 +63,7 @@
if (sub->vtable_index == -1) {
if (string_str_index(interp, key, CONST_STRING(interp, "__"), 0) == 0) {
STRING * const meth_name = string_substr(interp, key, 2,
- (INTVAL)(string_length(interp, key) - 2), NULL, 0);
+ (INTVAL)(Parrot_str_byte_length(interp, key) - 2), NULL, 0);
sub->vtable_index =
Parrot_get_vtable_index(interp, meth_name);
}
Modified: branches/pdd28str_part2/src/pmc/nci.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/nci.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/nci.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -178,7 +178,7 @@
pcc_params(INTERP, key, nci_info);
/* Arity is length of that string minus one (the return type). */
- nci_info->arity = string_length(INTERP, key) - 1;
+ nci_info->arity = Parrot_str_byte_length(INTERP, key) - 1;
/* Build call function. */
nci_info->func = (PMC *)(build_call_func(INTERP, SELF,
Modified: branches/pdd28str_part2/src/pmc/packfile.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/packfile.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/packfile.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -87,7 +87,7 @@
VTABLE void set_string_native(STRING *str) {
PackFile *pf = PMC_data_typed(SELF, PackFile *);
const opcode_t *ptr = (const opcode_t*)Parrot_string_cstring(interp, str);
- int length = string_length(interp, str);
+ int length = Parrot_str_byte_length(interp, str);
if (!PackFile_unpack(interp, pf, ptr, length))
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_MALFORMED_PACKFILE,
"Can't unpack packfile.");
Modified: branches/pdd28str_part2/src/pmc/string.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/string.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/string.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -584,7 +584,7 @@
*/
VTABLE INTVAL exists_keyed(PMC *key) {
- const INTVAL n = string_length(INTERP, VTABLE_get_string(INTERP, SELF));
+ const INTVAL n = Parrot_str_byte_length(INTERP, VTABLE_get_string(INTERP, SELF));
const INTVAL k = VTABLE_get_integer(INTERP, key);
return (INTVAL)((k>=0 && k<=n) || (k<0 && -k<=n));
}
@@ -625,7 +625,7 @@
void set_string_keyed(PMC *key, STRING * const value) {
STRING * const s = SELF.get_string();
- const INTVAL len = string_length(INTERP, value);
+ const INTVAL len = Parrot_str_byte_length(INTERP, value);
string_replace(INTERP, s, key_integer(INTERP, key), len, value, NULL);
VTABLE_set_string_native(INTERP, SELF, s);
}
@@ -647,8 +647,8 @@
*/
METHOD replace(STRING *orig, STRING *_new) {
- const INTVAL old_len = string_length(INTERP, orig);
- const INTVAL new_len = string_length(INTERP, _new);
+ const INTVAL old_len = Parrot_str_byte_length(INTERP, orig);
+ const INTVAL new_len = Parrot_str_byte_length(INTERP, _new);
STRING * const s = VTABLE_get_string(INTERP, SELF);
INTVAL i = 0;
@@ -746,7 +746,7 @@
*/
VTABLE INTVAL elements() {
- return string_length(INTERP, VTABLE_get_string(INTERP, SELF));
+ return Parrot_str_byte_length(INTERP, VTABLE_get_string(INTERP, SELF));
}
VTABLE PMC *slice(PMC *key, INTVAL f) {
@@ -770,7 +770,7 @@
PObj_get_FLAGS(key) |= KEY_integer_FLAG;
PMC_int_val(key) = 0;
- if (!string_length(INTERP, VTABLE_get_string(INTERP, SELF)))
+ if (!Parrot_str_byte_length(INTERP, VTABLE_get_string(INTERP, SELF)))
PMC_int_val(key) = -1;
return iter;
@@ -850,7 +850,7 @@
INTVAL *tr_data;
INTVAL i;
- const INTVAL len = string_length(interp, src);
+ const INTVAL len = Parrot_str_byte_length(interp, src);
if (!len)
RETURN(void);
@@ -884,7 +884,7 @@
METHOD reverse(STRING *src) {
INTVAL i;
unsigned char *p;
- INTVAL len = string_length(interp, src);
+ INTVAL len = Parrot_str_byte_length(interp, src);
if (!len)
RETURN(void);
@@ -916,7 +916,7 @@
METHOD is_integer(STRING *src) {
INTVAL i;
unsigned char *p;
- const INTVAL len = string_length(interp, src);
+ const INTVAL len = Parrot_str_byte_length(interp, src);
if (!len)
RETURN(INTVAL 0);
@@ -970,7 +970,7 @@
if (start < 0)
RETURN(INTVAL res);
- len = string_length(interp, src);
+ len = Parrot_str_byte_length(interp, src);
if (!len)
RETURN(INTVAL res);
@@ -978,7 +978,7 @@
if (start >= (INTVAL)len)
RETURN(INTVAL res);
- if (!string_length(interp, substring))
+ if (!Parrot_str_byte_length(interp, substring))
RETURN(INTVAL res);
res = CHARSET_RINDEX(INTERP, src, substring, (UINTVAL)start);
Modified: branches/pdd28str_part2/src/pmc/stringhandle.pmc
==============================================================================
--- branches/pdd28str_part2/src/pmc/stringhandle.pmc Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc/stringhandle.pmc Sun Feb 1 08:02:55 2009 (r36238)
@@ -267,7 +267,7 @@
else {
INTVAL orig_length, read_length;
read_length = length;
- orig_length = string_length(INTERP, string_orig);
+ orig_length = Parrot_str_byte_length(INTERP, string_orig);
GET_ATTR_read_offset(INTERP, SELF, offset);
@@ -303,7 +303,7 @@
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_PIO_ERROR,
"Cannot read from a closed filehandle");
- orig_length = string_length(INTERP, string_result);
+ orig_length = Parrot_str_byte_length(INTERP, string_result);
GET_ATTR_read_offset(INTERP, SELF, offset);
newline_pos = string_str_index(INTERP, string_result, CONST_STRING(INTERP, "\n"), offset);
@@ -409,7 +409,7 @@
SET_ATTR_stringhandle(INTERP, SELF, new_string);
- status = string_length(interp, new_string);
+ status = Parrot_str_byte_length(interp, new_string);
RETURN(INTVAL status);
}
@@ -474,7 +474,7 @@
if (STRING_IS_NULL(stringhandle))
RETURN(INTVAL 0);
- buffer_size = string_length(interp, stringhandle);
+ buffer_size = Parrot_str_byte_length(interp, stringhandle);
RETURN(INTVAL buffer_size);
@@ -547,7 +547,7 @@
GET_ATTR_stringhandle(INTERP, SELF, stringhandle);
GET_ATTR_read_offset(INTERP, SELF, offset);
- if (offset >= string_length(INTERP, stringhandle))
+ if (offset >= Parrot_str_byte_length(INTERP, stringhandle))
RETURN(INTVAL 1);
RETURN(INTVAL 0);
Modified: branches/pdd28str_part2/src/pmc_freeze.c
==============================================================================
--- branches/pdd28str_part2/src/pmc_freeze.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/pmc_freeze.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -557,7 +557,7 @@
push_ascii_string(PARROT_INTERP, ARGIN(IMAGE_IO *io), ARGIN(const STRING *s))
{
ASSERT_ARGS(push_ascii_string)
- const UINTVAL length = string_length(interp, s);
+ const UINTVAL length = Parrot_str_byte_length(interp, s);
char * const buffer = (char *)malloc(4*length); /* XXX Why 4? What does that mean? */
char *cursor = buffer;
UINTVAL idx = 0;
@@ -1099,7 +1099,7 @@
s->strlen += header_length;
}
else {
- if (string_length(interp, s) < header_length) {
+ if (Parrot_str_byte_length(interp, s) < header_length) {
Parrot_ex_throw_from_c_args(interp, NULL,
EXCEPTION_INVALID_STRING_REPRESENTATION,
"bad string to thaw");
@@ -1838,7 +1838,7 @@
* info->thaw_ptr becomes invalid - seems that the hash got
* collected under us.
*/
- if (1 || (string_length(interp, image) > THAW_BLOCK_DOD_SIZE)) {
+ if (1 || (Parrot_str_byte_length(interp, image) > THAW_BLOCK_DOD_SIZE)) {
Parrot_do_dod_run(interp, 1);
Parrot_block_GC_mark(interp);
Parrot_block_GC_sweep(interp);
Modified: branches/pdd28str_part2/src/spf_render.c
==============================================================================
--- branches/pdd28str_part2/src/spf_render.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/spf_render.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -129,7 +129,7 @@
INTVAL is_int_type, ARGIN_NULLOK(STRING* prefix))
{
ASSERT_ARGS(handle_flags)
- UINTVAL len = string_length(interp, str);
+ UINTVAL len = Parrot_str_byte_length(interp, str);
if (is_int_type) {
if (info->flags & FLAG_PREC && info->prec == 0 &&
@@ -155,7 +155,7 @@
/* # 0x ... */
if ((info->flags & FLAG_SHARP) && prefix) {
str = Parrot_str_concat(interp, prefix, str, 0);
- len += string_length(interp, prefix);
+ len += Parrot_str_byte_length(interp, prefix);
}
/* XXX sharp + fill ??? */
@@ -325,7 +325,7 @@
INTVAL i;
INTVAL len = 0;
INTVAL old = 0;
- INTVAL pat_len = (INTVAL)string_length(interp, pat);
+ INTVAL pat_len = (INTVAL)Parrot_str_byte_length(interp, pat);
HUGEINTVAL num;
/* start with a buffer; double the pattern length to avoid realloc #1 */
Modified: branches/pdd28str_part2/src/string/api.c
==============================================================================
--- branches/pdd28str_part2/src/string/api.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/string/api.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -552,7 +552,7 @@
/* XXX should this be a CHARSET method? */
/* If B isn't real, we just bail */
- const UINTVAL b_len = b ? string_length(interp, b) : 0;
+ const UINTVAL b_len = b ? Parrot_str_byte_length(interp, b) : 0;
if (!b_len)
return a;
@@ -842,7 +842,7 @@
=over 4
-=item C<UINTVAL string_length>
+=item C<UINTVAL Parrot_str_byte_length>
Returns the number of characters in the specified Parrot string.
@@ -853,9 +853,9 @@
PARROT_EXPORT
PARROT_PURE_FUNCTION
UINTVAL
-string_length(SHIM_INTERP, ARGIN(const STRING *s))
+Parrot_str_byte_length(SHIM_INTERP, ARGIN(const STRING *s))
{
- ASSERT_ARGS(string_length)
+ ASSERT_ARGS(Parrot_str_byte_length)
return s->strlen;
}
@@ -913,7 +913,7 @@
if (start < 0)
return -1;
- len = string_length(interp, s);
+ len = Parrot_str_byte_length(interp, s);
if (!len)
return -1;
@@ -921,7 +921,7 @@
if (start >= (INTVAL)len)
return -1;
- if (!string_length(interp, s2))
+ if (!Parrot_str_byte_length(interp, s2))
return -1;
src = PARROT_const_cast(STRING *, s);
@@ -948,7 +948,7 @@
string_ord(PARROT_INTERP, ARGIN_NULLOK(const STRING *s), INTVAL idx)
{
ASSERT_ARGS(string_ord)
- const UINTVAL len = s ? string_length(interp, s) : 0;
+ const UINTVAL len = s ? Parrot_str_byte_length(interp, s) : 0;
UINTVAL true_index = (UINTVAL)idx;
if (len == 0)
@@ -1189,7 +1189,7 @@
saneify_string(src);
/* Allow regexes to return $' easily for "aaa" =~ /aaa/ */
- if (offset == (INTVAL)string_length(interp, src) || length < 1)
+ if (offset == (INTVAL)Parrot_str_byte_length(interp, src) || length < 1)
return Parrot_str_new_noinit(interp, enum_stringrep_one, 0);
if (offset < 0)
@@ -1972,7 +1972,7 @@
string_bool(PARROT_INTERP, ARGIN_NULLOK(const STRING *s))
{
ASSERT_ARGS(string_bool)
- const INTVAL len = s ? string_length(interp, s) : 0;
+ const INTVAL len = s ? Parrot_str_byte_length(interp, s) : 0;
if (len == 0)
return 0;
@@ -2827,7 +2827,7 @@
ASSERT_ARGS(string_increment)
UINTVAL o;
- if (string_length(interp, s) != 1)
+ if (Parrot_str_byte_length(interp, s) != 1)
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"increment only for length = 1 done");
@@ -2886,7 +2886,7 @@
ARGIN(const STRING *s), UINTVAL offset)
{
ASSERT_ARGS(Parrot_string_is_cclass)
- if (!string_length(interp, s))
+ if (!Parrot_str_byte_length(interp, s))
return 0;
return CHARSET_IS_CCLASS(interp, flags, s, offset);
@@ -3140,7 +3140,7 @@
{
ASSERT_ARGS(string_split)
PMC * const res = pmc_new(interp, enum_class_ResizableStringArray);
- const int slen = string_length(interp, str);
+ const int slen = Parrot_str_byte_length(interp, str);
int dlen;
int ps, pe;
@@ -3148,7 +3148,7 @@
if (!slen)
return res;
- dlen = string_length(interp, delim);
+ dlen = Parrot_str_byte_length(interp, delim);
if (dlen == 0) {
int i;
@@ -3176,7 +3176,7 @@
STRING * const tstr = string_substr(interp, str, ps, pl, NULL, 0);
VTABLE_push_string(interp, res, tstr);
- ps = pe + string_length(interp, delim);
+ ps = pe + Parrot_str_byte_length(interp, delim);
if (ps > slen)
break;
Modified: branches/pdd28str_part2/src/string/charset/ascii.c
==============================================================================
--- branches/pdd28str_part2/src/string/charset/ascii.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/string/charset/ascii.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -697,7 +697,7 @@
String_iter iter;
ENCODING_ITER_INIT(interp, src, &iter);
- for (offset = 0; offset < string_length(interp, src); ++offset) {
+ for (offset = 0; offset < Parrot_str_byte_length(interp, src); ++offset) {
const UINTVAL codepoint = iter.get_and_advance(interp, &iter);
if (codepoint >= 0x80)
return 0;
Modified: branches/pdd28str_part2/src/string/charset/iso-8859-1.c
==============================================================================
--- branches/pdd28str_part2/src/string/charset/iso-8859-1.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/string/charset/iso-8859-1.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -551,7 +551,7 @@
ASSERT_ARGS(validate)
UINTVAL offset;
- for (offset = 0; offset < string_length(interp, src); ++offset) {
+ for (offset = 0; offset < Parrot_str_byte_length(interp, src); ++offset) {
const UINTVAL codepoint = ENCODING_GET_CODEPOINT(interp, src, offset);
if (codepoint >= 0x100)
return 0;
Modified: branches/pdd28str_part2/src/string/charset/unicode.c
==============================================================================
--- branches/pdd28str_part2/src/string/charset/unicode.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/string/charset/unicode.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -767,7 +767,7 @@
String_iter iter;
ENCODING_ITER_INIT(interp, src, &iter);
- for (offset = 0; offset < string_length(interp, src); ++offset) {
+ for (offset = 0; offset < Parrot_str_byte_length(interp, src); ++offset) {
const UINTVAL codepoint = iter.get_and_advance(interp, &iter);
/* Check for Unicode non-characters */
if (codepoint >= 0xfdd0
Modified: branches/pdd28str_part2/src/string/primitives.c
==============================================================================
--- branches/pdd28str_part2/src/string/primitives.c Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/src/string/primitives.c Sun Feb 1 08:02:55 2009 (r36238)
@@ -87,7 +87,7 @@
ASSERT_ARGS(string_unescape_one)
UINTVAL workchar = 0;
UINTVAL charcount = 0;
- const UINTVAL len = string_length(interp, string);
+ const UINTVAL len = Parrot_str_byte_length(interp, string);
/* Well, not right now */
UINTVAL codepoint = CHARSET_GET_BYTE(interp, string, *offset);
Modified: branches/pdd28str_part2/tools/build/nativecall.pl
==============================================================================
--- branches/pdd28str_part2/tools/build/nativecall.pl Sun Feb 1 07:38:54 2009 (r36237)
+++ branches/pdd28str_part2/tools/build/nativecall.pl Sun Feb 1 08:02:55 2009 (r36238)
@@ -530,14 +530,14 @@
/* And in here is the platform-independent way. Which is to say
"here there be hacks" */
- signature_len = string_length(interp, signature);
+ signature_len = Parrot_str_byte_length(interp, signature);
if (0 == signature_len)
return F2DPTR(pcf_v_);
/* remove deprecated void argument 'v' character */
if (2 == signature_len && 'v' == string_index(interp, signature, 1)) {
Parrot_warn(interp, PARROT_WARNINGS_ALL_FLAG, "function signature argument character 'v' ignored");
string_chopn_inplace(interp, signature, 1);
- signature_len = string_length(interp, signature);
+ signature_len = Parrot_str_byte_length(interp, signature);
}
iglobals = interp->iglobals;
More information about the parrot-commits
mailing list