hg/stx-libbasic: comparison String.st

equal deleted inserted replaced

-:a41a496d8c61
+:e19933d3e188
 unsigned char *cp1, *cp2;
 OBJ cls;
 OBJ myCls;
 if (__isNonNilObject(s)) {
-	cls = __qClass(s);
+cls = __qClass(s);
-	myCls = __qClass(self);
+myCls = __qClass(self);
-	if ((cls == String) || (cls == Symbol) || (cls == myCls)) {
+if (__isStringLike(s) || (cls == myCls)) {
-	    cp1 = __stringVal(self);
+cp1 = __stringVal(self);
-	    /*
+/*
-	     * care for instances of subclasses ...
+* care for instances of subclasses ...
-	     */
+*/
-	    if (myCls != String) {
+if (myCls != String) {
-		int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(myCls)->c_ninstvars));
+int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(myCls)->c_ninstvars));
-		cp1 += n;
+cp1 += n;
-	    }
+}
-	    cp2 = __stringVal(s);
+cp2 = __stringVal(s);
-	    /*
+/*
-	     * care for instances of subclasses ...
+* care for instances of subclasses ...
-	     */
+*/
-	    if (cls != String) {
+if (cls != String) {
-		int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+int n = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
-		cp2 += n;
+cp2 += n;
-	    }
+}
 #ifdef HAS_STRCOLL
-	    cmp = strcoll(cp1, cp2);
+cmp = strcoll(cp1, cp2);
 #else
-	    cmp = strcmp(cp1, cp2);
+cmp = strcmp(cp1, cp2);
 #endif
-	    if (cmp > 0) {
+if (cmp > 0) {
-		RETURN ( __mkSmallInteger(1) );
+RETURN ( __mkSmallInteger(1) );
-	    }
+}
-	    if (cmp < 0) {
+if (cmp < 0) {
-		RETURN ( __mkSmallInteger(-1) );
+RETURN ( __mkSmallInteger(-1) );
-	    }
+}
-	    RETURN ( __mkSmallInteger(0) );
+RETURN ( __mkSmallInteger(0) );
-	}
+}
 }
 %}.
 "
 currently, this operation is only defined for strings, symbols
 and subclasses.
 /*
 * multiply by large prime to spread values
 * This speeds up Set and Dictionary by a factor of 10!
 */
 val *= 31415821;
-RETURN ( __mkSmallInteger(val & 0x3fffffff));
+RETURN ( __mkSmallInteger(val & _MAX_INT));
 %}
 !
 ~= aString
 "Compare the receiver with the argument and return true if the
 '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' asUUID
 'EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B' asUUID
 "
 "Modified: / 02-08-2007 / 16:43:29 / cg"
-!
-uncapitalized
-"Answer a <readableString> which is a copy of the receiver but with
-the first character converted to its lowercase equivalent."
-^ self asLowercaseFirst
-"/        | answer |
-"/        #swAdded.
-"/        (answer := self copy) isEmpty ifFalse: [
-"/                answer at: 1 put: (self first asLowercase)].
-"/        ^answer
 !
 withTabsExpanded:numSpaces
 "return a string with the characters of the receiver where all tabulator characters
 are expanded into spaces (assuming numSpaces-col tabs).
 %}.
 ^ super reverse
 ! !
 !String methodsFor:'substring searching'!
 indexOfSubCollection:aSubString startingAt:startIndex ifAbsent:exceptionValue caseSensitive:caseSensitive
 "redefined as primitive for maximum speed (BM)"
 ! !
 !String class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.270 2010-02-10 17:47:03 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.271 2010-03-06 13:31:19 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.270 2010-02-10 17:47:03 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.271 2010-03-06 13:31:19 stefan Exp $'
 ! !

changeset 12763	e19933d3e188
parent 12727	b3d7aebe8c6b
child 13116	467e182438ff