[X10-commits] SF.net SVN: x10:[14432] trunk

[<spa...@us...>]

Revision: 14432
          http://x10.svn.sourceforge.net/x10/?rev=14432&view=rev
Author:   sparksparkspark
Date:     2010-06-04 19:24:12 +0000 (Fri, 04 Jun 2010)

Log Message:
-----------
Fix XTENLANG-1319

Modified Paths:
--------------
    trunk/x10.runtime/src-cpp/x10/lang/String.cc
    trunk/x10.tests/examples/Misc/StringTest.x10

Modified: trunk/x10.runtime/src-cpp/x10/lang/String.cc
===================================================================
--- trunk/x10.runtime/src-cpp/x10/lang/String.cc	2010-06-04 19:23:11 UTC (rev 14431)
+++ trunk/x10.runtime/src-cpp/x10/lang/String.cc	2010-06-04 19:24:12 UTC (rev 14432)
@@ -56,22 +56,46 @@
     return hc;
 }
 
+static const char *strnstrn(const char *haystack, size_t haystack_sz,
+                            const char *needle, size_t needle_sz)
+{
+    for (size_t i=0 ; i<haystack_sz ; ++i) {
+        for (size_t j=0 ; j<needle_sz ; ++j) {
+            if (haystack[i] != needle[j]) goto abandon;
+        }
+        return &haystack[i];
+        abandon: {}
+    }
+    return NULL;
+}
+
 x10_int String::indexOf(ref<String> str, x10_int i) {
     nullCheck(str);
     const char *needle = str->FMGL(content);
+    size_t needle_sz = str->FMGL(content_length);
     // TODO: bounds check
     const char *haystack = &FMGL(content)[i];
-    const char *pos = strstr(haystack, needle);
+    size_t haystack_sz = FMGL(content_length);
+    const char *pos = strnstrn(haystack, haystack_sz, needle, needle_sz);
     if (pos == NULL)
         return (x10_int) -1;
     return i + (x10_int) (pos - haystack);
 }
 
+static const char *strnchr(const char *haystack, size_t haystack_sz, char needle)
+{
+    for (size_t i=0 ; i<haystack_sz ; ++i) {
+        if (haystack[i] == needle) return &haystack[i];
+    }
+    return NULL;
+}
+
 x10_int String::indexOf(x10_char c, x10_int i) {
     int needle = (int)c.v;
     // TODO: bounds check
     const char *haystack = &FMGL(content)[i];
-    const char *pos = strchr(haystack, needle);
+    size_t haystack_sz = FMGL(content_length);
+    const char *pos = strnchr(haystack, haystack_sz, needle);
     if (pos == NULL)
         return (x10_int) -1;
     return i + (x10_int) (pos - haystack);
@@ -294,7 +318,7 @@
     if (!x10aux::instanceof<ref<x10::lang::String> >(p0)) return false;
     ref<String> that = (ref<String>) p0;
     if (this->FMGL(content_length) != that->FMGL(content_length)) return false; // short-circuit trivial dis-equality
-    if (strcmp(this->FMGL(content), that->FMGL(content)))
+    if (strncmp(this->FMGL(content), that->FMGL(content), this->length()))
         return false;
     return true;
 }
@@ -308,7 +332,7 @@
     if (s.isNull()) return false;
     if (ref<String>(s).operator->() == this) return true; // short-circuit trivial equality
     if (this->FMGL(content_length) != s->FMGL(content_length)) return false; // short-circuit trivial dis-equality
-    if (strcasecmp(this->FMGL(content), s->FMGL(content)))
+    if (strncasecmp(this->FMGL(content), s->FMGL(content), this->length()))
         return false;
     return true;
 }
@@ -357,7 +381,7 @@
     int length_diff = this->FMGL(content_length) - s->FMGL(content_length);
     if (length_diff != 0)
         return length_diff;
-    return (x10_int) strcmp(this->FMGL(content), s->FMGL(content));
+    return (x10_int) strncmp(this->FMGL(content), s->FMGL(content), this->length());
 }
 
 /* FIXME: Unicode support */
@@ -367,7 +391,7 @@
     int length_diff = this->FMGL(content_length) - s->FMGL(content_length);
     if (length_diff != 0)
         return length_diff;
-    return (x10_int) strcasecmp(this->FMGL(content), s->FMGL(content));
+    return (x10_int) strncasecmp(this->FMGL(content), s->FMGL(content), this->length());
 }
 
 const serialization_id_t String::_serialization_id =

Modified: trunk/x10.tests/examples/Misc/StringTest.x10
===================================================================
--- trunk/x10.tests/examples/Misc/StringTest.x10	2010-06-04 19:23:11 UTC (rev 14431)
+++ trunk/x10.tests/examples/Misc/StringTest.x10	2010-06-04 19:24:12 UTC (rev 14432)
@@ -25,6 +25,13 @@
 		var foo: String = "the number is "+v;
 		if (!(v == 10 && foo.equals("the number is "+"10"))) return false;
 		if (foo.charAt(2) != 'e') return false;
+
+        val start = "Start Twelve  ";
+        chk(start.trim().equals("Start Twelve"));
+        val end = " Total Ten.";
+        chk(end.trim().equals("Total Ten."));
+        val bothEnds = "  Four  ";
+        chk(bothEnds.trim().equals("Four"));
 		return true;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.