hg/stx-libbasic: comparison UninterpretedBytes.st

equal deleted inserted replaced

-:e86d245213b0
+:7a769e54130d
 !UninterpretedBytes methodsFor:'converting'!
 asExternalBytes
 |sz bytes|
-sz := self size.
+sz := self byteSize.
 bytes := ExternalBytes unprotectedNew:sz.
 bytes replaceBytesFrom:1 to:sz with:self startingAt:1.
 ^ bytes
 "
 #[1 2 3 4 5 6 7] asExternalBytes
 'Hello World' asExternalBytes
+'Hello World' asUnicodeString asExternalBytes
 "
 !
 asUUID
 ^ UUID fromBytes:self
 REGISTER unsigned char *dst;
 OBJ cls;
 #ifndef NO_PRIM_BYTEARR
 if ((__isBytes(aCollection) || __isExternalBytesLike(aCollection))
-&& __isBytes(self)
+&& (__isBytes(self) || __isWords(self))
 && __bothSmallInteger(start, stop)
 && __isSmallInteger(repStart)) {
-	startIndex = __intVal(start) - 1;
+startIndex = __intVal(start) - 1;
-	if (startIndex >= 0) {
+if (startIndex >= 0) {
-	    dst = (__ByteArrayInstPtr(self)->ba_element) + startIndex;
+dst = (__ByteArrayInstPtr(self)->ba_element) + startIndex;
-	    nIndex = __byteArraySize(self);
+nIndex = __byteArraySize(self);
-	    if ((cls = __qClass(self)) != @global(ByteArray)) {
+if ((cls = __qClass(self)) != @global(ByteArray)) {
-		int nInst;
+int nInst;
-		nInst = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+nInst = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
-		dst += nInst;
+dst += nInst;
-		nIndex -= nInst;
+nIndex -= nInst;
-	    }
+}
-	    stopIndex = __intVal(stop) - 1;
+stopIndex = __intVal(stop) - 1;
-	    count = stopIndex - startIndex + 1;
+count = stopIndex - startIndex + 1;
-	    if (count == 0) {
+if (count == 0) {
-		RETURN ( self );
+RETURN ( self );
-	    }
+}
-	    if ((count > 0) && (stopIndex < nIndex)) {
+if ((count > 0) && (stopIndex < nIndex)) {
-		repStartIndex = __intVal(repStart) - 1;
+repStartIndex = __intVal(repStart) - 1;
-		if (repStartIndex >= 0) {
+if (repStartIndex >= 0) {
-		    if (__isExternalBytesLike(aCollection)) {
+if (__isExternalBytesLike(aCollection)) {
-			OBJ sz;
+OBJ sz;
-			src = __externalAddressVal(aCollection);
+src = __externalAddressVal(aCollection);
-			if (src == 0) goto fallBack;
+if (src == 0) goto fallBack;
-			sz = __externalBytesSize(aCollection);
+sz = __externalBytesSize(aCollection);
-			if (__isSmallInteger(sz)) {
+if (__isSmallInteger(sz)) {
-			    repNIndex = __smallIntegerVal(sz);
+repNIndex = __smallIntegerVal(sz);
-			} else {
+} else {
-			    repNIndex = repStopIndex+1; /* always enough */
+repNIndex = repStopIndex+1; /* always enough */
-			}
+}
-			src = src + repStartIndex;
+src = src + repStartIndex;
-		    } else {
+} else {
-			if (__isString(aCollection)) {
+if (__isString(aCollection)) {
-			    repNIndex = __stringSize(aCollection);
+repNIndex = __stringSize(aCollection);
-			} else {
+} else {
-			    repNIndex = __qSize(aCollection) - OHDR_SIZE;
+repNIndex = __qSize(aCollection) - OHDR_SIZE;
-			}
+}
-			src = (__ByteArrayInstPtr(aCollection)->ba_element) + repStartIndex;
+src = (__ByteArrayInstPtr(aCollection)->ba_element) + repStartIndex;
-			if ((cls = __qClass(aCollection)) != @global(ByteArray)) {
+if ((cls = __qClass(aCollection)) != @global(ByteArray)) {
-			    int nInst;
+int nInst;
-			    nInst = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
+nInst = __OBJS2BYTES__(__intVal(__ClassInstPtr(cls)->c_ninstvars));
-			    src += nInst;
+src += nInst;
-			    repNIndex -= nInst;
+repNIndex -= nInst;
-			}
+}
-		    }
+}
-		    repStopIndex = repStartIndex + (stopIndex - startIndex);
+repStopIndex = repStartIndex + (stopIndex - startIndex);
-		    if (repStopIndex < repNIndex) {
+if (repStopIndex < repNIndex) {
-			if (aCollection == self) {
+if (aCollection == self) {
-			    /* take care of overlapping copy */
+/* take care of overlapping copy */
-			    if (src < dst) {
+if (src < dst) {
-				/* must do a reverse copy */
+/* must do a reverse copy */
-				src += count;
+src += count;
-				dst += count;
+dst += count;
-				while (count-- > 0) {
+while (count-- > 0) {
-				    *--dst = *--src;
+*--dst = *--src;
-				}
+}
-				RETURN ( self );
+RETURN ( self );
-			    }
+}
-			}
+}
 # ifdef bcopy4
-			if (((unsigned INT)src & 3) == ((unsigned INT)dst & 3)) {
+if (((unsigned INT)src & 3) == ((unsigned INT)dst & 3)) {
-			    int nW;
+int nW;
-			    /* copy unaligned part */
+/* copy unaligned part */
-			    while (count && ((unsigned INT)src & 3)) {
+while (count && ((unsigned INT)src & 3)) {
-				*dst++ = *src++;
+*dst++ = *src++;
-				count--;
+count--;
-			    }
+}
-			    if (count > 0) {
+if (count > 0) {
-				/* copy aligned part */
+/* copy aligned part */
-				nW = count >> 2;
+nW = count >> 2;
-				bcopy4(src, dst, nW);
+bcopy4(src, dst, nW);
-				if ((count = count & 3) != 0) {
+if ((count = count & 3) != 0) {
-				    /* copy any remaining part */
+/* copy any remaining part */
-				    src += (nW<<2);
+src += (nW<<2);
-				    dst += (nW<<2);
+dst += (nW<<2);
-				    while (count--) {
+while (count--) {
-					*dst++ = *src++;
+*dst++ = *src++;
-				    }
+}
-				}
+}
-			    }
+}
-			    RETURN ( self );
+RETURN ( self );
-			}
+}
 # else
 #  if __POINTER_SIZE__ == 8
-			if (((unsigned INT)src & 7) == ((unsigned INT)dst & 7)) {
+if (((unsigned INT)src & 7) == ((unsigned INT)dst & 7)) {
-			    /* copy unaligned part */
+/* copy unaligned part */
-			    while (count && ((unsigned INT)src & 7)) {
+while (count && ((unsigned INT)src & 7)) {
-				*dst++ = *src++;
+*dst++ = *src++;
-				count--;
+count--;
-			    }
+}
-			    /* copy aligned part */
+/* copy aligned part */
-			    while (count >= 8) {
+while (count >= 8) {
-				((unsigned INT *)dst)[0] = ((unsigned INT *)src)[0];
+((unsigned INT *)dst)[0] = ((unsigned INT *)src)[0];
-				dst += 8;
+dst += 8;
-				src += 8;
+src += 8;
-				count -= 8;
+count -= 8;
-			    }
+}
-			    while (count--) {
+while (count--) {
-				*dst++ = *src++;
+*dst++ = *src++;
-			    }
+}
-			    RETURN ( self );
+RETURN ( self );
-			}
+}
 #  endif /* 64bit */
 # endif /* bcopy4 */
 # ifdef FAST_MEMCPY
-			bcopy(src, dst, count);
+bcopy(src, dst, count);
 # else
 #  ifdef __UNROLL_LOOPS__
-			while (count >= 8) {
+while (count >= 8) {
-			    dst[0] = src[0]; dst[1] = src[1];
+dst[0] = src[0]; dst[1] = src[1];
-			    dst[2] = src[2]; dst[3] = src[3];
+dst[2] = src[2]; dst[3] = src[3];
-			    dst[4] = src[4]; dst[5] = src[5];
+dst[4] = src[4]; dst[5] = src[5];
-			    dst[6] = src[6]; dst[7] = src[7];
+dst[6] = src[6]; dst[7] = src[7];
-			    dst += 8; src += 8;
+dst += 8; src += 8;
-			    count -= 8;
+count -= 8;
-			}
+}
 #  endif /* __UNROLL_LOOPS__ */
-			while (count-- > 0) {
+while (count-- > 0) {
-			    *dst++ = *src++;
+*dst++ = *src++;
-			}
+}
 # endif
-			RETURN ( self );
+RETURN ( self );
-		    }
+}
-		}
+}
-	    }
+}
-	}
+}
 }
 fallBack: ;
 #endif
 %}.
 "
 "
 self slowReplaceBytesFrom:start to:stop with:aCollection startingAt:repStart
 "
 #[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16]
-	copy
+copy
-	    replaceFrom:1 to:8
+replaceFrom:1 to:8
-	    with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
+with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
-	    startingAt:1
+startingAt:1
 #[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16]
-	copy
+copy
-	    replaceFrom:3 to:10
+replaceFrom:3 to:10
-	    with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
+with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
-	    startingAt:1
+startingAt:1
 #[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16]
-	copy
+copy
-	    replaceFrom:3 to:4
+replaceFrom:3 to:4
-	    with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
+with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
-	    startingAt:1
+startingAt:1
 #[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16]
-	copy
+copy
-	    replaceFrom:0 to:9
+replaceFrom:0 to:9
-	    with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
+with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
-	    startingAt:1
+startingAt:1
 #[1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16]
-	copy
+copy
-	    replaceFrom:1 to:10
+replaceFrom:1 to:10
-	    with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
+with:#[10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160]
-	    startingAt:0
+startingAt:0
 "
 !
 replaceBytesFrom:startIndex with:replacementCollection startingAt:repStartIndex
 "replace elements from another collection, which must be
 ! !
 !UninterpretedBytes class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/UninterpretedBytes.st,v 1.86 2012-05-13 19:29:47 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UninterpretedBytes.st,v 1.87 2012-05-16 22:28:00 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/UninterpretedBytes.st,v 1.86 2012-05-13 19:29:47 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/UninterpretedBytes.st,v 1.87 2012-05-16 22:28:00 stefan Exp $'
 ! !

changeset 14142	7a769e54130d
parent 14132	debafd18f04b
child 14155	065cc819c3f1