hg/stx-libbasic: comparison Array.st

equal deleted inserted replaced

-:e55af242e134
+:22bdfc405bca
 "
 !
 documentation
 "
 Instances of Array store general objects;
 an array's size is fixed, therefore add:/remove: are not allowed.
 (actually, #add: is implemented for compatibility with smalltalks which
 provide it, but it is very slow and outputs an annoying warning message...)
 Access to the individual elements is via an integer index,
 However, subclassing is allowed of course
 - even with added named instance variables.
 Literal arrays (i.e. array-constants) are entered in source as:
-#( element1 element2 ... element-N)
+	#( element1 element2 ... element-N)
 where each element must be itself a literal constant.
 Array, symbol and byteArray constants within an array can be written
 without the initial #-character.
 In addition, true, false and nil are also allowed as array-literal.
 #(two [3 3 3] (4 4 4))  -> 3 elements: a symbol, a byteArray and another array
 Also, a syntactic sugar piece allows for Array instances to be created dynamcially
 at runtime with the brace syntax:
-{ expr1 . expr2 . ... . expr-N }
+	{ expr1 . expr2 . ... . expr-N }
 where each expr-i evaluates to an element of the new array instance.
 Notice that the expressions are separated by a period.
 Semantically, this is equivalent to ``Array with:expr1 with:expr2 ... with:expr-N''
 Examples:
-{ 1 . 2 . 3 }         -> a new 3 element array; similar to #( 1 2 3 ),
+	{ 1 . 2 . 3 }         -> a new 3 element array; similar to #( 1 2 3 ),
-but in contrast, a new array instance is created
+				 but in contrast, a new array instance is created
-{
+	{
-{ 'foo' . [ Transcript showCR:'foo' ] } .
+	    { 'foo' . [ Transcript showCR:'foo' ] } .
-{ 'bar' . [ Transcript showCR:'bar' ] }
+	    { 'bar' . [ Transcript showCR:'bar' ] }
-{ 'baz' . [ Transcript showCR:'baz' ] }
+	    { 'baz' . [ Transcript showCR:'baz' ] }
-}
+	}
--> a new 3 element array, consisting of 3 new
+			      -> a new 3 element array, consisting of 3 new
-2-element array instances, consisting of a string
+				 2-element array instances, consisting of a string
-and a block each
+				 and a block each
 [memory requirements:]
-OBJ-HEADER + (size * ptr-size)
+	OBJ-HEADER + (size * ptr-size)
 [warning:]
-read the warning about 'growing fixed size collection'
+	read the warning about 'growing fixed size collection'
-in ArrayedCollection's documentation
+	in ArrayedCollection's documentation
 [author:]
-Claus Gittinger
+	Claus Gittinger
 [see also:]
-OrderedCollection
+	OrderedCollection
-ByteArray FloatArray DoubleArray IntegerArray BitArray
+	ByteArray FloatArray DoubleArray IntegerArray BitArray
-CharacterArray String
+	CharacterArray String
 "
 ! !
 !Array class methodsFor:'instance creation'!
 "return the receiver as an array - that's the receiver itself.
 Notice: Use asNewArray, if you intent to modify the returned collection."
 "could be an instance of a subclass..."
 self class == Array ifTrue:[
-^ self
+	^ self
 ].
 ^ super asArray
 "Modified: 22.4.1996 / 12:42:09 / cg"
 !
 asNewArray
 "return the receiver as an unique new array."
 "could be an instance of a subclass..."
 self class == Array ifTrue:[
-^ self copy
+	^ self copy
 ].
 ^ super asArray
 !
 beImmutable
 !Array methodsFor:'copying'!
 , aCollection
 %{
 if (__isArray(aCollection)) {
-if (__isArray(self)) {
+	if (__isArray(self)) {
-OBJ newArray;
+	    OBJ newArray;
-int mySize = __arraySize(self);
+	    int mySize = __arraySize(self);
-int otherSize = __arraySize(aCollection);
+	    int otherSize = __arraySize(aCollection);
-REGISTER OBJ src;
+	    REGISTER OBJ src;
-int srcIdx, dstIdx;
+	    int srcIdx, dstIdx;
-newArray = __ARRAY_NEW_INT(mySize+otherSize);
+	    newArray = __ARRAY_NEW_INT(mySize+otherSize);
-src = self;
+	    src = self;
-for (dstIdx=0; dstIdx<mySize; dstIdx++) {
+	    for (dstIdx=0; dstIdx<mySize; dstIdx++) {
-OBJ el = __ArrayInstPtr(src)->a_element[dstIdx];
+		OBJ el = __ArrayInstPtr(src)->a_element[dstIdx];
-__ArrayInstPtr(newArray)->a_element[dstIdx] = el;
+		__ArrayInstPtr(newArray)->a_element[dstIdx] = el;
-__STORE(newArray, el);
+		__STORE(newArray, el);
-}
+	    }
-src = aCollection;
+	    src = aCollection;
-for (srcIdx=0; srcIdx<otherSize; srcIdx++, dstIdx++) {
+	    for (srcIdx=0; srcIdx<otherSize; srcIdx++, dstIdx++) {
-OBJ el = __ArrayInstPtr(src)->a_element[srcIdx];
+		OBJ el = __ArrayInstPtr(src)->a_element[srcIdx];
-__ArrayInstPtr(newArray)->a_element[dstIdx] = el;
+		__ArrayInstPtr(newArray)->a_element[dstIdx] = el;
-__STORE(newArray, el);
+		__STORE(newArray, el);
-}
+	    }
-RETURN (newArray);
+	    RETURN (newArray);
-}
+	}
 }
 %}.
 ^ super , aCollection
 !
 printOn:aStream
 "append a printed representation of the receiver to aStream"
 self isLiteral ifTrue:[
-|limit firstOne s|
+	|limit firstOne s|
-thisContext isRecursive ifTrue:[
+	thisContext isRecursive ifTrue:[
-'Array [error]: printOn: of self referencing collection.' errorPrintCR.
+	    'Array [error]: printOn: of self referencing collection.' errorPrintCR.
-aStream nextPutAll:'#("recursive")'.
+	    aStream nextPutAll:'#("recursive")'.
-^ self
+	    ^ self
-].
+	].
-aStream nextPutAll:'#('.
+	aStream nextPutAll:'#('.
-firstOne := true.
+	firstOne := true.
-"
+	"
-if aStream is not positionable, create an temporary positionable stream
+	 if aStream is not positionable, create an temporary positionable stream
-(needed for limit calculation)
+	 (needed for limit calculation)
-"
+	"
-aStream isPositionable ifTrue:[
+	aStream isPositionable ifTrue:[
-s := aStream.
+	    s := aStream.
-] ifFalse:[
+	] ifFalse:[
-s := WriteStream on:(String uninitializedNew:50).
+	    s := WriteStream on:(String uninitializedNew:50).
-].
+	].
-limit := s position + self maxPrint.
+	limit := s position + self maxPrint.
-self printElementsDo:[:element |
+	self printElementsDo:[:element |
-firstOne ifFalse:[
+	    firstOne ifFalse:[
-s space
+		s space
-] ifTrue:[
+	    ] ifTrue:[
-firstOne := false
+		firstOne := false
-].
+	    ].
-(s position >= limit) ifTrue:[
+	    (s position >= limit) ifTrue:[
-s ~~ aStream ifTrue:[
+		s ~~ aStream ifTrue:[
-aStream nextPutAll:(s contents).
+		    aStream nextPutAll:(s contents).
-].
+		].
-aStream nextPutAll:'...etc...)'.
+		aStream nextPutAll:'...etc...)'.
-^ self
+		^ self
-] ifFalse:[
+	    ] ifFalse:[
-element printOn:s.
+		element printOn:s.
-].
+	    ].
-].
+	].
-s ~~ aStream ifTrue:[
+	s ~~ aStream ifTrue:[
-aStream nextPutAll:(s contents).
+	    aStream nextPutAll:(s contents).
-].
+	].
-aStream nextPut:$)
+	aStream nextPut:$)
 ] ifFalse:[
-super printOn:aStream
+	super printOn:aStream
 ]
 "
 #(1 2 $a 'hello' sym kewordSymbol:with: #'funny symbol') printString
 #(1 2 $a [1 2 3] true false nil #true #false #nil) printString
 basicSize
 "return the number of indexed elements in the receiver"
 %{  /* NOCONTEXT */
+#ifdef __SCHTEAM__
+return context._RETURN (STInteger._new(self.basicSize()));
+#else
 REGISTER OBJ slf = self;
 RETURN ( __mkSmallInteger(__arraySize(slf) - __intVal(__ClassInstPtr(__qClass(slf))->c_ninstvars) ));
+#endif
 %}
 !
 refersToLiteral:aLiteral
 "return true if the receiver or recursively any array element in the
 receiver refers to aLiteral (i.e. a deep search)"
 self do: [ :el |
-el == aLiteral ifTrue:[^true].
+	el == aLiteral ifTrue:[^true].
-el class == Array ifTrue:[
+	el class == Array ifTrue:[
-(el refersToLiteral: aLiteral) ifTrue: [^true]
+	    (el refersToLiteral: aLiteral) ifTrue: [^true]
-]
+	]
 ].
 ^ false
 "
 #(1 2 3) refersToLiteral:#foo
 (which we can do here, since when arriving here, #size is obviously not
 redefined in a subclass).
 This method is the same as basicSize."
 %{  /* NOCONTEXT */
+#ifdef __SCHTEAM__
+return context._RETURN (STInteger._new(self.basicSize()));
+#else
 REGISTER OBJ slf = self;
 RETURN ( __mkSmallInteger(__arraySize(slf) - __intVal(__ClassInstPtr(__qClass(slf))->c_ninstvars) ));
+#endif
 %}
 ! !
 !Array methodsFor:'searching'!
 ! !
 !Array class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.165 2015-02-03 13:54:47 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.166 2015-04-20 14:04:23 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.165 2015-02-03 13:54:47 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Array.st,v 1.166 2015-04-20 14:04:23 cg Exp $'
 ! !

branch	jv
changeset 18261	22bdfc405bca
parent 18257	877a8f1b326d
parent 18246	d4d749c60f22
child 18274	042d13555f1f