Changeset 5324

Timestamp:

02/28/08 13:24:33 (4 months ago)

Author:

morris

Message:

Add wi_string_replace_string_with_string()

Files:

• libwired/trunk/libwired/data/wi-string.c (modified) (7 diffs)
• libwired/trunk/libwired/data/wi-string.h (modified) (2 diffs)

libwired/trunk/libwired/data/wi-string.c

@@ -891 +891 @@
-#pragma mark -
-
+void wi_string_replace_string_with_string(wi_string_t *string, wi_string_t *target, wi_string_t *replacement, wi_uinteger_t options) {
+        wi_range_t              range;
+        
+        while((range = wi_string_range_of_string(string, target, options)).location != WI_NOT_FOUND) {
+                wi_string_delete_characters_in_range(string, range);
+                wi_string_insert_string_at_index(string, replacement, range.location);
+        }
+}
+
+
+
+wi_string_t * wi_string_by_replacing_string_with_string(wi_string_t *string, wi_string_t *target, wi_string_t *replacement, wi_uinteger_t options) {
+        wi_string_t             *newstring;
+        
+        newstring = wi_copy(string);
+        wi_string_replace_string_with_string(newstring, target, replacement, options);
+        
+        return wi_autorelease(newstring);
+}
+
+
+
+#pragma mark -
+
-void wi_string_insert_string_at_index(wi_string_t *string, wi_string_t *otherstring, wi_uinteger_t index) {
-        _WI_STRING_INDEX_ASSERT(string, index);
@@ -1045 +1069 @@
-#pragma mark -
-
-string_options
+uinteger
-        return wi_string_range_of_string_in_range(string, otherstring, options, wi_make_range(0, string->length));
-}
@@ -1051 +1075 @@
-
-
-string_options
+uinteger
-        wi_range_t              range;
-        
@@ -1066 +1090 @@
-
-
-string_options
+uinteger
-        return wi_string_index_of_string_in_range(string, otherstring, options, wi_make_range(0, string->length));
-}
@@ -1072 +1096 @@
-
-
-string_options
+uinteger
-        char                    *p;
-        wi_uinteger_t   i, index;
@@ -1109 +1133 @@
-
-
-string_options
+uinteger
-        wi_uinteger_t   i, index = WI_NOT_FOUND;
-        char                    *p;
@@ -1139 +1163 @@
- 
-
-string_options
+uinteger
-        return (wi_string_index_of_string(string, otherstring, options) != WI_NOT_FOUND);
-}

libwired/trunk/libwired/data/wi-string.h

@@ -101 +101 @@
-WI_EXPORT wi_string_t *                                         wi_string_by_appending_format_and_arguments(wi_string_t *, wi_string_t *, va_list);
-
+WI_EXPORT void                                                          wi_string_replace_string_with_string(wi_string_t *, wi_string_t *, wi_string_t *, wi_uinteger_t);
+WI_EXPORT wi_string_t *                                         wi_string_by_replacing_string_with_string(wi_string_t *, wi_string_t *, wi_string_t *, wi_uinteger_t);
+
-WI_EXPORT void                                                          wi_string_insert_string_at_index(wi_string_t *, wi_string_t *, wi_uinteger_t);
-
@@ -117 +120 @@
-WI_EXPORT wi_array_t *                                          wi_string_components_separated_by_string(wi_string_t *, wi_string_t *);
-
-string_options
-string_options
-string_options
-string_options
-string_options
-string_options
+uinteger
+uinteger
+uinteger
+uinteger
+uinteger
+uinteger
-WI_EXPORT wi_boolean_t                                          wi_string_has_prefix(wi_string_t *, wi_string_t *);
-WI_EXPORT wi_boolean_t                                          wi_string_has_suffix(wi_string_t *, wi_string_t *);