hg/stx-libbasic: comparison Array.st

equal deleted inserted replaced

-:a4e2d5b5ac25
+:2a8e44b511c2
 be provided or otherwise made available to, or used by, any
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
-'From Smalltalk/X, Version:2.10.8 on 14-nov-1995 at 15:25:17'                   !
+'From Smalltalk/X, Version:2.10.8 on 15-nov-1995 at 04:00:28'                   !
 ArrayedCollection variableSubclass:#Array
 	 instanceVariableNames:''
 	 classVariableNames:''
 	 poolDictionaries:''
 hereby transferred.
 "
 !
 version
-^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.41 1995-11-14 14:25:25 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.42 1995-11-15 03:00:38 cg Exp $'
 ! !
 !Array class methodsFor:'instance creation'!
-new:anInteger
-"return an instance of myself with anInteger indexed variables.
-Since this is often called, its worth giving it an extra ilc-slot.
-Future versions of stc will do this automatically."
-^ self basicNew:anInteger
-!
 basicNew:anInteger
 "return an instance of myself with anInteger indexed variables.
 Since Array-creation is so common (all other collections use them),
 it seems worth to have a specially tuned version here."
 This means, that the VM wanted to get some more memory from the
 Operatingsystem, which was not kind enough to give it.
 Bad luck - you should increase the swap space on your machine.
 "
 ^ ObjectMemory allocationFailureSignal raise.
+!
+new:anInteger
+"return an instance of myself with anInteger indexed variables.
+Since this is often called, its worth giving it an extra ilc-slot.
+Future versions of stc will do this automatically."
+^ self basicNew:anInteger
 ! !
 !Array class methodsFor:'queries'!
 isBuiltInClass
 ^ self == Array
 ! !
 !Array methodsFor:'accessing'!
-basicAt:index
+size
-"return the indexed instance variable with index, anInteger
+"return the number of indexed elements in the receiver.
-- added here for speed"
+Reimplemented here to avoid the additional size->basicSize send
+(which we can do here, since size is obviously not redefined in a subclass).
+This method is the same as basicSize."
+%{  /* NOCONTEXT */
+RETURN ( __MKSMALLINT(_arraySize(self) - _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars) ));
+%}
+!
+at:index
+"return the indexed instance variable with index, anInteger.
+Reimplemented here to avoid the additional at:->basicAt: send
+(which we can do here, since at: is obviously not redefined in a subclass).
+This method is the same as at:."
 %{  /* NOCONTEXT */
 REGISTER int indx;
 REGISTER unsigned int nIndex;
 	    if (indx < nIndex) {
 		RETURN ( _InstPtr(self)->i_instvars[indx] );
 	    }
 	}
 }
-%}
+%}.
-.
+^ super at:index
-^ super basicAt:index
 !
 at:index put:anObject
 "store the 2nd arg, anObject as indexed instvar with index, anInteger.
 Reimplemented here to avoid the additional at:put:->basicAt:put: send
 }
 %}.
 ^ super at:index put:anObject
 !
-size
+basicSize
-"return the number of indexed elements in the receiver.
+"return the number of indexed elements in the receiver"
-Reimplemented here to avoid the additional size->basicSize send
-(which we can do here, since size is obviously not redefined in a subclass).
-This method is the same as basicSize."
 %{  /* NOCONTEXT */
 RETURN ( __MKSMALLINT(_arraySize(self) - _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars) ));
 %}
 !
-at:index
+basicAt:index
-"return the indexed instance variable with index, anInteger.
+"return the indexed instance variable with index, anInteger
-Reimplemented here to avoid the additional at:->basicAt: send
+- added here for speed"
-(which we can do here, since at: is obviously not redefined in a subclass).
-This method is the same as at:."
 %{  /* NOCONTEXT */
 REGISTER int indx;
 REGISTER unsigned int nIndex;
 	    if (indx < nIndex) {
 		RETURN ( _InstPtr(self)->i_instvars[indx] );
 	    }
 	}
 }
-%}.
+%}
-^ super at:index
+.
+^ super basicAt:index
 !
 basicAt:index put:anObject
 "store the 2nd arg, anObject as indexed instvar with index, anInteger.
 - added here for speed"
 	}
 }
 %}
 .
 ^ super basicAt:index put:anObject
-!
-basicSize
-"return the number of indexed elements in the receiver"
-%{  /* NOCONTEXT */
-RETURN ( __MKSMALLINT(_arraySize(self) - _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars) ));
-%}
 ! !
 !Array methodsFor:'converting'!
 asArray
 ^ super copyWith:something
 ! !
 !Array methodsFor:'enumerating'!
-do:aBlock
-"evaluate the argument, aBlock for each element in the collection.
-- reimplemented for speed"
-|home|
-%{
-REGISTER OBJFUNC codeVal;
-REGISTER int index;
-unsigned int nIndex;
-extern OBJ Block;
-static struct inlineCache val = _ILC1;
-REGISTER OBJ rHome;
-index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
-nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
-if (__isBlockLike(aBlock)
-&& ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-&& (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
-#ifdef NEW_BLOCK_CALL
-	for (; index < nIndex; index++) {
-	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-	    (*codeVal)(aBlock, CON_COMMA  _InstPtr(self)->i_instvars[index]);
-	}
-#else
-	home = _BlockInstPtr(aBlock)->b_home;
-	rHome = home;
-	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
-	    /*
-	     * home will not move - keep in a fast register
-	     */
-#if defined(UNROLL_LOOPS)
-	    {
-		int i4;
-		while ((i4 = index+4) < nIndex) {
-		    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-		    (*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index]);
-		    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-		    (*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index+1]);
-		    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-		    (*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index+2]);
-		    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-		    (*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index+3]);
-		    index = i4;
-		}
-	    }
-#endif
-	    for (; index < nIndex; index++) {
-		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-		(*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index]);
-	    }
-	} else {
-	    for (; index < nIndex; index++) {
-		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-		(*codeVal)(home, CON_COMMA  _InstPtr(self)->i_instvars[index]);
-	    }
-	}
-#endif
-} else {
-	for (; index < nIndex; index++) {
-	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-	    (*val.ilc_func)(aBlock,
-			    @symbol(value:),
-			    CON_COMMA  nil, &val,
-			    _InstPtr(self)->i_instvars[index]);
-	}
-}
-%}
-.
-^ self
-!
-keysAndValuesDo:aBlock
-"evaluate the argument, aBlock for each element in the collection.
-Pass both index and element to the block.
-- reimplemented for speed"
-|home|
-%{
-REGISTER OBJFUNC codeVal;
-REGISTER int index;
-unsigned int nIndex;
-extern OBJ Block;
-static struct inlineCache val2 = _ILC2;
-REGISTER OBJ rHome;
-index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
-nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
-if (__isBlockLike(aBlock)
-&& ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
-&& (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(2))) {
-#ifdef NEW_BLOCK_CALL
-	for (; index < nIndex; index++) {
-	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-	    (*codeVal)(aBlock, CON_COMMA  __MKSMALLINT(index+1),
-					  _InstPtr(self)->i_instvars[index]);
-	}
-#else
-	home = _BlockInstPtr(aBlock)->b_home;
-	rHome = home;
-	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
-	    /*
-	     * home will not move - keep in a fast register
-	     */
-	    while (index < nIndex) {
-		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-		index++;
-		(*codeVal)(rHome, CON_COMMA  __MKSMALLINT(index),
-					     _InstPtr(self)->i_instvars[index-1]);
-	    }
-	} else {
-	    while (index < nIndex) {
-		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-		index++;
-		(*codeVal)(home, CON_COMMA  __MKSMALLINT(index),
-					    _InstPtr(self)->i_instvars[index-1]);
-	    }
-	}
-#endif
-} else {
-	while (index < nIndex) {
-	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
-	    index++;
-	    (*val2.ilc_func)(aBlock,
-			    @symbol(value:value:),
-			    CON_COMMA  nil, &val2,
-			    __MKSMALLINT(index),
-			    _InstPtr(self)->i_instvars[index-1]);
-	}
-}
-%}
-.
-^ self
-!
 from:start to:stop do:aBlock
 "evaluate the argument, aBlock for the elements starting at index start
 up to (and including) stop in the collection.
 - reimplemented for speed"
 %}
 .
 ^ super from:start to:stop do:aBlock
 !
+do:aBlock
+"evaluate the argument, aBlock for each element in the collection.
+- reimplemented for speed"
+|home|
+%{
+REGISTER OBJFUNC codeVal;
+REGISTER int index;
+unsigned int nIndex;
+extern OBJ Block;
+static struct inlineCache val = _ILC1;
+REGISTER OBJ rHome;
+index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
+if (__isBlockLike(aBlock)
+&& ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+&& (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
+#ifdef NEW_BLOCK_CALL
+	for (; index < nIndex; index++) {
+	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+	    (*codeVal)(aBlock, CON_COMMA  _InstPtr(self)->i_instvars[index]);
+	}
+#else
+	home = _BlockInstPtr(aBlock)->b_home;
+	rHome = home;
+	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
+	    /*
+	     * home will not move - keep in a fast register
+	     */
+#if defined(UNROLL_LOOPS)
+	    {
+		int i4;
+		while ((i4 = index+4) < nIndex) {
+		    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+		    (*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index]);
+		    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+		    (*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index+1]);
+		    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+		    (*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index+2]);
+		    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+		    (*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index+3]);
+		    index = i4;
+		}
+	    }
+#endif
+	    for (; index < nIndex; index++) {
+		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+		(*codeVal)(rHome, CON_COMMA  _InstPtr(self)->i_instvars[index]);
+	    }
+	} else {
+	    for (; index < nIndex; index++) {
+		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+		(*codeVal)(home, CON_COMMA  _InstPtr(self)->i_instvars[index]);
+	    }
+	}
+#endif
+} else {
+	for (; index < nIndex; index++) {
+	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+	    (*val.ilc_func)(aBlock,
+			    @symbol(value:),
+			    CON_COMMA  nil, &val,
+			    _InstPtr(self)->i_instvars[index]);
+	}
+}
+%}
+.
+^ self
+!
 nonNilElementsDo:aBlock
 "evaluate the argument, aBlock for each non-nil element"
 |home|
 %{
 	    if (element != nil)
 		(*val.ilc_func)(aBlock,
 				@symbol(value:),
 				CON_COMMA nil, &val,
 				element);
+	}
+}
+%}
+.
+^ self
+!
+keysAndValuesDo:aBlock
+"evaluate the argument, aBlock for each element in the collection.
+Pass both index and element to the block.
+- reimplemented for speed"
+|home|
+%{
+REGISTER OBJFUNC codeVal;
+REGISTER int index;
+unsigned int nIndex;
+extern OBJ Block;
+static struct inlineCache val2 = _ILC2;
+REGISTER OBJ rHome;
+index = _intVal(_ClassInstPtr(__qClass(self))->c_ninstvars);
+nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
+if (__isBlockLike(aBlock)
+&& ((codeVal = _BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+&& (_BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(2))) {
+#ifdef NEW_BLOCK_CALL
+	for (; index < nIndex; index++) {
+	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+	    (*codeVal)(aBlock, CON_COMMA  __MKSMALLINT(index+1),
+					  _InstPtr(self)->i_instvars[index]);
+	}
+#else
+	home = _BlockInstPtr(aBlock)->b_home;
+	rHome = home;
+	if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE)) {
+	    /*
+	     * home will not move - keep in a fast register
+	     */
+	    while (index < nIndex) {
+		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+		index++;
+		(*codeVal)(rHome, CON_COMMA  __MKSMALLINT(index),
+					     _InstPtr(self)->i_instvars[index-1]);
+	    }
+	} else {
+	    while (index < nIndex) {
+		if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+		index++;
+		(*codeVal)(home, CON_COMMA  __MKSMALLINT(index),
+					    _InstPtr(self)->i_instvars[index-1]);
+	    }
+	}
+#endif
+} else {
+	while (index < nIndex) {
+	    if (InterruptPending != nil) __interruptL(@line COMMA_CON);
+	    index++;
+	    (*val2.ilc_func)(aBlock,
+			    @symbol(value:value:),
+			    CON_COMMA  nil, &val2,
+			    __MKSMALLINT(index),
+			    _InstPtr(self)->i_instvars[index-1]);
 	}
 }
 %}
 .
 ^ self
 %}
 .
 ^ super from:start to:stop reverseDo:aBlock
 !
+addAllTo:aCollection
+"add all elements of the receiver to aCollection.
+return aCollection."
+|stop "{ Class: SmallInteger }"|
+stop := self size.
+1 to:stop do:[:idx |
+	aCollection add:(self at:idx)
+].
+^ aCollection
+!
 reverseDo:aBlock
 "evaluate the argument, aBlock for each element in the collection in reverse order.
 - reimplemented for speed"
 |home|
 }
 %}.
 ^ self
 !
-addAllTo:aCollection
-"add all elements of the receiver to aCollection.
-return aCollection."
-|stop "{ Class: SmallInteger }"|
-stop := self size.
-1 to:stop do:[:idx |
-	aCollection add:(self at:idx)
-].
-^ aCollection
-!
 traverse:aBlock
 "Evaluate aBlock for every element that is not an Array,
 and traverse Arrays.
 Implemented here to support better search for selectors in
 literal arrays - might be a good idea to move it up in the collection
 s contents
 "
 ! !
 !Array methodsFor:'filling & replacing'!
+from:index1 to:index2 put:anObject
+"reimplemented for speed if receiver is an Array"
+%{  /* NOCONTEXT */
+REGISTER int index;
+unsigned int nIndex;
+unsigned int endIndex;
+REGISTER OBJ *dst;
+if ((__qClass(self) == Array)
+&& __bothSmallInteger(index1, index2)) {
+	index = _intVal(index1) - 1;
+	if (index >= 0) {
+	    nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
+	    endIndex = _intVal(index2) - 1;
+	    if (endIndex < nIndex) {
+		dst = &(_InstPtr(self)->i_instvars[index]);
+#ifdef memset4
+		memset4(dst, anObject, (endIndex-index+1));
+		__STORE(self, anObject);
+#else
+		if ((INT)anObject == 0) {
+		    memset(dst, 0, __OBJS2BYTES__(endIndex-index+1));
+		} else {
+#if defined(UNROLL_LOOPS)
+		    {
+			int i8;
+			while ((i8 = index + 8) <= endIndex) {
+			    dst[0] = anObject;
+			    dst[1] = anObject;
+			    dst[2] = anObject;
+			    dst[3] = anObject;
+			    dst[4] = anObject;
+			    dst[5] = anObject;
+			    dst[6] = anObject;
+			    dst[7] = anObject;
+			    dst += 8;
+			    index = i8;
+			}
+		    }
+#endif
+		    for (; index <= endIndex; index++) {
+			*dst++ = anObject;
+		    }
+		    __STORE(self, anObject);
+		}
+#endif
+		RETURN ( self );
+	    }
+	}
+}
+%}
+.
+^ super from:index1 to:index2 put:anObject
+!
 replaceFrom:start to:stop with:aCollection startingAt:repStart
 "reimplemented for speed if both receiver and aCollection are Arrays"
 %{  /* NOCONTEXT */
 	    }
 	}
 }
 %}.
 ^ super replaceFrom:start to:stop with:aCollection startingAt:repStart
-!
-from:index1 to:index2 put:anObject
-"reimplemented for speed if receiver is an Array"
-%{  /* NOCONTEXT */
-REGISTER int index;
-unsigned int nIndex;
-unsigned int endIndex;
-REGISTER OBJ *dst;
-if ((__qClass(self) == Array)
-&& __bothSmallInteger(index1, index2)) {
-	index = _intVal(index1) - 1;
-	if (index >= 0) {
-	    nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
-	    endIndex = _intVal(index2) - 1;
-	    if (endIndex < nIndex) {
-		dst = &(_InstPtr(self)->i_instvars[index]);
-#ifdef memset4
-		memset4(dst, anObject, (endIndex-index+1));
-		__STORE(self, anObject);
-#else
-		if ((INT)anObject == 0) {
-		    memset(dst, 0, __OBJS2BYTES__(endIndex-index+1));
-		} else {
-#if defined(UNROLL_LOOPS)
-		    {
-			int i8;
-			while ((i8 = index + 8) <= endIndex) {
-			    dst[0] = anObject;
-			    dst[1] = anObject;
-			    dst[2] = anObject;
-			    dst[3] = anObject;
-			    dst[4] = anObject;
-			    dst[5] = anObject;
-			    dst[6] = anObject;
-			    dst[7] = anObject;
-			    dst += 8;
-			    index = i8;
-			}
-		    }
-#endif
-		    for (; index <= endIndex; index++) {
-			*dst++ = anObject;
-		    }
-		    __STORE(self, anObject);
-		}
-#endif
-		RETURN ( self );
-	    }
-	}
-}
-%}
-.
-^ super from:index1 to:index2 put:anObject
 ! !
 !Array methodsFor:'printing & storing'!
 displayString

changeset 549	2a8e44b511c2
parent 543	09293a92bddb
child 551	91e4e4d82ec1