hg/stx-libbasic: comparison Array.st

equal deleted inserted replaced

-:5902784fe3b6
+:fdfc6c64bf60
 	if (nindexedinstvars >= 0) {
 	    nInstVars = __intVal(__ClassInstPtr(self)->c_ninstvars);
 	    nInstVars += nindexedinstvars;
 	    instsize = OHDR_SIZE + __OBJS2BYTES__(nInstVars);
-	    if (__CanDoQuickAlignedNew(instsize)) {	/* OBJECT ALLOCATION */
+	    if (__CanDoQuickAlignedNew(instsize)) {     /* OBJECT ALLOCATION */
 		/*
 		 * the most common case
 		 */
 		__qCheckedAlignedNew(newobj, instsize);
 	ok: ;
 REGISTER int spc;
 if (__qClass(self) == Array) {
 	sz = __qSize(self) + sizeof(OBJ);
 	__PROTECT2__(something, self);
-	__qAlignedNew(nObj, sz);	/* OBJECT ALLOCATION */
+	__qAlignedNew(nObj, sz);        /* OBJECT ALLOCATION */
 	__UNPROTECT2__(self, something);
 	if (nObj) {
 	    __InstPtr(nObj)->o_class = Array;
 if (nIndex <= actualSize) {
 	if (__isBlockLike(aBlock)
 	 && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(1))) {
 	    {
-	        /*
+		/*
-	         * the most common case: a static compiled block, with home on the stack ...
+		 * the most common case: a static compiled block, with home on the stack ...
 		 */
 		REGISTER OBJFUNC codeVal;
-if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+		if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
 #ifdef PARANOIA
-&& (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))
+		 && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))
 #endif
 		) {
 #ifdef NEW_BLOCK_CALL
 #                   define BLOCK_ARG        aBlock
 #endif /* UNROLL_LOOPS2 */
 			    for (; index < nIndex; index++) {
 				el = __InstPtr(self)->i_instvars[index];
 				if (InterruptPending != nil) goto interruptX;
 		continueX:
 				(*codeVal)(BLOCK_ARG, el);
 			    }
 			    RETURN (self);
 #if defined(UNROLL_LOOPS2)
 		    /*
 		     * the most common case: a static compiled block, with home on the stack ...
 		     */
 		    REGISTER OBJFUNC codeVal;
-if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+		    if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
 #ifdef PARANOIA
-&& (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))
+		     && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))
 #endif
 		    ) {
 #ifdef NEW_BLOCK_CALL
 #                       define BLOCK_ARG        aBlock
 #else
 OBJ myClass;
 myClass = __qClass(self);
 if ((__ClassInstPtr(myClass)->c_ninstvars) == __MKSMALLINT(0)) {
-actualSize = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
+	actualSize = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
-index = 0;
+	index = 0;
-if (index < actualSize) {
+	if (index < actualSize) {
 	    if (__isBlockLike(aBlock)
 	     && (__BlockInstPtr(aBlock)->b_nargs == __MKSMALLINT(2))) {
-	        {
+		{
 		    /*
 		     * the most common case: a static compiled block, with home on the stack ...
 		     */
 		    REGISTER OBJFUNC codeVal;
-if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
+		    if (((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil)
 #ifdef PARANOIA
-&& (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))
+		     && (! ((INT)(__BlockInstPtr(aBlock)->b_flags) & __MASKSMALLINT(F_DYNAMIC)))
 #endif
 		    ) {
 #ifdef NEW_BLOCK_CALL
 #                       define BLOCK_ARG        aBlock
 #else
 #                       define BLOCK_ARG        rHome
-		        REGISTER OBJ rHome;
+			REGISTER OBJ rHome;
-		        rHome = __BlockInstPtr(aBlock)->b_home;
+			rHome = __BlockInstPtr(aBlock)->b_home;
-		        if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE))
+			if ((rHome == nil) || (__qSpace(rHome) >= STACKSPACE))
 #endif
-		        {
+			{
 			    OBJ el;
 			    while (index < actualSize) {
 				el = __InstPtr(self)->i_instvars[index];
-			        if (InterruptPending != nil) goto interruptX;
+				if (InterruptPending != nil) goto interruptX;
 		continueX:
-			        index++;
+				index++;
-			        (*codeVal)(BLOCK_ARG, __MKSMALLINT(index), el);
+				(*codeVal)(BLOCK_ARG, __MKSMALLINT(index), el);
 			    }
 			    RETURN (self);
 		interruptX:
 			    __interruptL(@line);
 			    el = __InstPtr(self)->i_instvars[index];
 			    goto continueX;
-		        }
+			}
 		    }
-	        }
+		}
-	        /*
+		/*
-	         * sorry, must check code-pointer in the loop
+		 * sorry, must check code-pointer in the loop
-	         * it could be recompiled or flushed
+		 * it could be recompiled or flushed
-	         */
+		 */
 #               undef BLOCK_ARG
 #ifdef NEW_BLOCK_CALL
 #               define BLOCK_ARG        aBlock
 #               define IBLOCK_ARG       nil
 #else
 #               define BLOCK_ARG        (__BlockInstPtr(aBlock)->b_home)
 #               define IBLOCK_ARG       (__BlockInstPtr(aBlock)->b_home)
 #endif
-	        while (index < actualSize) {
+		while (index < actualSize) {
 		    REGISTER OBJFUNC codeVal;
 		    OBJ el;
 		    if (InterruptPending != nil) __interruptL(@line);
 		    el = __InstPtr(self)->i_instvars[index];
 		    index++;
 		    if ((codeVal = __BlockInstPtr(aBlock)->b_code) != (OBJFUNC)nil) {
-		        (*codeVal)(BLOCK_ARG, __MKSMALLINT(index), el);
+			(*codeVal)(BLOCK_ARG, __MKSMALLINT(index), el);
 		    } else {
-		        if (__BlockInstPtr(aBlock)->b_bytecodes != nil) {
+			if (__BlockInstPtr(aBlock)->b_bytecodes != nil) {
 			    /*
 			     * arg is a compiled block with bytecode -
 			     * directly call interpreter without going through Block>>value
 			     */
 #ifdef PASS_ARG_POINTER
 			    {
-			        OBJ t[2];
+				OBJ t[2];
-			        t[0] = __MKSMALLINT(index);
+				t[0] = __MKSMALLINT(index);
-			        t[1] = el;
+				t[1] = el;
-			        __interpret(aBlock, 2, nil, IBLOCK_ARG, nil, nil, t);
+				__interpret(aBlock, 2, nil, IBLOCK_ARG, nil, nil, t);
 			    }
 #else
 			    __interpret(aBlock, 2, nil, IBLOCK_ARG, nil, nil, __MKSMALLINT(index), el);
 #endif
-		        } else {
+			} else {
 			    (*val2.ilc_func)(aBlock,
-					        @symbol(value:value:),
+						@symbol(value:value:),
-					        nil, &val2,
+						nil, &val2,
-					        __MKSMALLINT(index),
+						__MKSMALLINT(index),
-					        el);
+						el);
-		        }
+			}
 		    }
-	        }
+		}
 #               undef BLOCK_ARG
 #               undef IBLOCK_ARG
-	        RETURN (self );
+		RETURN (self );
 	    }
 	    /*
 	     * not a block - send it #value:
 	     */
 	    while (index < actualSize) {
 		OBJ el;
-	        if (InterruptPending != nil) __interruptL(@line);
+		if (InterruptPending != nil) __interruptL(@line);
 		el = __InstPtr(self)->i_instvars[index];
-	        index++;
+		index++;
-	        (*val2.ilc_func)(aBlock,
+		(*val2.ilc_func)(aBlock,
 				    @symbol(value:value:),
 				    nil, &val2,
 				    __MKSMALLINT(index),
 				    el);
 	    }
 	    RETURN ( self );
-}
+	}
 }
 %}.
 ^ super keysAndValuesDo:aBlock
 !
 !Array methodsFor:'printing & storing'!
 displayString
 "return a printed representation of the receiver for displaying"
-|s sz|
+|s|
 (self isLiteral) ifTrue:[
 	s := WriteStream on:String new.
 	s writeLimit:5000.
 	WriteStream writeErrorSignal handle:[:ex |
 	    s writeLimit:nil.
 	    s nextPutAll:' ...'
 	] do:[
 	    s nextPutAll:'#('.
-	    sz := self size.
+	    self
-	    self keysAndValuesDo:[:idx :element |
+		do:[:each | s nextPutAll:each displayString.]
-				    s nextPutAll:element displayString.
+		separatedBy:[s space]
-				    idx ~~ sz ifTrue:[s space]
-				 ].
 	].
 	s writeLimit:nil.
 	s nextPutAll:')'.
 	^ s contents
 ].
 ^ super displayString
 "
 #(1 2 3 4) displayString
 #(1 2 3 4) printString
 (Array new:10000) displayString
 "
-"Modified: 30.6.1996 / 13:00:08 / cg"
+"Modified: 12.9.1997 / 22:03:18 / cg"
 !
 storeOn:aStream
 "append a printed representation of the receiver to aStream,
 which allows reconstructing it via readFrom:.
 REGISTER OBJ *op;
 REGISTER unsigned int nIndex;
 int nInsts;
 if (__isSmallInteger(start)) {
-index = __intVal(start) - 1;
+	index = __intVal(start) - 1;
-if (index >= 0) {
+	if (index >= 0) {
-nInsts = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
+	    nInsts = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
-index += nInsts;
+	    index += nInsts;
-nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
+	    nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
-el = anElement;
+	    el = anElement;
-op = & (__InstPtr(self)->i_instvars[index]);
+	    op = & (__InstPtr(self)->i_instvars[index]);
 #if defined(memsrch4)
-if (index < nIndex) {
+	    if (index < nIndex) {
-OBJ *p;
+		OBJ *p;
-p = memsrch4(op, (INT)el, (nIndex - index));
+		p = memsrch4(op, (INT)el, (nIndex - index));
-if (p) {
+		if (p) {
-index += (p - op + 1);
+		    index += (p - op + 1);
-RETURN ( __MKSMALLINT(index) );
+		    RETURN ( __MKSMALLINT(index) );
-}
+		}
-}
+	    }
 #else
 # if defined(UNROLL_LOOPS)
-{
+	    {
-/*
+		/*
-* dont argue about those gotos below - they speed up that thing by 30%;
+		 * dont argue about those gotos below - they speed up that thing by 30%;
-* its better to exit the loops below with a goto,
+		 * its better to exit the loops below with a goto,
-* since the generated code will then be:
+		 * since the generated code will then be:
-*   compare
+		 *   compare
-*   branch-on-equal found
+		 *   branch-on-equal found
-*
+		 *
-* otherwise (with return as if-statement), we get:
+		 * otherwise (with return as if-statement), we get:
-*   compare
+		 *   compare
-*   branch-on-not-equal skipLabel
+		 *   branch-on-not-equal skipLabel
-*   move-to-return-register true
+		 *   move-to-return-register true
-*   goto return-label
+		 *   goto return-label
-* skipLabel
+		 * skipLabel
-*
+		 *
-* therefore, WITH the so-much-blamed goto, we only branch
+		 * therefore, WITH the so-much-blamed goto, we only branch
-* when found; without the goto, we branch always.
+		 * when found; without the goto, we branch always.
-* Pipelined CPUs do usually not like taken branches.
+		 * Pipelined CPUs do usually not like taken branches.
-*/
+		 */
-unsigned int i8;
+		unsigned int i8;
-while ((i8 = index + 8) < nIndex) {
+		while ((i8 = index + 8) < nIndex) {
-if (op[0] == el) goto found1;
+		    if (op[0] == el) goto found1;
-if (op[1] == el) goto found2;
+		    if (op[1] == el) goto found2;
-if (op[2] == el) goto found3;
+		    if (op[2] == el) goto found3;
-if (op[3] == el) goto found4;
+		    if (op[3] == el) goto found4;
-if (op[4] == el) goto found5;
+		    if (op[4] == el) goto found5;
-if (op[5] == el) goto found6;
+		    if (op[5] == el) goto found6;
-if (op[6] == el) goto found7;
+		    if (op[6] == el) goto found7;
-if (op[7] == el) goto found8;
+		    if (op[7] == el) goto found8;
-index = i8;
+		    index = i8;
-op += 8;
+		    op += 8;
-}
+		}
 		if (0) {
-found1:
+		    found1:
-RETURN ( __MKSMALLINT(index + 1 - nInsts) );
+			RETURN ( __MKSMALLINT(index + 1 - nInsts) );
-found2:
+		    found2:
-RETURN ( __MKSMALLINT(index + 2 - nInsts) );
+			RETURN ( __MKSMALLINT(index + 2 - nInsts) );
-found3:
+		    found3:
-RETURN ( __MKSMALLINT(index + 3 - nInsts) );
+			RETURN ( __MKSMALLINT(index + 3 - nInsts) );
-found4:
+		    found4:
-RETURN ( __MKSMALLINT(index + 4 - nInsts) );
+			RETURN ( __MKSMALLINT(index + 4 - nInsts) );
-found5:
+		    found5:
-RETURN ( __MKSMALLINT(index + 5 - nInsts) );
+			RETURN ( __MKSMALLINT(index + 5 - nInsts) );
-found6:
+		    found6:
-RETURN ( __MKSMALLINT(index + 6 - nInsts) );
+			RETURN ( __MKSMALLINT(index + 6 - nInsts) );
-found7:
+		    found7:
-RETURN ( __MKSMALLINT(index + 7 - nInsts) );
+			RETURN ( __MKSMALLINT(index + 7 - nInsts) );
-found8:
+		    found8:
-RETURN ( __MKSMALLINT(index + 8 - nInsts) );
+			RETURN ( __MKSMALLINT(index + 8 - nInsts) );
 		}
-}
+	    }
 # endif /* UNROLLED_LOOPS */
-while (index++ < nIndex) {
+	    while (index++ < nIndex) {
-if (*op++ == el) goto found0;
+		if (*op++ == el) goto found0;
-}
+	    }
-if (0) {
+	    if (0) {
-found0:
+		found0:
-RETURN ( __MKSMALLINT(index - nInsts) );
+		    RETURN ( __MKSMALLINT(index - nInsts) );
-}
+	    }
 #endif /* no memsrch */
-}
+	}
-RETURN ( __MKSMALLINT(0) );
+	RETURN ( __MKSMALLINT(0) );
 }
 %}.
 ^ self indexNotInteger
 !
 REGISTER unsigned int lastIndex;
 unsigned int nIndex;
 int nInsts;
 if (__bothSmallInteger(start, stop)) {
-index = __intVal(start) - 1;
+	index = __intVal(start) - 1;
-if (index >= 0) {
+	if (index >= 0) {
-nInsts = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
+	    nInsts = __intVal(__ClassInstPtr(__qClass(self))->c_ninstvars);
-index += nInsts;
+	    index += nInsts;
-lastIndex = nInsts + __intVal(stop);
+	    lastIndex = nInsts + __intVal(stop);
-nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
+	    nIndex = __BYTES2OBJS__(__qSize(self) - OHDR_SIZE);
-if (nIndex < lastIndex) {
+	    if (nIndex < lastIndex) {
-lastIndex = nIndex;
+		lastIndex = nIndex;
-}
+	    }
-el = anElement;
+	    el = anElement;
-op = & (__InstPtr(self)->i_instvars[index]);
+	    op = & (__InstPtr(self)->i_instvars[index]);
 #if defined(memsrch4)
-if (index < lastIndex) {
+	    if (index < lastIndex) {
-OBJ *p;
+		OBJ *p;
-p = memsrch4(op, (INT)el, (lastIndex - index));
+		p = memsrch4(op, (INT)el, (lastIndex - index));
-if (p) {
+		if (p) {
-index += (p - op + 1);
+		    index += (p - op + 1);
-RETURN ( __MKSMALLINT(index) );
+		    RETURN ( __MKSMALLINT(index) );
-}
+		}
-}
+	    }
 #else
 # if defined(UNROLL_LOOPS)
-{
+	    {
-unsigned int i8;
+		unsigned int i8;
-while ((i8 = index + 8) < lastIndex) {
+		while ((i8 = index + 8) < lastIndex) {
-if (op[0] == el) goto found1;
+		    if (op[0] == el) goto found1;
-if (op[1] == el) goto found2;
+		    if (op[1] == el) goto found2;
-if (op[2] == el) goto found3;
+		    if (op[2] == el) goto found3;
-if (op[3] == el) goto found4;
+		    if (op[3] == el) goto found4;
-if (op[4] == el) goto found5;
+		    if (op[4] == el) goto found5;
-if (op[5] == el) goto found6;
+		    if (op[5] == el) goto found6;
-if (op[6] == el) goto found7;
+		    if (op[6] == el) goto found7;
-if (op[7] == el) goto found8;
+		    if (op[7] == el) goto found8;
-index = i8;
+		    index = i8;
-op += 8;
+		    op += 8;
-}
+		}
 		if (0) {
-found1:
+	    found1:
-RETURN ( __MKSMALLINT(index + 1 - nInsts) );
+		    RETURN ( __MKSMALLINT(index + 1 - nInsts) );
-found2:
+	    found2:
-RETURN ( __MKSMALLINT(index + 2 - nInsts) );
+		    RETURN ( __MKSMALLINT(index + 2 - nInsts) );
-found3:
+	    found3:
-RETURN ( __MKSMALLINT(index + 3 - nInsts) );
+		    RETURN ( __MKSMALLINT(index + 3 - nInsts) );
-found4:
+	    found4:
-RETURN ( __MKSMALLINT(index + 4 - nInsts) );
+		    RETURN ( __MKSMALLINT(index + 4 - nInsts) );
-found5:
+	    found5:
-RETURN ( __MKSMALLINT(index + 5 - nInsts) );
+		    RETURN ( __MKSMALLINT(index + 5 - nInsts) );
-found6:
+	    found6:
-RETURN ( __MKSMALLINT(index + 6 - nInsts) );
+		    RETURN ( __MKSMALLINT(index + 6 - nInsts) );
-found7:
+	    found7:
-RETURN ( __MKSMALLINT(index + 7 - nInsts) );
+		    RETURN ( __MKSMALLINT(index + 7 - nInsts) );
-found8:
+	    found8:
-RETURN ( __MKSMALLINT(index + 8 - nInsts) );
+		    RETURN ( __MKSMALLINT(index + 8 - nInsts) );
 		}
-}
+	    }
 # endif /* UNROLL_LOOPS */
-while (index++ < lastIndex) {
+	    while (index++ < lastIndex) {
-if (*op++ == el) goto found0;
+		if (*op++ == el) goto found0;
-}
+	    }
-if (0) {
+	    if (0) {
-found0:
+		found0:
-RETURN ( __MKSMALLINT(index - nInsts) );
+		    RETURN ( __MKSMALLINT(index - nInsts) );
-}
+	    }
 #endif
-}
+	}
-RETURN ( __MKSMALLINT(0) );
+	RETURN ( __MKSMALLINT(0) );
 }
 %}.
 ^ self indexNotInteger
 !
 ! !
 !Array class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.98 1997-09-02 20:51:59 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.99 1997-09-15 20:17:22 cg Exp $'
 ! !

changeset 2915	fdfc6c64bf60
parent 2894	344aec8ba014
child 2950	d5fae0fb75d7