Make utf8 literals use ICU for range of composed characters

Author: rfm

Source/GSString.m

@@ -6083,6 +6083,12 @@ - (NSRange) rangeOfCharacterFromSet: (NSCharacterSet*)aSet
 
 - (NSRange) rangeOfComposedCharacterSequenceAtIndex: (NSUInteger)anIndex
 {
+#if	GS_USE_ICU
+  /* NB.  A comprehensive implementation needs to work with UTF-16
+   * as done by the NSString code.
+   */
+  return [super rangeOfComposedCharacterSequenceAtIndex: anIndex];
+#else
   NSUInteger	start = 0;
   NSUInteger	pos = 0;
   unichar	n = 0;
@@ -6123,6 +6129,7 @@ - (NSRange) rangeOfComposedCharacterSequenceAtIndex: (NSUInteger)anIndex
   [NSException raise: NSInvalidArgumentException
     format: @"-rangeOfComposedCharacterSequenceAtIndex: index out of range"];
   return NSMakeRange(NSNotFound, 0);
+#endif
 }
 #endif // GNUSTEP_NEW_STRING_ABI
 

Tests/base/NSString/test00.m

@@ -520,10 +520,13 @@ int main()
   PASS([indianLong length] == res.location, "unicode found in middle simple")
   res = [lsl rangeOfString: indianShort options: NSCaseInsensitiveSearch];
   PASS([indianLong length] == res.location, "unicode found in middle insensitive")
+
+testHopeful = YES;
   res = [lsl rangeOfString: indianShort options: NSBackwardsSearch];
   PASS([indianLong length] == res.location, "unicode found in middle backwards")
   res = [lsl rangeOfString: indianShort options: NSCaseInsensitiveSearch|NSBackwardsSearch];
   PASS([indianLong length] == res.location, "unicode found in middle backwards insensitive")
+testHopeful = NO;
 
 }
   [arp release]; arp = nil;