hg/stx-libbasic: comparison Integer.st

equal deleted inserted replaced

-:be947d4e7fb2
+:514c749165c3
 "
 COPYRIGHT (c) 1988 by Claus Gittinger
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 category:'Magnitude-Numbers'
 !
 Integer comment:'
 COPYRIGHT (c) 1988 by Claus Gittinger
-All Rights Reserved
+	      All Rights Reserved
-$Header: /cvs/stx/stx/libbasic/Integer.st,v 1.15 1994-08-22 12:21:15 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Integer.st,v 1.16 1994-10-10 00:26:19 claus Exp $
 '!
 !Integer class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 1988 by Claus Gittinger
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libbasic/Integer.st,v 1.15 1994-08-22 12:21:15 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Integer.st,v 1.16 1994-10-10 00:26:19 claus Exp $
 "
 !
 documentation
 "
 numberOfBytes bytes (= digitLength). The additional argument
 negative specifies if the result should be a negative number.
 The digits can be stored byte-wise into the result, using digitAt:put:"
 ^ (LargeInteger basicNew numberOfDigits:numberOfBytes)
-sign:(negative ifTrue:[-1] ifFalse:[1])
+		sign:(negative ifTrue:[-1] ifFalse:[1])
 ! !
 !Integer class methodsFor:'misc'!
 displayRadix:aNumber
 |d|
 d := aFraction denominator.
 ^ (Fraction numerator:(aFraction numerator + (self * d))
-denominator:d) reduced
+	      denominator:d) reduced
 !
 differenceFromFraction:aFraction
 "sent when a fraction does not know how to subtract the recevier, an integer"
 |d|
 d := aFraction denominator.
 ^ (Fraction numerator:(aFraction numerator - (self * d))
-denominator:d) reduced
+	      denominator:d) reduced
 !
 productFromFraction:aFraction
 "sent when a fraction does not know how to multiply the recevier, an integer"
 ^ (Fraction numerator:(self * aFraction numerator)
-denominator:aFraction denominator) reduced
+	      denominator:aFraction denominator) reduced
 !
 quotientFromFraction:aFraction
 "sent when a fraction does not know how to divide the recevier, an integer"
 ^ (Fraction numerator:aFraction numerator
-denominator:(self * aFraction denominator)) reduced
+	      denominator:(self * aFraction denominator)) reduced
 ! !
 !Integer methodsFor:'bit operators'!
 bitAnd:anInteger
 n := (anInteger digitLength) min:(self digitLength).
 result := self class basicNew numberOfDigits:n.
 1 to:n do:[:index |
-byte := (anInteger digitAt:index) bitAnd:(self digitAt:index).
+	byte := (anInteger digitAt:index) bitAnd:(self digitAt:index).
-result digitAt:index put:byte.
+	result digitAt:index put:byte.
 ].
 byte == 0 ifTrue:[
-^ result normalize
+	^ result normalize
 ].
 ^ result
 !
 bitOr:anInteger
 n := (anInteger digitLength) max:(self digitLength).
 result := self class basicNew numberOfDigits:n.
 1 to:n do:[:index |
-byte := (anInteger digitAt:index) bitOr:(self digitAt:index).
+	byte := (anInteger digitAt:index) bitOr:(self digitAt:index).
-result digitAt:index put:byte.
+	result digitAt:index put:byte.
 ].
 byte == 0 ifTrue:[
-^ result normalize
+	^ result normalize
 ].
 ^ result
 !
 bitXor:anInteger
 n := (anInteger digitLength) max:(self digitLength).
 result := self class basicNew numberOfDigits:n.
 1 to:n do:[:index |
-byte := (anInteger digitAt:index) bitXor:(self digitAt:index).
+	byte := (anInteger digitAt:index) bitXor:(self digitAt:index).
-result digitAt:index put:byte.
+	result digitAt:index put:byte.
 ].
 byte == 0 ifTrue:[
-^ result normalize
+	^ result normalize
 ].
 ^ result
 !
 highBit
 !
 bitAt:index
 "return the value of the index's bit (index starts at 1).
 Notice: the result of bitShift: on negative receivers is not
-defined in the language standard (since the implementation
+	     defined in the language standard (since the implementation
-is free to choose any internal representation for integers)"
+	     is free to choose any internal representation for integers)"
 |i "{Class: SmallInteger}"|
 i := index - 1.
 ^ (self digitAt:(i // 8 + 1)) bitAt:(i \\ 8 + 1)
 bitShift:shiftCount
 "return the value of the receiver shifted by shiftCount bits;
 leftShift if shiftCount > 0; rightShift otherwise.
 Notice: the result of bitShift: on negative receivers is not
-defined in the language standard (since the implementation
+	     defined in the language standard (since the implementation
-is free to choose any internal representation for integers)"
+	     is free to choose any internal representation for integers)"
 |result
 prev       "{ Class: SmallInteger }"
 next       "{ Class: SmallInteger }"
 byte       "{ Class: SmallInteger }"
 digitShift "{ Class: SmallInteger }"
 n          "{ Class: SmallInteger }"
 nn         "{ Class: SmallInteger }"|
 shiftCount > 0 ifTrue:[
-"left shift"
+	"left shift"
-digitShift := shiftCount // 8.
+	digitShift := shiftCount // 8.
-bitShift := shiftCount \\ 8.
+	bitShift := shiftCount \\ 8.
-n := self digitLength.
+	n := self digitLength.
-"
+	"
-modulu 8 shifts can be done faster ...
+	 modulu 8 shifts can be done faster ...
-"
+	"
-bitShift == 0 ifTrue:[
+	bitShift == 0 ifTrue:[
-result := self class basicNew numberOfDigits:n + digitShift.
+	    result := self class basicNew numberOfDigits:n + digitShift.
-result sign:self sign.
+	    result sign:self sign.
-result digits replaceFrom:(digitShift + 1) with:self digits.
+	    result digits replaceFrom:(digitShift + 1) with:self digits.
-"
+	    "
-no normalize needed, since receiver was already normalized
+	     no normalize needed, since receiver was already normalized
-"
+	    "
-^ result
+	    ^ result
-].
+	].
-"
+	"
-less-than-8 shifts can be done faster ...
+	 less-than-8 shifts can be done faster ...
-"
+	"
-digitShift == 0 ifTrue:[
+	digitShift == 0 ifTrue:[
-n := n + 1.
+	    n := n + 1.
-result := self class basicNew numberOfDigits:n.
+	    result := self class basicNew numberOfDigits:n.
-result sign:self sign.
+	    result sign:self sign.
-prev := 0.
+	    prev := 0.
-1 to:n-1 do:[:index |
+	    1 to:n-1 do:[:index |
-byte := self digitAt:index.
+		byte := self digitAt:index.
-byte := (byte bitShift:bitShift) bitOr:prev.
+		byte := (byte bitShift:bitShift) bitOr:prev.
-result digitAt:index put:(byte bitAnd:16rFF).
+		result digitAt:index put:(byte bitAnd:16rFF).
-prev := byte bitShift:-8.
+		prev := byte bitShift:-8.
-].
+	    ].
-result digitAt:n put:prev.
+	    result digitAt:n put:prev.
-"
+	    "
-might have stored a 0-byte ...
+	     might have stored a 0-byte ...
-"
+	    "
-prev == 0 ifTrue:[
+	    prev == 0 ifTrue:[
-^ result normalize
+		^ result normalize
-].
+	    ].
-^ result.
+	    ^ result.
-].
+	].
-"
+	"
-slow case ...
+	 slow case ...
-"
+	"
-n := n + digitShift + 1.
+	n := n + digitShift + 1.
-result := self class basicNew numberOfDigits:n.
+	result := self class basicNew numberOfDigits:n.
-result sign:self sign.
+	result sign:self sign.
-byte := ((self digitAt:1) bitShift:bitShift) bitAnd:16rFF.
+	byte := ((self digitAt:1) bitShift:bitShift) bitAnd:16rFF.
-result digitAt:(digitShift + 1) put:byte.
+	result digitAt:(digitShift + 1) put:byte.
-revShift := -8 + bitShift.
+	revShift := -8 + bitShift.
-2 to:(self digitLength) do:[:index |
+	2 to:(self digitLength) do:[:index |
-byte := (self digitAt:index) bitShift:bitShift.
+	    byte := (self digitAt:index) bitShift:bitShift.
-byte := byte bitOr:((self digitAt:index-1) bitShift:revShift).
+	    byte := byte bitOr:((self digitAt:index-1) bitShift:revShift).
-byte := byte bitAnd:16rFF.
+	    byte := byte bitAnd:16rFF.
-result digitAt:(index + digitShift) put:byte
+	    result digitAt:(index + digitShift) put:byte
-].
+	].
-"
+	"
-might have stored a 0-byte ...
+	 might have stored a 0-byte ...
-"
+	"
-byte == 0 ifTrue:[
+	byte == 0 ifTrue:[
-^ result normalize
+	    ^ result normalize
-].
+	].
-^ result
+	^ result
 ].
 shiftCount < 0 ifTrue:[
-"right shift"
+	"right shift"
-digitShift := shiftCount negated // 8.
+	digitShift := shiftCount negated // 8.
-bitShift := shiftCount negated \\ 8.
+	bitShift := shiftCount negated \\ 8.
-n := self digitLength.
+	n := self digitLength.
-digitShift >= n ifTrue:[
+	digitShift >= n ifTrue:[
-^ 0
+	    ^ 0
-].
+	].
-"
+	"
-modulu 8 shifts can be done faster ...
+	 modulu 8 shifts can be done faster ...
-"
+	"
-bitShift == 0 ifTrue:[
+	bitShift == 0 ifTrue:[
-n := n-digitShift.
+	    n := n-digitShift.
-result := self class basicNew numberOfDigits:n.
+	    result := self class basicNew numberOfDigits:n.
-result sign:self sign.
+	    result sign:self sign.
-result digits replaceFrom:1 with:self digits startingAt:(digitShift + 1) .
+	    result digits replaceFrom:1 with:self digits startingAt:(digitShift + 1) .
-n <= 4 ifTrue:[
+	    n <= 4 ifTrue:[
-^ result normalize
+		^ result normalize
-].
+	    ].
-^ result
+	    ^ result
-].
+	].
-"
+	"
-less-than-8 shifts can be done faster ...
+	 less-than-8 shifts can be done faster ...
-"
+	"
-digitShift == 0 ifTrue:[
+	digitShift == 0 ifTrue:[
-result := self class basicNew numberOfDigits:n.
+	    result := self class basicNew numberOfDigits:n.
-result sign:self sign.
+	    result sign:self sign.
-prev := 0.
+	    prev := 0.
-bitShift := bitShift negated.
+	    bitShift := bitShift negated.
-revShift := 8 + bitShift.
+	    revShift := 8 + bitShift.
-n to:1 by:-1 do:[:index |
+	    n to:1 by:-1 do:[:index |
-byte := self digitAt:index.
+		byte := self digitAt:index.
-next := (byte bitShift:revShift) bitAnd:16rFF.
+		next := (byte bitShift:revShift) bitAnd:16rFF.
-byte := (byte bitShift:bitShift) bitOr:prev.
+		byte := (byte bitShift:bitShift) bitOr:prev.
-result digitAt:index put:(byte bitAnd:16rFF).
+		result digitAt:index put:(byte bitAnd:16rFF).
-prev := next.
+		prev := next.
-].
+	    ].
-(n <= 5) ifTrue:[
+	    (n <= 5) ifTrue:[
-^ result normalize
+		^ result normalize
-].
+	    ].
-^ result
+	    ^ result
-].
+	].
-"
+	"
-slow case ...
+	 slow case ...
-"
+	"
-nn := n-digitShift.
+	nn := n-digitShift.
-result := self class basicNew numberOfDigits:nn.
+	result := self class basicNew numberOfDigits:nn.
-result sign:self sign.
+	result sign:self sign.
-prev := 0.
+	prev := 0.
-bitShift := bitShift negated.
+	bitShift := bitShift negated.
-revShift := 8 + bitShift.
+	revShift := 8 + bitShift.
-n to:(1 + digitShift) by:-1 do:[:index |
+	n to:(1 + digitShift) by:-1 do:[:index |
-byte := self digitAt:index.
+	    byte := self digitAt:index.
-next := (byte bitShift:revShift) bitAnd:16rFF.
+	    next := (byte bitShift:revShift) bitAnd:16rFF.
-byte := (byte bitShift:bitShift) bitOr:prev.
+	    byte := (byte bitShift:bitShift) bitOr:prev.
-result digitAt:(index - digitShift) put:byte.
+	    result digitAt:(index - digitShift) put:byte.
-prev := next.
+	    prev := next.
-].
+	].
-"the last stored byte ..."
+	"the last stored byte ..."
-^ result normalize
+	^ result normalize
 ].
 ^ self "no shift"
 ! !
 |num count|
 num := self.
 count := n.
 [count > 1] whileTrue:[
-num := num // 256.
+	num := num // 256.
-count := count - 1
+	count := count - 1
 ].
 ^ num \\ 256
 "
 16r44332211 digitAt:1
 factorial
 "return 1*2*3...*self"
 (self > 2) ifTrue:[
-^ self * (self - 1) factorial
+	^ self * (self - 1) factorial
 ].
 ^ self
 !
 gcd:anInteger
 |ttt selfInteger temp|
 ttt := anInteger.
 selfInteger := self.
 [ttt ~~ 0] whileTrue:[
-temp := selfInteger \\ ttt.
+	temp := selfInteger \\ ttt.
-selfInteger := ttt.
+	selfInteger := ttt.
-ttt := temp
+	ttt := temp
 ].
 ^ selfInteger
 "
 65 gcd:15
 "dont use this method if you need fibionacci numbers -
 this method is for benchmarking purposes only.
 (use fastFib instead and dont ever try 60 fib ...)"
 (self > 1) ifTrue:[
-^ (self - 1) fib + (self - 2) fib
+	^ (self - 1) fib + (self - 2) fib
 ].
 ^ 1
 "
 Transcript showCr:(Time millisecondsToRun:[30 fib])
 |fib|
 self <= 1 ifTrue:[^ 1].
 fibCache size >= self ifTrue:[
-^ fibCache at:self
+	^ fibCache at:self
 ].
 fib := ((self - 2) fibUsingCache:fibCache) + ((self - 1) fibUsingCache:fibCache).
 fibCache grow:self.
 fibCache at:self put:fib.
 "return a string for displaying in a view (as in inspector).
 The output radix is usually 10, but can be changed by setting
 DefaultDisplayRadix (see Integer>>displayRadix:)"
 (DefaultDisplayRadix isNil or:[DefaultDisplayRadix == 10]) ifTrue:[
-^ self printString
+	^ self printString
 ].
 ^ self radixPrintStringRadix:DefaultDisplayRadix
 "
 Integer displayRadix:16. 12345
 radix (without the initial XXr)"
 |num s "rx leftPart"|
 (aRadix between:2 and:36) ifFalse:[
-self error:'invalid radix'.
+	self error:'invalid radix'.
-^ self printStringRadix:10
+	^ self printStringRadix:10
 ].
 (self = 0) ifTrue:[^ '0'].
 (self < 0) ifTrue:[
-^ '-' , (self negated printStringRadix:aRadix)
+	^ '-' , (self negated printStringRadix:aRadix)
 ].
 "
 claus: changed it from a recursive algorithm;
 (it used to trigger stack-overflow exceptions when printing
 num := self.
 s := (Character digitValue:(num \\ aRadix)) asString.
 num := num // aRadix.
 [num ~= 0] whileTrue:[
-s := (Character digitValue:(num \\ aRadix)) asString , s.
+	s := (Character digitValue:(num \\ aRadix)) asString , s.
-num := num // aRadix.
+	num := num // aRadix.
 ].
 ^ s
 !
 printStringRadix:aRadix size:sz fill:fillCharacter
 |s|
 s := self printStringRadix:aRadix.
 s size < sz ifTrue:[
-s := ((String new:(sz - s size)) atAllPut:fillCharacter) , s
+	s := ((String new:(sz - s size)) atAllPut:fillCharacter) , s
 ].
 ^ s
 "
 1024 printStringRadix:16 size:4 fill:$0
 ! !
 !Integer class methodsFor:'instance creation'!
 readFrom:aStream radix:radix
-"return the next Integer from the (character-)stream aStream in radix;
+"return the next unsigned Integer from the (character-)stream aStream
-(assumes that the initial XXr has already been read)
+in radix; (assumes that the initial XXr has already been read).
-no whitespace-skipping; returns 0 if no number available"
+No whitespace-skipping is done.
+Returns 0 if no number available"
 |nextChar value|
 nextChar := aStream peek.
 value := 0.
 [nextChar notNil and:[nextChar isDigitRadix:radix]] whileTrue:[
-value := value * radix + nextChar digitValue.
+	value := value * radix + nextChar digitValue.
-nextChar := aStream nextPeek
+	nextChar := aStream nextPeek
 ].
 ^ value
+"
+Integer readFrom:(ReadStream on:'12345') radix:10
+Integer readFrom:(ReadStream on:'FFFF') radix:16
+Integer readFrom:(ReadStream on:'1010') radix:2
+"
 !
 readFrom:aStream
 "return the next Integer from the (character-)stream aStream,
 handling initial XXr for arbitrary radix numbers and initial
 sign.
-skipping all whitespace first; return nil if no number"
+Also, all initial whitespace is skipped.
+Q: If the string does not represent a valid integer number,
+	should nil be returned, or an error be raised (see Object>>readFrom:)
+A: for now, return nil.
+	This may be changed, once the ANSI spec defines this."
 |nextChar value negative|
 nextChar := aStream skipSeparators.
 (nextChar == $-) ifTrue:[
-negative := true.
+	negative := true.
-nextChar := aStream nextPeek
+	nextChar := aStream nextPeek
 ] ifFalse:[
-negative := false
+	negative := false
 ].
-nextChar isDigit ifFalse:[ ^ nil].
+nextChar isDigit ifFalse:[
-value := Integer readFrom:aStream radix:10.
+	"
+	 the string does not represent an integer
+	"
+	^ nil
+"
+	^ self error:'expected Integer'.
+"
+].
+value := self readFrom:aStream radix:10.
 nextChar := aStream peek.
 ((nextChar == $r) or:[ nextChar == $R]) ifTrue:[
-"-xxr<number> is invalid; should be xxr-<val>"
+	"-xxr<number> is invalid; should be xxr-<val>"
-negative ifTrue:[
+	negative ifTrue:[
-'invalid (negative) radix ignored' errorPrintNewline.
+	    'invalid (negative) radix ignored' errorPrintNL.
-negative := false
+	    negative := false
-].
+	].
-aStream next.
+	aStream next.
-value := Integer readFrom:aStream radix:value
+	value := self readFrom:aStream radix:value
 ].
 negative ifTrue:[
-^ value negated
+	^ value negated
 ].
 ^ value
+"
+Integer readFrom:(ReadStream on:'12345')
+Integer readFrom:(ReadStream on:'16rFFFF')
+Integer readFrom:(ReadStream on:'12345.1234')
+Integer readFrom:(ReadStream on:'foo')
+Object errorSignal handle:[:ex | ex returnWith:0]
+			    do:[Integer readFrom:(ReadStream on:'foo')]
+"
 ! !
 !Integer methodsFor:'benchmarking'!
 sieve
 Transcript show:'Sieve running ...'.
 Transcript cr.
 time := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-count := 0.
+	    count := 0.
-flags atAllPut:1.
+	    flags atAllPut:1.
-i := 1.
+	    i := 1.
-num timesRepeat:[
+	    num timesRepeat:[
-(flags at:i) == 1 ifTrue:[
+		(flags at:i) == 1 ifTrue:[
-prime := i + i + 3.
+		    prime := i + i + 3.
-k := i + prime.
+		    k := i + prime.
-[k <= num] whileTrue:[
+		    [k <= num] whileTrue:[
-flags at:k put:0.
+			flags at:k put:0.
-k := k + prime
+			k := k + prime
-].
+		    ].
-count := count + 1
+		    count := count + 1
-].
+		].
-i := i + 1
+		i := i + 1
-].
+	    ].
-].
+	].
 ].
 Transcript show:'Sieve in Smalltalk: '.
 Transcript show:self printString.
 Transcript showCr:' iteration(s).'.
 Transcript show:'found '.
 Transcript show:'Sieve running ...'.
 Transcript cr.
 time := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-count := 0.
+	    count := 0.
-flags atAllPut:1.
+	    flags atAllPut:1.
-i := 1.
+	    i := 1.
-num timesRepeat:[
+	    num timesRepeat:[
-(flags at:i) == 1 ifTrue:[
+		(flags at:i) == 1 ifTrue:[
-prime := i + i + 3.
+		    prime := i + i + 3.
-k := i + prime.
+		    k := i + prime.
-[k <= num] whileTrue:[
+		    [k <= num] whileTrue:[
-flags at:k put:0.
+			flags at:k put:0.
-k := k + prime
+			k := k + prime
-].
+		    ].
-count := count + 1
+		    count := count + 1
-].
+		].
-i := i + 1
+		i := i + 1
-].
+	    ].
-].
+	].
 ].
 Transcript show:'Sieve in Smalltalk: '.
 Transcript show:self printString.
 Transcript showCr:' iteration(s).'.
 Transcript show:'found '.
 "lots of recursion for testing send with arg"
 |t|
 t := Time millisecondsToRun:[
-1 recur1:15
+	1 recur1:15
 ].
 Transcript showCr:(t printString)
 "1 recur1"
 !
 doRecur2
 "lots of recursion for testing send without arg"
 (self > 0) ifTrue:[
-(self - 1) doRecur2.
+	(self - 1) doRecur2.
-^ (self - 1) doRecur2
+	^ (self - 1) doRecur2
 ]
 !
 recur2
 "lots of recursion for testing send without arg"
 |t|
 t := Time millisecondsToRun:[
-15 doRecur2
+	15 doRecur2
 ].
 Transcript showCr:(t printString)
 "1 recur2"
 !
 "evaluating a simple block"
 |t|
 t := Time millisecondsToRun:[
-|b|
+	|b|
-b := [99].
+	b := [99].
-1000000 timesRepeat:[b value]
+	1000000 timesRepeat:[b value]
 ].
 Transcript showCr:(t printString)
 "1 blockEvaluation"
 !
 "count down - notice, that index is a method var"
 |t index|
 t := Time millisecondsToRun:[
-index := 100000.
+	index := 100000.
-[index > 0] whileTrue:[
+	[index > 0] whileTrue:[
-index := index - 1
+	    index := index - 1
-].
+	].
 ].
 Transcript showCr:(t printString)
 "1 countDown"
 !
 "count down - notice, that index is a block var"
 |t|
 t := Time millisecondsToRun:[
-|index|
+	|index|
-index := 100000.
+	index := 100000.
-[index > 0] whileTrue:[
+	[index > 0] whileTrue:[
-index := index - 1
+	    index := index - 1
-].
+	].
 ].
 Transcript showCr:(t printString)
 "1 countDown2"
 !
 (timesRepeat is not inlined), another half in the send itself."
 |t|
 t := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-self noopSelf
+	    self noopSelf
-].
+	].
 ].
 Transcript showCr:(t printString)
 "1000000 send"
 !
 Almost all time is spent in the send (since timesRepeat is inlined here)."
 |t|
 t := Time millisecondsToRun:[
-1000000 timesRepeat:[
+	1000000 timesRepeat:[
-self noopSelf
+	    self noopSelf
-].
+	].
 ].
 Transcript showCr:(t printString)
 "1 send2"
 !
 Almost all time is spent in the send (since timesRepeat is inlined here)."
 |t|
 t := Time millisecondsToRun:[
-1000000 timesRepeat:[
+	1000000 timesRepeat:[
-self noopNil
+	    self noopNil
-].
+	].
 ].
 Transcript showCr:(t printString)
 "1 send3"
 !
 Almost all time is spent in the send (since timesRepeat is inlined here)."
 |t|
 t := Time millisecondsToRun:[
-1000000 timesRepeat:[
+	1000000 timesRepeat:[
-self noopTrue
+	    self noopTrue
-].
+	].
 ].
 Transcript showCr:(t printString)
 "1 send4"
 !
 (timesRepeat is not inlined), another half in the send itself."
 |t|
 t := Time millisecondsToRun:[
-|a|
+	|a|
-a := 1->2.
+	a := 1->2.
-self timesRepeat:[a key].
+	self timesRepeat:[a key].
 ].
 Transcript showCr:(t printString)
 "1000000 instAccess1"
 !
 Almost all time is spent in the send (since timesRepeat is inlined here)."
 |t|
 t := Time millisecondsToRun:[
-|a|
+	|a|
-a := 1->2.
+	a := 1->2.
-1000000 timesRepeat:[a key].
+	1000000 timesRepeat:[a key].
 ].
 Transcript showCr:(t printString)
 "1 instAccess2"
 !
 a very small fraction compared to allocation & gc-time."
 |t|
 t := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-Array new:500
+	    Array new:500
-].
+	].
 ].
 Transcript showCr:(t printString)
 "100000 * 500 * (4 bytes/object) -> 200000000"
 "100000 memory"
 allocation & gc."
 |t|
 t := Time millisecondsToRun:[
-100000 timesRepeat:[
+	100000 timesRepeat:[
-Array new:500
+	    Array new:500
-].
+	].
 ].
 Transcript showCr:(t printString)
 "1 memory2"
 !
 n := 3.0.
 m := 5.5.
 t := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-p := 5 / n + m
+	    p := 5 / n + m
-]
+	]
 ].
 Transcript showCr:(t printString)
 "creates 2 new floats (about 20bytes each) per iteration"
 "1000000 benchArithmetic"
 newSpace fill-grade & cache patterns ..."
 |t|
 t := Time millisecondsToRun:[
-|x|
+	|x|
-x := 0.0.
+	x := 0.0.
-1000000 timesRepeat:[x := x + 1.0]
+	1000000 timesRepeat:[x := x + 1.0]
 ].
 Transcript showCr:(t printString)
 "creates 1 new float (about 20bytes) per iteration"
 "1 benchArithmetic2"
 newSpace fill-grade & cache patterns ..."
 |t|
 t := Time millisecondsToRun:[
-|x|
+	|x|
-x := 0.0.
+	x := 0.0.
-self timesRepeat:[x := x + 1.0]
+	self timesRepeat:[x := x + 1.0]
 ].
 Transcript showCr:(t printString)
 "creates 1 new float (about 20bytes) per iteration"
 "1000000 benchArithmetic3"
 stc will show much better performance here."
 |t|
 t := Time millisecondsToRun:[
-|x "{ Class: Float }" |
+	|x "{ Class: Float }" |
-x := 0.0.
+	x := 0.0.
-1000000 timesRepeat:[x := x + 1.0]
+	1000000 timesRepeat:[x := x + 1.0]
 ].
 Transcript showCr:(t printString)
 "creates 1 new float (about 20bytes) per iteration"
 "1 benchArithmetic3"
 newSpace fill-grade & cache patterns ..."
 |t|
 t := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-Object new
+	    Object new
-]
+	]
 ].
 Transcript showCr:(t printString)
 "1000000 benchNew"
 !
 newSpace fill-grade & cache patterns ..."
 |t|
 t := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-Object basicNew
+	    Object basicNew
-]
+	]
 ].
 Transcript showCr:(t printString)
 "1000000 benchBasicNew"
 !
 |t|
 t := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-Array basicNew
+	    Array basicNew
-]
+	]
 ].
 Transcript showCr:(t printString)
 "1000000 benchArrayBasicNew"
 !
 newSpace fill-grade & cache patterns ..."
 |t|
 t := Time millisecondsToRun:[
-self timesRepeat:[
+	self timesRepeat:[
-Array new
+	    Array new
-]
+	]
 ].
 Transcript showCr:(t printString)
 "1000000 benchArrayNew"
 !
 |s t|
 s := Set new.
 t := Time millisecondsToRun:[
-1 to:4500 do:[:i | s add:i]
+	1 to:4500 do:[:i | s add:i]
 ].
 Transcript showCr:(t printString)
 "1 benchSetCreation"
 the set is via a block local variable (s)."
 |t|
 t := Time millisecondsToRun:[
-|s|
+	|s|
-s := Set new.
+	s := Set new.
-1 to:4500 do:[:i | s add:i]
+	1 to:4500 do:[:i | s add:i]
 ].
 Transcript showCr:(t printString)
 "1 benchSetCreation2"
 thus no growing is needed in the loop."
 |t|
 t := Time millisecondsToRun:[
-|s|
+	|s|
-s := Set new:4500.
+	s := Set new:4500.
-1 to:4500 do:[:i | s add:i]
+	1 to:4500 do:[:i | s add:i]
 ].
 Transcript showCr:(t printString)
 "1 benchSetCreation3"
 sumTo
 |val|
 100 timesRepeat:[
-val := 0.
+	val := 0.
-1 to:10000 do:[:i |
+	1 to:10000 do:[:i |
-val := val + i
+	    val := val + i
-]
+	]
 ].
 "Transcript showCr:(Time millisecondsToRun:[1 sumTo])"
 !
 fastSumTo
 |val i|
 100 timesRepeat:[
-val := 0.
+	val := 0.
-i := 1.
+	i := 1.
-[i <= 10000] whileTrue:[
+	[i <= 10000] whileTrue:[
-val := val + i.
+	    val := val + i.
-i := i + 1
+	    i := i + 1
-].
+	].
 ].
 "Transcript showCr:(Time millisecondsToRun:[1 fastSumTo])"
 !
 nestedLoop
 |i|
 100 timesRepeat:[
-i := 0.
+	i := 0.
-1 to:100 do:[:l1 |
+	1 to:100 do:[:l1 |
-1 to:100 do:[:l2 |
+	    1 to:100 do:[:l2 |
-i := i + 1
+		i := i + 1
-]
+	    ]
-]
+	]
 ]
 "Transcript showCr:(Time millisecondsToRun:[1 nestedLoop])"
 !
 atAllPut
 |vec t|
 vec := Array new:100000.
 t := Time millisecondsToRun:[
-1 to:100000 do:[:i |
+	1 to:100000 do:[:i |
-vec at:i put:7
+	    vec at:i put:7
-]
+	]
 ].
 ^ t
 "Transcript showCr:(1 atAllPut)"
 !
 sumAll
 |vec t s|
 vec := Array new:100000.
 1 to:100000 do:[:i |
-vec at:i put:7
+	vec at:i put:7
 ].
 s := 0.
 t := Time millisecondsToRun:[
-1 to:100000 do:[:i |
+	1 to:100000 do:[:i |
-s := s + (vec at:i)
+	    s := s + (vec at:i)
-]
+	]
 ].
 ^ t
 "Transcript showCr:(1 sumAll)"
 ! !

changeset 159	514c749165c3
parent 132	ab2cfccd218c
child 202	40ca7cc6fb9c