[svn:parrot] r46045 - in trunk: include/parrot src/string/charset
petdance at svn.parrot.org
petdance at svn.parrot.org
Mon Apr 26 20:58:56 UTC 2010
Author: petdance
Date: Mon Apr 26 20:58:55 2010
New Revision: 46045
URL: https://trac.parrot.org/parrot/changeset/46045
Log:
s/source_string/src/g to match up with the src/string/encoding files
Modified:
trunk/include/parrot/charset.h
trunk/src/string/charset/ascii.c
trunk/src/string/charset/ascii.h
trunk/src/string/charset/binary.c
trunk/src/string/charset/iso-8859-1.c
trunk/src/string/charset/unicode.c
Modified: trunk/include/parrot/charset.h
==============================================================================
--- trunk/include/parrot/charset.h Mon Apr 26 20:48:58 2010 (r46044)
+++ trunk/include/parrot/charset.h Mon Apr 26 20:58:55 2010 (r46045)
@@ -1,13 +1,9 @@
/* charset.h
- * Copyright (C) 2004-2008, Parrot Foundation.
+ * Copyright (C) 2004-2010, Parrot Foundation.
* SVN Info
* $Id$
* Overview:
* This is the header for the 8-bit fixed-width encoding
- * Data Structure and Algorithms:
- * History:
- * Notes:
- * References:
*/
#ifndef PARROT_CHARSET_H_GUARD
@@ -33,43 +29,42 @@
#define PARROT_BINARY_CHARSET Parrot_binary_charset_ptr
#define PARROT_UNICODE_CHARSET Parrot_unicode_charset_ptr
-typedef STRING *(*charset_get_graphemes_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset, UINTVAL count);
-
-typedef STRING * (*charset_to_charset_t)(PARROT_INTERP, STRING *source_string);
-typedef STRING * (*charset_from_unicode_t)(PARROT_INTERP, STRING *source_string);
-typedef STRING* (*charset_compose_t)(PARROT_INTERP, STRING *source_string);
-typedef STRING* (*charset_decompose_t)(PARROT_INTERP, STRING *source_string);
-typedef STRING* (*charset_upcase_t)(PARROT_INTERP, const STRING *source_string);
-typedef STRING* (*charset_downcase_t)(PARROT_INTERP, const STRING *source_string);
-typedef STRING* (*charset_titlecase_t)(PARROT_INTERP, const STRING *source_string);
-typedef STRING* (*charset_upcase_first_t)(PARROT_INTERP, const STRING *source_string);
-typedef STRING* (*charset_downcase_first_t)(PARROT_INTERP, const STRING *source_string);
-typedef STRING* (*charset_titlecase_first_t)(PARROT_INTERP, const STRING *source_string);
-typedef INTVAL (*charset_compare_t)(PARROT_INTERP, const STRING *lhs, const STRING *rhs);
-typedef INTVAL (*charset_index_t)(PARROT_INTERP, STRING *source_string, STRING *search_string, UINTVAL offset);
-typedef INTVAL (*charset_rindex_t)(PARROT_INTERP, STRING *source_string, STRING *search_string, UINTVAL offset);
-typedef UINTVAL (*charset_validate_t)(PARROT_INTERP, STRING *source_string);
-typedef INTVAL (*charset_is_cclass_t)(PARROT_INTERP, INTVAL, const STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_cclass_t)(PARROT_INTERP, INTVAL, STRING *source_string, UINTVAL offset, UINTVAL count);
-typedef INTVAL (*charset_find_not_cclass_t)(PARROT_INTERP, INTVAL, STRING *source_string, UINTVAL offset, UINTVAL count);
-typedef INTVAL (*charset_is_wordchar_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_wordchar_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_not_wordchar_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_is_whitespace_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_whitespace_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_not_whitespace_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_is_digit_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_digit_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_not_digit_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_is_punctuation_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_punctuation_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_not_punctuation_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_is_newline_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_newline_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_not_newline_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef INTVAL (*charset_find_word_boundary_t)(PARROT_INTERP, STRING *source_string, UINTVAL offset);
-typedef STRING *(*charset_string_from_codepoint_t)(PARROT_INTERP, UINTVAL codepoint);
-typedef size_t (*charset_compute_hash_t)(PARROT_INTERP, const STRING *, size_t seed);
+typedef STRING * (*charset_get_graphemes_t)(PARROT_INTERP, STRING *src, UINTVAL offset, UINTVAL count);
+typedef STRING * (*charset_to_charset_t)(PARROT_INTERP, STRING *src);
+typedef STRING * (*charset_from_unicode_t)(PARROT_INTERP, STRING *src);
+typedef STRING * (*charset_compose_t)(PARROT_INTERP, STRING *src);
+typedef STRING * (*charset_decompose_t)(PARROT_INTERP, STRING *src);
+typedef STRING * (*charset_upcase_t)(PARROT_INTERP, const STRING *src);
+typedef STRING * (*charset_downcase_t)(PARROT_INTERP, const STRING *src);
+typedef STRING * (*charset_titlecase_t)(PARROT_INTERP, const STRING *src);
+typedef STRING * (*charset_upcase_first_t)(PARROT_INTERP, const STRING *src);
+typedef STRING * (*charset_downcase_first_t)(PARROT_INTERP, const STRING *src);
+typedef STRING * (*charset_titlecase_first_t)(PARROT_INTERP, const STRING *src);
+typedef INTVAL (*charset_compare_t)(PARROT_INTERP, const STRING *lhs, const STRING *rhs);
+typedef INTVAL (*charset_index_t)(PARROT_INTERP, STRING *src, STRING *search_string, UINTVAL offset);
+typedef INTVAL (*charset_rindex_t)(PARROT_INTERP, STRING *src, STRING *search_string, UINTVAL offset);
+typedef UINTVAL (*charset_validate_t)(PARROT_INTERP, STRING *src);
+typedef INTVAL (*charset_is_cclass_t)(PARROT_INTERP, INTVAL, const STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_cclass_t)(PARROT_INTERP, INTVAL, STRING *src, UINTVAL offset, UINTVAL count);
+typedef INTVAL (*charset_find_not_cclass_t)(PARROT_INTERP, INTVAL, STRING *src, UINTVAL offset, UINTVAL count);
+typedef INTVAL (*charset_is_wordchar_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_wordchar_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_not_wordchar_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_is_whitespace_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_whitespace_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_not_whitespace_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_is_digit_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_digit_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_not_digit_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_is_punctuation_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_punctuation_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_not_punctuation_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_is_newline_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_newline_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_not_newline_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef INTVAL (*charset_find_word_boundary_t)(PARROT_INTERP, STRING *src, UINTVAL offset);
+typedef STRING * (*charset_string_from_codepoint_t)(PARROT_INTERP, UINTVAL codepoint);
+typedef size_t (*charset_compute_hash_t)(PARROT_INTERP, const STRING *, size_t seed);
typedef STRING* (*charset_converter_t)(PARROT_INTERP, STRING *src);
Modified: trunk/src/string/charset/ascii.c
==============================================================================
--- trunk/src/string/charset/ascii.c Mon Apr 26 20:48:58 2010 (r46044)
+++ trunk/src/string/charset/ascii.c Mon Apr 26 20:58:55 2010 (r46045)
@@ -43,20 +43,19 @@
FUNC_MODIFIES(*src);
PARROT_CANNOT_RETURN_NULL
-static STRING* downcase(PARROT_INTERP, ARGIN(const STRING *source_string))
+static STRING* downcase(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* downcase_first(PARROT_INTERP,
- ARGIN(const STRING *source_string))
+static STRING* downcase_first(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_WARN_UNUSED_RESULT
static INTVAL find_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
UINTVAL offset,
UINTVAL count)
__attribute__nonnull__(1)
@@ -64,7 +63,7 @@
static INTVAL find_not_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
UINTVAL offset,
UINTVAL count)
__attribute__nonnull__(1)
@@ -73,7 +72,7 @@
PARROT_WARN_UNUSED_RESULT
static INTVAL is_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(const STRING *source_string),
+ ARGIN(const STRING *src),
UINTVAL offset)
__attribute__nonnull__(1)
__attribute__nonnull__(3);
@@ -84,13 +83,12 @@
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
-static STRING* titlecase(PARROT_INTERP, ARGIN(const STRING *source_string))
+static STRING* titlecase(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* titlecase_first(PARROT_INTERP,
- ARGIN(const STRING *source_string))
+static STRING* titlecase_first(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -105,13 +103,12 @@
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* upcase(PARROT_INTERP, ARGIN(const STRING *source_string))
+static STRING* upcase(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* upcase_first(PARROT_INTERP,
- ARGIN(const STRING *source_string))
+static STRING* upcase_first(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -128,27 +125,27 @@
, PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_downcase __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_downcase_first __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_find_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_find_not_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_is_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_string_from_codepoint __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_titlecase __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_titlecase_first __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_to_ascii __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(src))
@@ -157,10 +154,10 @@
, PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_upcase __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_upcase_first __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_validate __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(src))
@@ -169,10 +166,10 @@
/*
-=item C<STRING * ascii_get_graphemes(PARROT_INTERP, STRING *source_string,
-UINTVAL offset, UINTVAL count)>
+=item C<STRING * ascii_get_graphemes(PARROT_INTERP, STRING *src, UINTVAL offset,
+UINTVAL count)>
-Retrieves the graphemes for the STRING C<source_string>, starting at
+Retrieves the graphemes for the STRING C<src>, starting at
C<offset> and ending at C<offset + count>.
=cut
@@ -182,11 +179,10 @@
PARROT_CANNOT_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
STRING *
-ascii_get_graphemes(PARROT_INTERP, ARGIN(STRING *source_string),
- UINTVAL offset, UINTVAL count)
+ascii_get_graphemes(PARROT_INTERP, ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(ascii_get_graphemes)
- return ENCODING_GET_BYTES(interp, source_string, offset, count);
+ return ENCODING_GET_BYTES(interp, src, offset, count);
}
/*
@@ -297,9 +293,9 @@
/*
-=item C<static STRING* upcase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* upcase(PARROT_INTERP, const STRING *src)>
-Converts the STRING C<source_string> to all uppercase.
+Converts the STRING C<src> to all uppercase.
=cut
@@ -307,11 +303,11 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-upcase(PARROT_INTERP, ARGIN(const STRING *source_string))
+upcase(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(upcase)
- STRING * const result = Parrot_str_clone(interp, source_string);
- const UINTVAL n = source_string->strlen;
+ STRING * const result = Parrot_str_clone(interp, src);
+ const UINTVAL n = src->strlen;
if (n) {
char * const buffer = result->strstart;
@@ -327,9 +323,9 @@
/*
-=item C<static STRING* downcase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* downcase(PARROT_INTERP, const STRING *src)>
-Converts the STRING C<source_string> to all lower-case.
+Converts the STRING C<src> to all lower-case.
=cut
@@ -337,11 +333,11 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-downcase(PARROT_INTERP, ARGIN(const STRING *source_string))
+downcase(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(downcase)
- STRING *result = Parrot_str_clone(interp, source_string);
- const UINTVAL n = source_string->strlen;
+ STRING *result = Parrot_str_clone(interp, src);
+ const UINTVAL n = src->strlen;
if (n) {
char * const buffer = result->strstart;
@@ -357,9 +353,9 @@
/*
-=item C<static STRING* titlecase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* titlecase(PARROT_INTERP, const STRING *src)>
-Converts the STRING given by C<source_string> to title case, where
+Converts the STRING given by C<src> to title case, where
the first character is upper case and all the rest of the characters
are lower-case.
@@ -369,11 +365,11 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-titlecase(PARROT_INTERP, ARGIN(const STRING *source_string))
+titlecase(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(titlecase)
- STRING *result = Parrot_str_clone(interp, source_string);
- const UINTVAL n = source_string->strlen;
+ STRING *result = Parrot_str_clone(interp, src);
+ const UINTVAL n = src->strlen;
if (n) {
char * const buffer = result->strstart;
@@ -390,9 +386,9 @@
/*
-=item C<static STRING* upcase_first(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* upcase_first(PARROT_INTERP, const STRING *src)>
-Sets the first character in the STRING C<source_string> to upper case,
+Sets the first character in the STRING C<src> to upper case,
but doesn't modify the rest of the string.
=cut
@@ -401,10 +397,10 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-upcase_first(PARROT_INTERP, ARGIN(const STRING *source_string))
+upcase_first(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(upcase_first)
- STRING *result = Parrot_str_clone(interp, source_string);
+ STRING *result = Parrot_str_clone(interp, src);
if (result->strlen) {
char * const buffer = result->strstart;
@@ -416,10 +412,9 @@
/*
-=item C<static STRING* downcase_first(PARROT_INTERP, const STRING
-*source_string)>
+=item C<static STRING* downcase_first(PARROT_INTERP, const STRING *src)>
-Sets the first character of the STRING C<source_string> to lowercase,
+Sets the first character of the STRING C<src> to lowercase,
but doesn't modify the rest of the characters.
=cut
@@ -428,10 +423,10 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-downcase_first(PARROT_INTERP, ARGIN(const STRING *source_string))
+downcase_first(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(downcase_first)
- STRING *result = Parrot_str_clone(interp, source_string);
+ STRING *result = Parrot_str_clone(interp, src);
if (result->strlen) {
char * const buffer = result->strstart;
@@ -443,10 +438,9 @@
/*
-=item C<static STRING* titlecase_first(PARROT_INTERP, const STRING
-*source_string)>
+=item C<static STRING* titlecase_first(PARROT_INTERP, const STRING *src)>
-Converts the first letter of STRING C<source_string> to upper case,
+Converts the first letter of STRING C<src> to upper case,
but doesn't modify the rest of the string.
=cut
@@ -455,10 +449,10 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-titlecase_first(PARROT_INTERP, ARGIN(const STRING *source_string))
+titlecase_first(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(titlecase_first)
- STRING *result = Parrot_str_clone(interp, source_string);
+ STRING * const result = Parrot_str_clone(interp, src);
if (result->strlen) {
char * const buffer = result->strstart;
@@ -576,8 +570,8 @@
/*
-=item C<INTVAL ascii_cs_index(PARROT_INTERP, STRING *source_string, STRING
-*search_string, UINTVAL offset)>
+=item C<INTVAL ascii_cs_index(PARROT_INTERP, STRING *src, STRING *search_string,
+UINTVAL offset)>
Searches for the first instance of STRING C<search> in STRING C<src>.
returns the position where the substring is found if it is indeed found.
@@ -589,28 +583,28 @@
PARROT_WARN_UNUSED_RESULT
INTVAL
-ascii_cs_index(PARROT_INTERP, ARGIN(STRING *source_string),
+ascii_cs_index(PARROT_INTERP, ARGIN(STRING *src),
ARGIN(STRING *search_string), UINTVAL offset)
{
ASSERT_ARGS(ascii_cs_index)
INTVAL retval;
- if (source_string->charset != search_string->charset) {
- return mixed_cs_index(interp, source_string, search_string, offset);
+ if (src->charset != search_string->charset) {
+ return mixed_cs_index(interp, src, search_string, offset);
}
- PARROT_ASSERT(source_string->encoding == Parrot_fixed_8_encoding_ptr);
- retval = Parrot_byte_index(interp, source_string,
+ PARROT_ASSERT(src->encoding == Parrot_fixed_8_encoding_ptr);
+ retval = Parrot_byte_index(interp, src,
search_string, offset);
return retval;
}
/*
-=item C<INTVAL ascii_cs_rindex(PARROT_INTERP, STRING *source_string, STRING
+=item C<INTVAL ascii_cs_rindex(PARROT_INTERP, STRING *src, STRING
*search_string, UINTVAL offset)>
Searches for the last instance of STRING C<search_string> in STRING
-C<source_string>. Starts searching at C<offset>.
+C<src>. Starts searching at C<offset>.
=cut
@@ -618,18 +612,18 @@
PARROT_WARN_UNUSED_RESULT
INTVAL
-ascii_cs_rindex(PARROT_INTERP, ARGIN(STRING *source_string),
+ascii_cs_rindex(PARROT_INTERP, ARGIN(STRING *src),
ARGIN(STRING *search_string), UINTVAL offset)
{
ASSERT_ARGS(ascii_cs_rindex)
INTVAL retval;
- if (source_string->charset != search_string->charset)
+ if (src->charset != search_string->charset)
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
"Cross-charset index not supported");
- PARROT_ASSERT(source_string->encoding == Parrot_fixed_8_encoding_ptr);
- retval = Parrot_byte_rindex(interp, source_string,
+ PARROT_ASSERT(src->encoding == Parrot_fixed_8_encoding_ptr);
+ retval = Parrot_byte_rindex(interp, src,
search_string, offset);
return retval;
}
@@ -686,8 +680,8 @@
/*
-=item C<static INTVAL is_cclass(PARROT_INTERP, INTVAL flags, const STRING
-*source_string, UINTVAL offset)>
+=item C<static INTVAL is_cclass(PARROT_INTERP, INTVAL flags, const STRING *src,
+UINTVAL offset)>
=cut
@@ -695,14 +689,14 @@
PARROT_WARN_UNUSED_RESULT
static INTVAL
-is_cclass(PARROT_INTERP, INTVAL flags, ARGIN(const STRING *source_string), UINTVAL offset)
+is_cclass(PARROT_INTERP, INTVAL flags, ARGIN(const STRING *src), UINTVAL offset)
{
ASSERT_ARGS(is_cclass)
UINTVAL codepoint;
- if (offset >= source_string->strlen)
+ if (offset >= src->strlen)
return 0;
- codepoint = ENCODING_GET_CODEPOINT(interp, source_string, offset);
+ codepoint = ENCODING_GET_CODEPOINT(interp, src, offset);
if (codepoint >= sizeof (Parrot_ascii_typetable) /
sizeof (Parrot_ascii_typetable[0])) {
@@ -713,8 +707,8 @@
/*
-=item C<static INTVAL find_cclass(PARROT_INTERP, INTVAL flags, STRING
-*source_string, UINTVAL offset, UINTVAL count)>
+=item C<static INTVAL find_cclass(PARROT_INTERP, INTVAL flags, STRING *src,
+UINTVAL offset, UINTVAL count)>
Find a character in the given character class. Delegates to the find_cclass
method of the encoding plugin.
@@ -725,38 +719,37 @@
PARROT_WARN_UNUSED_RESULT
static INTVAL
-find_cclass(PARROT_INTERP, INTVAL flags, ARGIN(STRING *source_string),
+find_cclass(PARROT_INTERP, INTVAL flags, ARGIN(STRING *src),
UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(find_cclass)
UINTVAL pos = offset;
UINTVAL end = offset + count;
- end = source_string->strlen < end ? source_string->strlen : end;
- return ENCODING_FIND_CCLASS(interp, source_string, Parrot_ascii_typetable,
+ end = src->strlen < end ? src->strlen : end;
+ return ENCODING_FIND_CCLASS(interp, src, Parrot_ascii_typetable,
flags, pos, end);
}
/*
-=item C<static INTVAL find_not_cclass(PARROT_INTERP, INTVAL flags, STRING
-*source_string, UINTVAL offset, UINTVAL count)>
+=item C<static INTVAL find_not_cclass(PARROT_INTERP, INTVAL flags, STRING *src,
+UINTVAL offset, UINTVAL count)>
=cut
*/
static INTVAL
-find_not_cclass(PARROT_INTERP, INTVAL flags, ARGIN(STRING *source_string),
- UINTVAL offset, UINTVAL count)
+find_not_cclass(PARROT_INTERP, INTVAL flags, ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(find_not_cclass)
UINTVAL pos = offset;
UINTVAL end = offset + count;
- end = source_string->strlen < end ? source_string->strlen : end;
+ end = src->strlen < end ? src->strlen : end;
for (; pos < end; ++pos) {
- const UINTVAL codepoint = ENCODING_GET_CODEPOINT(interp, source_string, pos);
+ const UINTVAL codepoint = ENCODING_GET_CODEPOINT(interp, src, pos);
if ((Parrot_ascii_typetable[codepoint] & flags) == 0) {
return pos;
}
@@ -766,10 +759,10 @@
/*
-=item C<size_t ascii_compute_hash(PARROT_INTERP, const STRING *source_string,
-size_t seed)>
+=item C<size_t ascii_compute_hash(PARROT_INTERP, const STRING *src, size_t
+seed)>
-Computes the hash of STRING C<source_string> starting with seed value
+Computes the hash of STRING C<src> starting with seed value
C<seed>.
=cut
@@ -778,14 +771,14 @@
PARROT_PURE_FUNCTION
size_t
-ascii_compute_hash(SHIM_INTERP, ARGIN(const STRING *source_string), size_t seed)
+ascii_compute_hash(SHIM_INTERP, ARGIN(const STRING *src), size_t seed)
{
ASSERT_ARGS(ascii_compute_hash)
size_t hashval = seed;
- const char *buffptr = (const char *)source_string->strstart;
- UINTVAL len = source_string->strlen;
+ const char *buffptr = (const char *)src->strstart;
+ UINTVAL len = src->strlen;
- PARROT_ASSERT(source_string->encoding == Parrot_fixed_8_encoding_ptr);
+ PARROT_ASSERT(src->encoding == Parrot_fixed_8_encoding_ptr);
while (len--) {
hashval += hashval << 5;
hashval += *buffptr++;
@@ -855,7 +848,7 @@
charset_cvt_ascii_to_binary(PARROT_INTERP, ARGIN(STRING *src))
{
ASSERT_ARGS(charset_cvt_ascii_to_binary)
- STRING *dest = Parrot_str_clone(interp, src);
+ STRING * const dest = Parrot_str_clone(interp, src);
UINTVAL offs;
for (offs = 0; offs < src->strlen; ++offs) {
@@ -882,7 +875,7 @@
charset_cvt_ascii_to_iso_8859_1(PARROT_INTERP, ARGIN(STRING *src))
{
ASSERT_ARGS(charset_cvt_ascii_to_iso_8859_1)
- STRING * dest = Parrot_str_clone(interp, src);
+ STRING * const dest = Parrot_str_clone(interp, src);
UINTVAL offs;
for (offs = 0; offs < src->strlen; ++offs) {
Modified: trunk/src/string/charset/ascii.h
==============================================================================
--- trunk/src/string/charset/ascii.h Mon Apr 26 20:48:58 2010 (r46044)
+++ trunk/src/string/charset/ascii.h Mon Apr 26 20:58:55 2010 (r46045)
@@ -30,13 +30,13 @@
PARROT_PURE_FUNCTION
size_t ascii_compute_hash(SHIM_INTERP,
- ARGIN(const STRING *source_string),
+ ARGIN(const STRING *src),
size_t seed)
__attribute__nonnull__(2);
PARROT_WARN_UNUSED_RESULT
INTVAL ascii_cs_index(PARROT_INTERP,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
ARGIN(STRING *search_string),
UINTVAL offset)
__attribute__nonnull__(1)
@@ -45,7 +45,7 @@
PARROT_WARN_UNUSED_RESULT
INTVAL ascii_cs_rindex(PARROT_INTERP,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
ARGIN(STRING *search_string),
UINTVAL offset)
__attribute__nonnull__(1)
@@ -55,7 +55,7 @@
PARROT_CANNOT_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
STRING * ascii_get_graphemes(PARROT_INTERP,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
UINTVAL offset,
UINTVAL count)
__attribute__nonnull__(1)
@@ -88,18 +88,18 @@
, PARROT_ASSERT_ARG(lhs) \
, PARROT_ASSERT_ARG(rhs))
#define ASSERT_ARGS_ascii_compute_hash __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
- PARROT_ASSERT_ARG(source_string))
+ PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_ascii_cs_index __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string) \
+ , PARROT_ASSERT_ARG(src) \
, PARROT_ASSERT_ARG(search_string))
#define ASSERT_ARGS_ascii_cs_rindex __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string) \
+ , PARROT_ASSERT_ARG(src) \
, PARROT_ASSERT_ARG(search_string))
#define ASSERT_ARGS_ascii_get_graphemes __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_charset_cvt_ascii_to_binary __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(src))
Modified: trunk/src/string/charset/binary.c
==============================================================================
--- trunk/src/string/charset/binary.c Mon Apr 26 20:48:58 2010 (r46044)
+++ trunk/src/string/charset/binary.c Mon Apr 26 20:58:55 2010 (r46045)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2004-2009, Parrot Foundation.
+Copyright (C) 2004-2010, Parrot Foundation.
$Id$
=head1 NAME
@@ -34,47 +34,46 @@
__attribute__nonnull__(3);
PARROT_CANNOT_RETURN_NULL
-static STRING* compose(PARROT_INTERP, SHIM(STRING *source_string))
+static STRING* compose(PARROT_INTERP, SHIM(STRING *src))
__attribute__nonnull__(1);
static INTVAL cs_index(SHIM_INTERP,
- SHIM(STRING *source_string),
+ SHIM(STRING *src),
SHIM(STRING *search_string),
SHIM(UINTVAL offset));
static INTVAL cs_rindex(SHIM_INTERP,
- SHIM(STRING *source_string),
+ SHIM(STRING *src),
SHIM(STRING *search_string),
SHIM(UINTVAL offset));
PARROT_CANNOT_RETURN_NULL
-static STRING* decompose(PARROT_INTERP, SHIM(STRING *source_string))
+static STRING* decompose(PARROT_INTERP, SHIM(STRING *src))
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
-static STRING* downcase(PARROT_INTERP, SHIM(const STRING *source_string))
+static STRING* downcase(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
-static STRING* downcase_first(PARROT_INTERP,
- SHIM(const STRING *source_string))
+static STRING* downcase_first(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
static INTVAL find_cclass(SHIM_INTERP,
SHIM(INTVAL flags),
- SHIM(STRING *source_string),
+ SHIM(STRING *src),
UINTVAL offset,
UINTVAL count);
static INTVAL find_not_cclass(SHIM_INTERP,
SHIM(INTVAL flags),
- SHIM(STRING *source_string),
+ SHIM(STRING *src),
UINTVAL offset,
UINTVAL count);
static INTVAL is_cclass(SHIM_INTERP,
SHIM(INTVAL flags),
- SHIM(const STRING *source_string),
+ SHIM(const STRING *src),
SHIM(UINTVAL offset));
PARROT_CANNOT_RETURN_NULL
@@ -82,12 +81,11 @@
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
-static STRING* titlecase(PARROT_INTERP, SHIM(const STRING *source_string))
+static STRING* titlecase(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
-static STRING* titlecase_first(PARROT_INTERP,
- SHIM(const STRING *source_string))
+static STRING* titlecase_first(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
@@ -96,15 +94,14 @@
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* upcase(PARROT_INTERP, SHIM(const STRING *source_string))
+static STRING* upcase(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
-static STRING* upcase_first(PARROT_INTERP,
- SHIM(const STRING *source_string))
+static STRING* upcase_first(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
-static UINTVAL validate(SHIM_INTERP, SHIM(STRING *source_string));
+static UINTVAL validate(SHIM_INTERP, SHIM(STRING *src));
#define ASSERT_ARGS_compare __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(lhs) \
, PARROT_ASSERT_ARG(rhs))
@@ -174,7 +171,7 @@
/*
-=item C<static STRING* compose(PARROT_INTERP, STRING *source_string)>
+=item C<static STRING* compose(PARROT_INTERP, STRING *src)>
Throws an exception because we cannot compose a binary string.
@@ -185,7 +182,7 @@
/* A err. can't compose binary */
PARROT_CANNOT_RETURN_NULL
static STRING*
-compose(PARROT_INTERP, SHIM(STRING *source_string))
+compose(PARROT_INTERP, SHIM(STRING *src))
{
ASSERT_ARGS(compose)
EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't compose binary data");
@@ -193,7 +190,7 @@
/*
-=item C<static STRING* decompose(PARROT_INTERP, STRING *source_string)>
+=item C<static STRING* decompose(PARROT_INTERP, STRING *src)>
Throws an exception because we cannot decompose a binary string.
@@ -204,7 +201,7 @@
/* A err. can't decompose binary */
PARROT_CANNOT_RETURN_NULL
static STRING*
-decompose(PARROT_INTERP, SHIM(STRING *source_string))
+decompose(PARROT_INTERP, SHIM(STRING *src))
{
ASSERT_ARGS(decompose)
EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't decompose binary data");
@@ -212,7 +209,7 @@
/*
-=item C<static STRING* upcase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* upcase(PARROT_INTERP, const STRING *src)>
Throws an exception because we cannot convert a binary string to
upper case.
@@ -223,7 +220,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-upcase(PARROT_INTERP, SHIM(const STRING *source_string))
+upcase(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(upcase)
EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't upcase binary data");
@@ -231,7 +228,7 @@
/*
-=item C<static STRING* downcase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* downcase(PARROT_INTERP, const STRING *src)>
Throws an exception because we cannot convert a binary string to
lower-case.
@@ -242,7 +239,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-downcase(PARROT_INTERP, SHIM(const STRING *source_string))
+downcase(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(downcase)
EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't downcase binary data");
@@ -250,7 +247,7 @@
/*
-=item C<static STRING* titlecase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* titlecase(PARROT_INTERP, const STRING *src)>
Throws an exception because we cannot convert a binary string to
title case.
@@ -261,7 +258,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-titlecase(PARROT_INTERP, SHIM(const STRING *source_string))
+titlecase(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(titlecase)
EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't titlecase binary data");
@@ -269,7 +266,7 @@
/*
-=item C<static STRING* upcase_first(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* upcase_first(PARROT_INTERP, const STRING *src)>
Throws an exception because we cannot set the first "character" of the
binary string to uppercase.
@@ -280,7 +277,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-upcase_first(PARROT_INTERP, SHIM(const STRING *source_string))
+upcase_first(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(upcase_first)
EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't upcase binary data");
@@ -288,8 +285,7 @@
/*
-=item C<static STRING* downcase_first(PARROT_INTERP, const STRING
-*source_string)>
+=item C<static STRING* downcase_first(PARROT_INTERP, const STRING *src)>
Throws an exception because we cannot set the first "character"
of the binary string to lowercase.
@@ -300,7 +296,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-downcase_first(PARROT_INTERP, SHIM(const STRING *source_string))
+downcase_first(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(downcase_first)
EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't downcase binary data");
@@ -308,8 +304,7 @@
/*
-=item C<static STRING* titlecase_first(PARROT_INTERP, const STRING
-*source_string)>
+=item C<static STRING* titlecase_first(PARROT_INTERP, const STRING *src)>
Throws an exception because we can't convert the first "character"
of binary data to title case.
@@ -320,7 +315,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-titlecase_first(PARROT_INTERP, SHIM(const STRING *source_string))
+titlecase_first(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(titlecase_first)
EXCEPTION(EXCEPTION_INVALID_CHARTYPE, "Can't titlecase binary data");
@@ -351,7 +346,7 @@
/*
-=item C<static INTVAL cs_index(PARROT_INTERP, STRING *source_string, STRING
+=item C<static INTVAL cs_index(PARROT_INTERP, STRING *src, STRING
*search_string, UINTVAL offset)>
Returns -1. It makes no sense to try and search for a substring in
@@ -362,7 +357,7 @@
*/
static INTVAL
-cs_index(SHIM_INTERP, SHIM(STRING *source_string),
+cs_index(SHIM_INTERP, SHIM(STRING *src),
SHIM(STRING *search_string), SHIM(UINTVAL offset))
{
ASSERT_ARGS(cs_index)
@@ -371,7 +366,7 @@
/*
-=item C<static INTVAL cs_rindex(PARROT_INTERP, STRING *source_string, STRING
+=item C<static INTVAL cs_rindex(PARROT_INTERP, STRING *src, STRING
*search_string, UINTVAL offset)>
Returns -1. It makes no sense to search for the last substring match
@@ -382,7 +377,7 @@
*/
static INTVAL
-cs_rindex(SHIM_INTERP, SHIM(STRING *source_string),
+cs_rindex(SHIM_INTERP, SHIM(STRING *src),
SHIM(STRING *search_string), SHIM(UINTVAL offset))
{
ASSERT_ARGS(cs_rindex)
@@ -391,7 +386,7 @@
/*
-=item C<static UINTVAL validate(PARROT_INTERP, STRING *source_string)>
+=item C<static UINTVAL validate(PARROT_INTERP, STRING *src)>
Returns 1. All sequential data is valid binary data.
@@ -401,7 +396,7 @@
/* Binary's always valid */
static UINTVAL
-validate(SHIM_INTERP, SHIM(STRING *source_string))
+validate(SHIM_INTERP, SHIM(STRING *src))
{
ASSERT_ARGS(validate)
return 1;
@@ -409,16 +404,15 @@
/*
-=item C<static INTVAL is_cclass(PARROT_INTERP, INTVAL flags, const STRING
-*source_string, UINTVAL offset)>
+=item C<static INTVAL is_cclass(PARROT_INTERP, INTVAL flags, const STRING *src,
+UINTVAL offset)>
=cut
*/
static INTVAL
-is_cclass(SHIM_INTERP, SHIM(INTVAL flags), SHIM(const STRING *source_string),
- SHIM(UINTVAL offset))
+is_cclass(SHIM_INTERP, SHIM(INTVAL flags), SHIM(const STRING *src), SHIM(UINTVAL offset))
{
ASSERT_ARGS(is_cclass)
return 0;
@@ -426,8 +420,8 @@
/*
-=item C<static INTVAL find_cclass(PARROT_INTERP, INTVAL flags, STRING
-*source_string, UINTVAL offset, UINTVAL count)>
+=item C<static INTVAL find_cclass(PARROT_INTERP, INTVAL flags, STRING *src,
+UINTVAL offset, UINTVAL count)>
=cut
@@ -435,7 +429,7 @@
static INTVAL
find_cclass(SHIM_INTERP, SHIM(INTVAL flags),
- SHIM(STRING *source_string), UINTVAL offset, UINTVAL count)
+ SHIM(STRING *src), UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(find_cclass)
return offset + count;
@@ -443,8 +437,8 @@
/*
-=item C<static INTVAL find_not_cclass(PARROT_INTERP, INTVAL flags, STRING
-*source_string, UINTVAL offset, UINTVAL count)>
+=item C<static INTVAL find_not_cclass(PARROT_INTERP, INTVAL flags, STRING *src,
+UINTVAL offset, UINTVAL count)>
=cut
@@ -452,7 +446,7 @@
static INTVAL
find_not_cclass(SHIM_INTERP, SHIM(INTVAL flags),
- SHIM(STRING *source_string), UINTVAL offset, UINTVAL count)
+ SHIM(STRING *src), UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(find_not_cclass)
return offset + count;
Modified: trunk/src/string/charset/iso-8859-1.c
==============================================================================
--- trunk/src/string/charset/iso-8859-1.c Mon Apr 26 20:48:58 2010 (r46044)
+++ trunk/src/string/charset/iso-8859-1.c Mon Apr 26 20:58:55 2010 (r46045)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2004-2009, Parrot Foundation.
+Copyright (C) 2004-2010, Parrot Foundation.
$Id$
=head1 NAME
@@ -36,19 +36,18 @@
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
-static STRING* downcase(PARROT_INTERP, ARGIN(const STRING *source_string))
+static STRING* downcase(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* downcase_first(PARROT_INTERP,
- ARGIN(const STRING *source_string))
+static STRING* downcase_first(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
static INTVAL find_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
UINTVAL offset,
UINTVAL count)
__attribute__nonnull__(1)
@@ -56,7 +55,7 @@
static INTVAL find_not_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
UINTVAL offset,
UINTVAL count)
__attribute__nonnull__(1)
@@ -64,7 +63,7 @@
static INTVAL is_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(const STRING *source_string),
+ ARGIN(const STRING *src),
UINTVAL offset)
__attribute__nonnull__(1)
__attribute__nonnull__(3);
@@ -74,13 +73,12 @@
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
-static STRING* titlecase(PARROT_INTERP, ARGIN(const STRING *source_string))
+static STRING* titlecase(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* titlecase_first(PARROT_INTERP,
- ARGIN(const STRING *source_string))
+static STRING* titlecase_first(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -101,13 +99,12 @@
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* upcase(PARROT_INTERP, ARGIN(const STRING *source_string))
+static STRING* upcase(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* upcase_first(PARROT_INTERP,
- ARGIN(const STRING *source_string))
+static STRING* upcase_first(PARROT_INTERP, ARGIN(const STRING *src))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -122,27 +119,27 @@
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_downcase __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_downcase_first __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_find_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_find_not_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_is_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_string_from_codepoint __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_titlecase __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_titlecase_first __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_to_charset __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(src))
@@ -154,10 +151,10 @@
, PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_upcase __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_upcase_first __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_validate __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(src))
@@ -310,9 +307,9 @@
/*
-=item C<static STRING* upcase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* upcase(PARROT_INTERP, const STRING *src)>
-Convert all graphemes in the STRING C<source_string> to upper case, for those
+Convert all graphemes in the STRING C<src> to upper case, for those
graphemes that support cases.
=cut
@@ -321,12 +318,12 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-upcase(PARROT_INTERP, ARGIN(const STRING *source_string))
+upcase(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(upcase)
unsigned char *buffer;
UINTVAL offset = 0;
- STRING *result = Parrot_str_clone(interp, source_string);
+ STRING *result = Parrot_str_clone(interp, src);
if (!result->strlen)
return result;
@@ -346,9 +343,9 @@
/*
-=item C<static STRING* downcase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* downcase(PARROT_INTERP, const STRING *src)>
-Converts all graphemes in STRING C<source_string> to lower-case, for those graphemes
+Converts all graphemes in STRING C<src> to lower-case, for those graphemes
that support cases.
=cut
@@ -357,12 +354,12 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-downcase(PARROT_INTERP, ARGIN(const STRING *source_string))
+downcase(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(downcase)
unsigned char *buffer;
UINTVAL offset = 0;
- STRING *result = Parrot_str_clone(interp, source_string);
+ STRING *result = Parrot_str_clone(interp, src);
if (!result->strlen)
return result;
@@ -382,9 +379,9 @@
/*
-=item C<static STRING* titlecase(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* titlecase(PARROT_INTERP, const STRING *src)>
-Converts the graphemes in STRING C<source_string> to title case, for those graphemes
+Converts the graphemes in STRING C<src> to title case, for those graphemes
that support cases.
=cut
@@ -393,13 +390,13 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-titlecase(PARROT_INTERP, ARGIN(const STRING *source_string))
+titlecase(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(titlecase)
unsigned char *buffer;
unsigned int c;
UINTVAL offset;
- STRING *result = Parrot_str_clone(interp, source_string);
+ STRING *result = Parrot_str_clone(interp, src);
if (!result->strlen)
return result;
@@ -426,9 +423,9 @@
/*
-=item C<static STRING* upcase_first(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* upcase_first(PARROT_INTERP, const STRING *src)>
-Converts the first grapheme in STRING C<source_string> to upper case, if it
+Converts the first grapheme in STRING C<src> to upper case, if it
supports cases.
=cut
@@ -437,12 +434,12 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-upcase_first(PARROT_INTERP, ARGIN(const STRING *source_string))
+upcase_first(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(upcase_first)
unsigned char *buffer;
unsigned int c;
- STRING *result = Parrot_str_clone(interp, source_string);
+ STRING *result = Parrot_str_clone(interp, src);
if (!result->strlen)
return result;
@@ -460,10 +457,9 @@
/*
-=item C<static STRING* downcase_first(PARROT_INTERP, const STRING
-*source_string)>
+=item C<static STRING* downcase_first(PARROT_INTERP, const STRING *src)>
-Converts the first character of the STRING C<source_string> to lower case, if the
+Converts the first character of the STRING C<src> to lower case, if the
grapheme supports lower case.
=cut
@@ -472,12 +468,12 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-downcase_first(PARROT_INTERP, ARGIN(const STRING *source_string))
+downcase_first(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(downcase_first)
unsigned char *buffer;
unsigned int c;
- STRING *result = Parrot_str_clone(interp, source_string);
+ STRING *result = Parrot_str_clone(interp, src);
if (!result->strlen)
return result;
@@ -495,10 +491,9 @@
/*
-=item C<static STRING* titlecase_first(PARROT_INTERP, const STRING
-*source_string)>
+=item C<static STRING* titlecase_first(PARROT_INTERP, const STRING *src)>
-Converts the first grapheme in STRING C<source_string> to title case, if the grapheme
+Converts the first grapheme in STRING C<src> to title case, if the grapheme
supports case.
=cut
@@ -507,10 +502,10 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-titlecase_first(PARROT_INTERP, ARGIN(const STRING *source_string))
+titlecase_first(PARROT_INTERP, ARGIN(const STRING *src))
{
ASSERT_ARGS(titlecase_first)
- return upcase_first(interp, source_string);
+ return upcase_first(interp, src);
}
@@ -540,22 +535,21 @@
/*
-=item C<static INTVAL is_cclass(PARROT_INTERP, INTVAL flags, const STRING
-*source_string, UINTVAL offset)>
+=item C<static INTVAL is_cclass(PARROT_INTERP, INTVAL flags, const STRING *src,
+UINTVAL offset)>
=cut
*/
static INTVAL
-is_cclass(PARROT_INTERP, INTVAL flags,
- ARGIN(const STRING *source_string), UINTVAL offset)
+is_cclass(PARROT_INTERP, INTVAL flags, ARGIN(const STRING *src), UINTVAL offset)
{
ASSERT_ARGS(is_cclass)
UINTVAL codepoint;
- if (offset >= source_string->strlen) return 0;
- codepoint = ENCODING_GET_CODEPOINT(interp, source_string, offset);
+ if (offset >= src->strlen) return 0;
+ codepoint = ENCODING_GET_CODEPOINT(interp, src, offset);
if (codepoint >= sizeof (Parrot_ascii_typetable) /
sizeof (Parrot_ascii_typetable[0])) {
@@ -566,8 +560,8 @@
/*
-=item C<static INTVAL find_cclass(PARROT_INTERP, INTVAL flags, STRING
-*source_string, UINTVAL offset, UINTVAL count)>
+=item C<static INTVAL find_cclass(PARROT_INTERP, INTVAL flags, STRING *src,
+UINTVAL offset, UINTVAL count)>
Find a character in the given character class. Delegates to the find_cclass
method of the encoding plugin.
@@ -578,21 +572,21 @@
static INTVAL
find_cclass(PARROT_INTERP, INTVAL flags,
- ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
+ ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(find_cclass)
UINTVAL pos = offset;
UINTVAL end = offset + count;
- end = source_string->strlen < end ? source_string->strlen : end;
- return ENCODING_FIND_CCLASS(interp, source_string,
+ end = src->strlen < end ? src->strlen : end;
+ return ENCODING_FIND_CCLASS(interp, src,
Parrot_iso_8859_1_typetable, flags, pos, end);
}
/*
-=item C<static INTVAL find_not_cclass(PARROT_INTERP, INTVAL flags, STRING
-*source_string, UINTVAL offset, UINTVAL count)>
+=item C<static INTVAL find_not_cclass(PARROT_INTERP, INTVAL flags, STRING *src,
+UINTVAL offset, UINTVAL count)>
=cut
@@ -600,15 +594,15 @@
static INTVAL
find_not_cclass(PARROT_INTERP, INTVAL flags,
- ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
+ ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(find_not_cclass)
UINTVAL pos = offset;
UINTVAL end = offset + count;
- end = source_string->strlen < end ? source_string->strlen : end;
+ end = src->strlen < end ? src->strlen : end;
for (; pos < end; ++pos) {
- const UINTVAL codepoint = ENCODING_GET_CODEPOINT(interp, source_string, pos);
+ const UINTVAL codepoint = ENCODING_GET_CODEPOINT(interp, src, pos);
if ((Parrot_iso_8859_1_typetable[codepoint] & flags) == 0) {
return pos;
}
Modified: trunk/src/string/charset/unicode.c
==============================================================================
--- trunk/src/string/charset/unicode.c Mon Apr 26 20:48:58 2010 (r46044)
+++ trunk/src/string/charset/unicode.c Mon Apr 26 20:58:55 2010 (r46045)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2005-2009, Parrot Foundation.
+Copyright (C) 2005-2010, Parrot Foundation.
$Id$
=head1 NAME
@@ -45,7 +45,7 @@
__attribute__nonnull__(2);
static INTVAL cs_rindex(PARROT_INTERP,
- SHIM(STRING *source_string),
+ SHIM(STRING *src),
SHIM(STRING *search_string),
SHIM(UINTVAL offset))
__attribute__nonnull__(1);
@@ -60,13 +60,12 @@
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* downcase_first(PARROT_INTERP,
- SHIM(const STRING *source_string))
+static STRING* downcase_first(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
static INTVAL find_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
UINTVAL offset,
UINTVAL count)
__attribute__nonnull__(1)
@@ -74,7 +73,7 @@
static INTVAL find_not_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
UINTVAL offset,
UINTVAL count)
__attribute__nonnull__(1)
@@ -82,7 +81,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING * get_graphemes(PARROT_INTERP,
- ARGIN(STRING *source_string),
+ ARGIN(STRING *src),
UINTVAL offset,
UINTVAL count)
__attribute__nonnull__(1)
@@ -90,7 +89,7 @@
static INTVAL is_cclass(PARROT_INTERP,
INTVAL flags,
- ARGIN(const STRING *source_string),
+ ARGIN(const STRING *src),
UINTVAL offset)
__attribute__nonnull__(1)
__attribute__nonnull__(3);
@@ -105,8 +104,7 @@
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* titlecase_first(PARROT_INTERP,
- SHIM(const STRING *source_string))
+static STRING* titlecase_first(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
PARROT_CANNOT_RETURN_NULL
@@ -123,8 +121,7 @@
__attribute__nonnull__(2);
PARROT_CANNOT_RETURN_NULL
-static STRING* upcase_first(PARROT_INTERP,
- SHIM(const STRING *source_string))
+static STRING* upcase_first(PARROT_INTERP, SHIM(const STRING *src))
__attribute__nonnull__(1);
static UINTVAL validate(PARROT_INTERP, ARGIN(STRING *src))
@@ -152,16 +149,16 @@
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_find_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_find_not_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_get_graphemes __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_is_cclass __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(source_string))
+ , PARROT_ASSERT_ARG(src))
#define ASSERT_ARGS_string_from_codepoint __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_titlecase __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
@@ -204,10 +201,10 @@
/*
-=item C<static STRING * get_graphemes(PARROT_INTERP, STRING *source_string,
-UINTVAL offset, UINTVAL count)>
+=item C<static STRING * get_graphemes(PARROT_INTERP, STRING *src, UINTVAL
+offset, UINTVAL count)>
-Gets the graphemes from STRING C<source_string> starting at C<offset>. Gets
+Gets the graphemes from STRING C<src> starting at C<offset>. Gets
C<count> graphemes total.
=cut
@@ -216,11 +213,11 @@
PARROT_CANNOT_RETURN_NULL
static STRING *
-get_graphemes(PARROT_INTERP, ARGIN(STRING *source_string),
+get_graphemes(PARROT_INTERP, ARGIN(STRING *src),
UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(get_graphemes)
- return ENCODING_GET_CODEPOINTS(interp, source_string, offset, count);
+ return ENCODING_GET_CODEPOINTS(interp, src, offset, count);
}
@@ -577,9 +574,9 @@
/*
-=item C<static STRING* upcase_first(PARROT_INTERP, const STRING *source_string)>
+=item C<static STRING* upcase_first(PARROT_INTERP, const STRING *src)>
-Converts the first grapheme in the STRING C<source_string> to uppercase, if the
+Converts the first grapheme in the STRING C<src> to uppercase, if the
grapheme supports it. Not implemented.
=cut
@@ -588,7 +585,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-upcase_first(PARROT_INTERP, SHIM(const STRING *source_string))
+upcase_first(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(upcase_first)
/* TODO: https://trac.parrot.org/parrot/wiki/StringsTasklist Implement this. */
@@ -598,10 +595,9 @@
/*
-=item C<static STRING* downcase_first(PARROT_INTERP, const STRING
-*source_string)>
+=item C<static STRING* downcase_first(PARROT_INTERP, const STRING *src)>
-Converts the first grapheme in the STRING C<source_string> to lower-case, if
+Converts the first grapheme in the STRING C<src> to lower-case, if
the grapheme supports it. Not implemented
=cut
@@ -610,7 +606,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-downcase_first(PARROT_INTERP, SHIM(const STRING *source_string))
+downcase_first(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(downcase_first)
/* TODO: https://trac.parrot.org/parrot/wiki/StringsTasklist Implement this. */
@@ -620,10 +616,9 @@
/*
-=item C<static STRING* titlecase_first(PARROT_INTERP, const STRING
-*source_string)>
+=item C<static STRING* titlecase_first(PARROT_INTERP, const STRING *src)>
-Converts the first grapheme in STRING C<source_string> to title case, if the
+Converts the first grapheme in STRING C<src> to title case, if the
string supports it. Not implemented.
=cut
@@ -632,7 +627,7 @@
PARROT_CANNOT_RETURN_NULL
static STRING*
-titlecase_first(PARROT_INTERP, SHIM(const STRING *source_string))
+titlecase_first(PARROT_INTERP, SHIM(const STRING *src))
{
ASSERT_ARGS(titlecase_first)
/* TODO: https://trac.parrot.org/parrot/wiki/StringsTasklist Implement this. */
@@ -688,10 +683,10 @@
/*
-=item C<static INTVAL cs_rindex(PARROT_INTERP, STRING *source_string, STRING
+=item C<static INTVAL cs_rindex(PARROT_INTERP, STRING *src, STRING
*search_string, UINTVAL offset)>
-Finds the last index of substring C<search_string> in STRING C<source_string>,
+Finds the last index of substring C<search_string> in STRING C<src>,
starting from C<offset>. Not implemented.
=cut
@@ -699,8 +694,7 @@
*/
static INTVAL
-cs_rindex(PARROT_INTERP, SHIM(STRING *source_string),
- SHIM(STRING *search_string), SHIM(UINTVAL offset))
+cs_rindex(PARROT_INTERP, SHIM(STRING *src), SHIM(STRING *search_string), SHIM(UINTVAL offset))
{
ASSERT_ARGS(cs_rindex)
/* TODO: https://trac.parrot.org/parrot/wiki/StringsTasklist Implement this. */
@@ -836,24 +830,23 @@
/*
-=item C<static INTVAL is_cclass(PARROT_INTERP, INTVAL flags, const STRING
-*source_string, UINTVAL offset)>
+=item C<static INTVAL is_cclass(PARROT_INTERP, INTVAL flags, const STRING *src,
+UINTVAL offset)>
=cut
*/
static INTVAL
-is_cclass(PARROT_INTERP, INTVAL flags,
- ARGIN(const STRING *source_string), UINTVAL offset)
+is_cclass(PARROT_INTERP, INTVAL flags, ARGIN(const STRING *src), UINTVAL offset)
{
ASSERT_ARGS(is_cclass)
UINTVAL codepoint;
- if (offset >= source_string->strlen)
+ if (offset >= src->strlen)
return 0;
- codepoint = ENCODING_GET_CODEPOINT(interp, source_string, offset);
+ codepoint = ENCODING_GET_CODEPOINT(interp, src, offset);
if (codepoint >= 256)
return u_iscclass(interp, codepoint, flags) != 0;
@@ -864,16 +857,15 @@
/*
-=item C<static INTVAL find_cclass(PARROT_INTERP, INTVAL flags, STRING
-*source_string, UINTVAL offset, UINTVAL count)>
+=item C<static INTVAL find_cclass(PARROT_INTERP, INTVAL flags, STRING *src,
+UINTVAL offset, UINTVAL count)>
=cut
*/
static INTVAL
-find_cclass(PARROT_INTERP, INTVAL flags,
- ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
+find_cclass(PARROT_INTERP, INTVAL flags, ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(find_cclass)
String_iter iter;
@@ -881,11 +873,11 @@
UINTVAL pos = offset;
UINTVAL end = offset + count;
- ENCODING_ITER_INIT(interp, source_string, &iter);
+ ENCODING_ITER_INIT(interp, src, &iter);
iter.set_position(interp, &iter, pos);
- end = source_string->strlen < end ? source_string->strlen : end;
+ end = src->strlen < end ? src->strlen : end;
for (; pos < end; ++pos) {
codepoint = iter.get_and_advance(interp, &iter);
@@ -905,16 +897,15 @@
/*
-=item C<static INTVAL find_not_cclass(PARROT_INTERP, INTVAL flags, STRING
-*source_string, UINTVAL offset, UINTVAL count)>
+=item C<static INTVAL find_not_cclass(PARROT_INTERP, INTVAL flags, STRING *src,
+UINTVAL offset, UINTVAL count)>
=cut
*/
static INTVAL
-find_not_cclass(PARROT_INTERP, INTVAL flags,
- ARGIN(STRING *source_string), UINTVAL offset, UINTVAL count)
+find_not_cclass(PARROT_INTERP, INTVAL flags, ARGIN(STRING *src), UINTVAL offset, UINTVAL count)
{
ASSERT_ARGS(find_not_cclass)
String_iter iter;
@@ -923,17 +914,17 @@
UINTVAL end = offset + count;
int bit;
- if (pos > source_string->strlen) {
+ if (pos > src->strlen) {
/* XXX: Throw in this case? */
return offset + count;
}
- ENCODING_ITER_INIT(interp, source_string, &iter);
+ ENCODING_ITER_INIT(interp, src, &iter);
if (pos)
iter.set_position(interp, &iter, pos);
- end = source_string->strlen < end ? source_string->strlen : end;
+ end = src->strlen < end ? src->strlen : end;
if (flags == enum_cclass_any)
return end;
More information about the parrot-commits
mailing list