Packages May 2011

packages@lists.squeakfoundation.org

1 participants
291 discussions

The Trunk: Multilingual-ul.145.mcz
by commits＠source.squeak.org 22 May '11

22 May '11

Levente Uzonyi uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-ul.145.mcz ==================== Summary ==================== Name: Multilingual-ul.145 Author: ul Time: 17 May 2011, 5:27:25.14 pm UUID: 2c9cec36-7131-3547-8e1d-89f34263b8af Ancestors: Multilingual-ul.144 Ensure that #nextPut:toStream: always returns it's first argument like all other #nextPut: variants. =============== Diff against Multilingual-ul.144 =============== Item was changed: ----- Method: ByteTextConverter>>nextPut:toStream: (in category 'conversion') ----- nextPut: aCharacter toStream: aStream | charCode | + aStream isBinary ifTrue: [ ^aCharacter storeBinaryOn: aStream ]. - aStream isBinary ifTrue: [^aCharacter storeBinaryOn: aStream]. (charCode := aCharacter charCode) < 256 ifFalse: [ aStream basicNextPut: (Character value: (self encode: charCode)) ] ifTrue: [ (latin1Encodings at: charCode + 1) ifNil: [ aStream basicNextPut: aCharacter ] ifNotNil: [ :encodedString | aStream basicNextPutAll: encodedString ] ]. + ^aCharacter! - ^aStream! Item was changed: ----- Method: CompoundTextConverter>>nextPut:toStream: (in category 'conversion') ----- nextPut: aCharacter toStream: aStream | ascii leadingChar class | aStream isBinary ifTrue: [^aCharacter storeBinaryOn: aStream]. aCharacter isTraditionalDomestic ifFalse: [ class := (EncodedCharSet charsetAt: aCharacter leadingChar) traditionalCharsetClass. ascii := (class charFromUnicode: aCharacter asUnicode) charCode. leadingChar := class leadingChar. ] ifTrue: [ ascii := aCharacter charCode. leadingChar := aCharacter leadingChar. ]. self nextPutValue: ascii toStream: aStream withShiftSequenceIfNeededForLeadingChar: leadingChar. + ^aCharacter ! Item was changed: ----- Method: EUCTextConverter>>nextPut:toStream: (in category 'conversion') ----- nextPut: aCharacter toStream: aStream | value leadingChar nonUnicodeChar value1 value2 | aStream isBinary ifTrue: [^aCharacter storeBinaryOn: aStream]. value := aCharacter charCode. leadingChar := aCharacter leadingChar. (leadingChar = 0 and: [value < 128]) ifTrue: [ + ^aStream basicNextPut: (Character value: value). - aStream basicNextPut: (Character value: value). - ^ aStream ]. (128 <= value and: [value < 256]) ifTrue: [^ aStream]. aCharacter isTraditionalDomestic ifFalse: [ nonUnicodeChar := self nonUnicodeClass charFromUnicode: value. ] ifTrue: [ nonUnicodeChar :=(Character value: value) ]. nonUnicodeChar ifNotNil: [ value := nonUnicodeChar charCode. value1 := value // 94 + 161. value2 := value \\ 94 + 161. aStream basicNextPut: (Character value: value1). aStream basicNextPut: (Character value: value2). + ]. + ^aCharacter - ^ aStream - ] ! Item was changed: ----- Method: ShiftJISTextConverter>>nextPut:toStream: (in category 'conversion') ----- nextPut: aCharacter toStream: aStream | value leadingChar aChar | aStream isBinary ifTrue: [^aCharacter storeBinaryOn: aStream]. aCharacter isTraditionalDomestic ifTrue: [ aChar := aCharacter. value := aCharacter charCode. ] ifFalse: [ value := aCharacter charCode. (16rFF61 <= value and: [value <= 16rFF9F]) ifTrue: [ + ^aStream basicNextPut: (self sjisKatakanaFor: value). - aStream basicNextPut: (self sjisKatakanaFor: value). - ^ aStream ]. aChar := JISX0208 charFromUnicode: value. aChar ifNil: [^ aStream]. value := aChar charCode. ]. leadingChar := aChar leadingChar. leadingChar = 0 ifTrue: [ + ^aStream basicNextPut: (Character value: value). - aStream basicNextPut: (Character value: value). - ^ aStream. ]. leadingChar == self leadingChar ifTrue: [ | upper lower | upper := value // 94 + 33. lower := value \\ 94 + 33. upper \\ 2 = 1 ifTrue: [ upper := upper + 1 / 2 + 112. lower := lower + 31 ] ifFalse: [ upper := upper / 2 + 112. lower := lower + 125 ]. upper >= 160 ifTrue: [upper := upper + 64]. lower >= 127 ifTrue: [lower := lower + 1]. aStream basicNextPut: (Character value: upper). aStream basicNextPut: (Character value: lower). - ^ aStream ]. + ^aCharacter ! Item was changed: ----- Method: UTF16TextConverter>>nextPut:toStream: (in category 'conversion') ----- nextPut: aCharacter toStream: aStream | v low high | aStream isBinary ifTrue: [^aCharacter storeBinaryOn: aStream]. (self useByteOrderMark and: [byteOrderMarkDone isNil]) ifTrue: [ self next16BitValue: (16rFEFF) toStream: aStream. byteOrderMarkDone := true. ]. v := aCharacter charCode. v > 16rFFFF ifFalse: [ self next16BitValue: v toStream: aStream. - ^ self. ] ifTrue: [ v := v - 16r10000. low := (v \\ 16r400) + 16rDC00. high := (v // 16r400) + 16rD800. self next16BitValue: high toStream: aStream. self next16BitValue: low toStream: aStream. + ]. + ^aCharacter. + ! - ]! Item was changed: ----- Method: UTF8TextConverter>>nextPut:toStream: (in category 'conversion') ----- nextPut: aCharacter toStream: aStream | nBytes mask shift ucs2code | + aStream isBinary ifTrue: [ ^aCharacter storeBinaryOn: aStream ]. + ucs2code := aCharacter asUnicode ifNil: [ ^aCharacter ]. - aStream isBinary ifTrue: [^aCharacter storeBinaryOn: aStream]. - ucs2code := aCharacter asUnicode ifNil: [ ^aStream ]. ucs2code < 256 ifTrue: [ (latin1Encodings at: ucs2code + 1) ifNil: [ aStream basicNextPut: aCharacter ] ifNotNil: [ :encodedString | aStream basicNextPutAll: encodedString ]. + ^aCharacter ]. - ^aStream ]. nBytes := ucs2code highBit + 3 // 5. mask := #[128 192 224 240 248 252 254 255] at: nBytes. shift := nBytes - 1 * -6. aStream basicNextPut: (Character value: (ucs2code bitShift: shift) + mask). + 2 to: nBytes do: [ :i | - 2 to: nBytes do: [:i | shift := shift + 6. + aStream basicNextPut: ( + Character value: ((ucs2code bitShift: shift) bitAnd: 63) + 128) ]. + ^aCharacter. - aStream basicNextPut: (Character value: ((ucs2code bitShift: shift) bitAnd: 63) + 128). - ]. - - ^ aStream. !

1 0

The Trunk: Multilingual-ul.145.mcz
by commits＠source.squeak.org 22 May '11

22 May '11

1 0

The Trunk: Multilingual-ul.145.mcz
by commits＠source.squeak.org 22 May '11

22 May '11

1 0

The Trunk: Multilingual-ul.144.mcz
by commits＠source.squeak.org 22 May '11

22 May '11

Levente Uzonyi uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-ul.144.mcz ==================== Summary ==================== Name: Multilingual-ul.144 Author: ul Time: 17 May 2011, 5:22:26.856 pm UUID: 95d68d32-70fa-564c-a0c3-8c2438903489 Ancestors: Multilingual-nice.143 MultiByteFileStream changes: - ensure that wantsLineEndConversion is initalized - deprecated #convertStringFromCr: and #convertStringToCr: Use latin1Encodings in ByteTextConverter's and UTF8TextConverter's #nextPut:toStream: =============== Diff against Multilingual-nice.143 =============== Item was changed: ----- Method: ByteTextConverter>>nextPut:toStream: (in category 'conversion') ----- nextPut: aCharacter toStream: aStream + | charCode | aStream isBinary ifTrue: [^aCharacter storeBinaryOn: aStream]. + (charCode := aCharacter charCode) < 256 + ifFalse: [ aStream basicNextPut: (Character value: (self encode: charCode)) ] + ifTrue: [ + (latin1Encodings at: charCode + 1) + ifNil: [ aStream basicNextPut: aCharacter ] + ifNotNil: [ :encodedString | aStream basicNextPutAll: encodedString ] ]. + ^aStream! - (charCode := aCharacter charCode) < 128 - ifTrue: [aStream basicNextPut: aCharacter] - ifFalse: [aStream basicNextPut: (Character value: (self encode: charCode))].! Item was changed: ----- Method: MultiByteFileStream>>convertStringFromCr: (in category 'crlf private') ----- convertStringFromCr: aString | inStream outStream | + + self deprecated: 'This method is obsolete and private, don''t use it!!'. lineEndConvention ifNil: [^ aString]. lineEndConvention == #cr ifTrue: [^ aString]. lineEndConvention == #lf ifTrue: [^ aString copy replaceAll: Cr with: Lf]. "lineEndConvention == #crlf" inStream := ReadStream on: aString. outStream := WriteStream on: (String new: aString size). [inStream atEnd] whileFalse: [outStream nextPutAll: (inStream upTo: Cr). (inStream atEnd not or: [aString last = Cr]) ifTrue: [outStream nextPutAll: CrLf]]. ^ outStream contents! Item was changed: ----- Method: MultiByteFileStream>>convertStringToCr: (in category 'crlf private') ----- convertStringToCr: aString | inStream outStream | + + self deprecated: 'This method is obsolete and private, don''t use it!!'. lineEndConvention ifNil: [^ aString]. lineEndConvention == #cr ifTrue: [^ aString]. lineEndConvention == #lf ifTrue: [^ aString copy replaceAll: Lf with: Cr]. "lineEndConvention == #crlf" inStream := ReadStream on: aString. outStream := WriteStream on: (String new: aString size). [inStream atEnd] whileFalse: [outStream nextPutAll: (inStream upTo: Cr). (inStream atEnd not or: [aString last = Cr]) ifTrue: [outStream nextPut: Cr. inStream peek = Lf ifTrue: [inStream next]]]. ^ outStream contents! Item was added: + ----- Method: MultiByteFileStream>>initialize (in category 'initialize-release') ----- + initialize + + super initialize. + wantsLineEndConversion := false. + self initializeConverter! Item was changed: ----- Method: MultiByteFileStream>>wantsLineEndConversion: (in category 'remnant') ----- wantsLineEndConversion: aBoolean + wantsLineEndConversion := aBoolean. + lineEndConvention ifNil: [ self detectLineEndConvention ]! - wantsLineEndConversion := aBoolean. - - lineEndConvention ifNil: [ self detectLineEndConvention ]. ! Item was changed: ----- Method: UTF8TextConverter>>nextPut:toStream: (in category 'conversion') ----- nextPut: aCharacter toStream: aStream + + | nBytes mask shift ucs2code | - | leadingChar nBytes mask shift ucs2code | aStream isBinary ifTrue: [^aCharacter storeBinaryOn: aStream]. + ucs2code := aCharacter asUnicode ifNil: [ ^aStream ]. + ucs2code < 256 ifTrue: [ + (latin1Encodings at: ucs2code + 1) + ifNil: [ aStream basicNextPut: aCharacter ] + ifNotNil: [ :encodedString | aStream basicNextPutAll: encodedString ]. + ^aStream ]. - leadingChar := aCharacter leadingChar. - (leadingChar = 0 and: [aCharacter asciiValue < 128]) ifTrue: [ - aStream basicNextPut: aCharacter. - ^ aStream. - ]. - - "leadingChar > 3 ifTrue: [^ aStream]." - - ucs2code := aCharacter asUnicode. - ucs2code ifNil: [^ aStream]. - nBytes := ucs2code highBit + 3 // 5. + mask := #[128 192 224 240 248 252 254 255] at: nBytes. - mask := #(128 192 224 240 248 252 254 255) at: nBytes. shift := nBytes - 1 * -6. aStream basicNextPut: (Character value: (ucs2code bitShift: shift) + mask). 2 to: nBytes do: [:i | shift := shift + 6. aStream basicNextPut: (Character value: ((ucs2code bitShift: shift) bitAnd: 63) + 128). ]. ^ aStream. ! Item was changed: + (PackageInfo named: 'Multilingual') postscript: '"Initialize the value of wantsLineEndConversion in all MultiByteFileStreams" + MultiByteFileStream allSubInstancesDo: [ :each | + (each instVarNamed: #wantsLineEndConversion) ifNil: [ + each instVarNamed: #wantsLineEndConversion put: false ] ]'! - (PackageInfo named: 'Multilingual') postscript: '"below, add code to be run after the loading of this package" - MultiCharacterScanner initialize'!

1 0

The Trunk: Multilingual-ul.144.mcz
by commits＠source.squeak.org 22 May '11

22 May '11

1 0

The Trunk: Multilingual-ul.144.mcz
by commits＠source.squeak.org 22 May '11

22 May '11

1 0

The Trunk: Kernel-nice.589.mcz
by commits＠source.squeak.org 19 May '11

19 May '11

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.589.mcz ==================== Summary ==================== Name: Kernel-nice.589 Author: nice Time: 19 May 2011, 2:41:37.27 am UUID: 094e80f6-660c-4e82-803e-7f4a2d5d5a5a Ancestors: Kernel-dtl.588 Optimize the way to count number of printed digits for Integer - by using iteration rather than recursion, - by providing a slightly better guess in the decimal case. Accelerate #raisedTo:modulo: because this operation is critical in cryptography. Avoid using recursive #raisedToInteger:modulo: for same speed reasons, and deprecate it. Sorry to sacrifice simplicity, hope you'll understand.. Implementation notes: #raisedTo:modulo: now uses the new montgomeryTimes primitive if present. Otherwise, it fallbacks to classical multiplication, remainder sequences. The Montgomery algorithm avoids division implied by the modulo operation and thus save a few CPU cycles (see http://en.wikipedia.org/wiki/Montgomery_reduction for an introduction). Both Montgomery and fallback version use a sliding window algorithm. It consists in exponentiating by bit packets rather than bit by bit and then save some multiplications. It is a classical CPU vs memory tradeoff. Hope the comments help if you're interested. Note that raisedTo: could also use a slidingWindow if we want to. Do we? In such case, we would have 3 most identical methods and should think of a better refactoring. =============== Diff against Kernel-dtl.588 =============== Item was changed: ----- Method: Integer>>isProbablyPrimeWithK:andQ: (in category 'private') ----- isProbablyPrimeWithK: k andQ: q "Algorithm P, probabilistic primality test, from Knuth, Donald E. 'The Art of Computer Programming', Vol 2, Third Edition, section 4.5.4, page 395, P1-P5 refer to Knuth description." "P1" | x j y | x := (self - 2) atRandom + 1. "P2" j := 0. + y := x raisedTo: q modulo: self. - y := x raisedToInteger: q modulo: self. "P3" [((j = 0 and: [y = 1]) or: [y = (self - 1)]) ifTrue: [^true]. (j > 0 and: [y = 1]) ifTrue: [^false]. "P5" j := j + 1. j < k ifTrue: [y := y squared \\ self] ifFalse:[^ false]] repeat! Item was added: + ----- Method: Integer>>montgomeryRaisedTo:times:modulo:mInvModB: (in category 'private') ----- + montgomeryRaisedTo: n times: y modulo: m mInvModB: mInv + "Private - do a Montgomery exponentiation of self modulo m. + The operation is equivalent to (self/y raisedTo: n)*y \\ m, + with y is (256 raisedTo: m digitLength), + with (m bitAnd: 255) * mInv \\ 256 = 255." + + | pow j k w index oddPowersOfSelf square | + + "Precompute powers of self for odd bit patterns xxxx1 up to length w + 1. + The width w is chosen with respect to the total bit length of n, + such that each bit pattern will on average be encoutered P times in the whole bit sequence of n. + This costs (2 raisedTo: w) multiplications, but more will be saved later (see below)." + k := n highBit. + w := (k highBit - 1 >> 1 min: 16) max: 1. + oddPowersOfSelf := Array new: 1 << w. + oddPowersOfSelf at: 1 put: (pow := self). + square := self montgomeryTimes: self modulo: m mInvModB: mInv. + 2 to: oddPowersOfSelf size do: [:i | pow := oddPowersOfSelf at: i put: (pow montgomeryTimes: square modulo: m mInvModB: mInv)]. + + "Now exponentiate by searching precomputed bit patterns with a sliding window" + pow := y. + [k > 0] + whileTrue: + [pow := pow montgomeryTimes: pow modulo: m mInvModB: mInv. + "Skip bits set to zero (the sliding window)" + (n bitAt: k) = 0 + ifFalse: + ["Find longest odd bit pattern up to window length (w + 1)" + j := k - w max: 1. + [j < k and: [(n bitAt: j) = 0]] whileTrue: [j := j + 1]. + "We found a bit pattern of length k-j+1; + perform the square powers for each bit + (same cost as bitwise algorithm); + compute the index of this bit pattern in the precomputed powers." + index := 0. + [k > j] whileTrue: + [pow := pow montgomeryTimes: pow modulo: m mInvModB: mInv. + index := index << 1 + (n bitAt: k). + k := k - 1]. + "Perform a single multiplication for the whole bit pattern. + This saves up to (k-j) multiplications versus a naive algorithm operating bit by bit" + pow := pow montgomeryTimes: (oddPowersOfSelf at: index + 1) modulo: m mInvModB: mInv]. + k := k - 1]. + ^pow! Item was added: + ----- Method: Integer>>montgomeryTimes:modulo:mInvModB: (in category 'private') ----- + montgomeryTimes: a modulo: m mInvModB: mInv + "Answer the result of a Montgomery multiplication + self * a * (256 raisedTo: m digitLength) inv \\ m + NOTE: it is assumed that: + self digitLength <= m digitLength + a digitLength <= m digitLength + mInv * m \\ 256 = (-1 \\ 256) = 255 (this implies m odd) + + Answer nil in case of absent plugin or other failure." + + <primitive: 'primMontgomeryTimesModulo' module:'LargeIntegers'> + ^nil! Item was changed: ----- Method: Integer>>numberOfDigitsInBase: (in category 'printing') ----- numberOfDigitsInBase: b "Return how many digits are necessary to print this number in base b. This does not count any place for minus sign, radix prefix or whatever. Note that this algorithm may cost a few operations on LargeInteger." + | nDigits q total | - | nDigits q | self negative ifTrue: [^self negated numberOfDigitsInBase: b]. self < b ifTrue: [^1]. + b isPowerOfTwo ifTrue: [^self highBit + b highBit - 2 quo: b highBit - 1]. - b isPowerOfTwo ifTrue: [^self highBit + b highBit - 2 quo: b highBit - 1]. "A conversion from base 2 to base b has to be performed. This algorithm avoids Float computations like (self log: b) floor + 1, 1) because they are inexact 2) because LargeInteger might overflow 3) because this algorithm might be cheaper than conversion" + q := self. + total := 0. + ["Make an initial nDigits guess that is lower than or equal to required number of digits" + nDigits := b = 10 + ifTrue: [((q highBit - 1) * 1233 >> 12) + 1. "This is because (2 log)/(10 log)*4096 is slightly greater than 1233"] + ifFalse: [q highBit quo: b highBit]. + total := total + nDigits. + - "Make an initial nDigits guess that is lower than or equal to required number of digits" - b = 10 - ifTrue: [nDigits := ((self highBit - 1) * 3 quo: 10) + 1. "This is because 1024 is a little more than a kilo"] - ifFalse: [nDigits := self highBit quo: b highBit]. - "See how many digits remains above these first nDigits guess" + (q := q quo: (b raisedTo: nDigits)) < b] whileFalse. - q := self quo: (b raisedTo: nDigits). ^q = 0 + ifTrue: [total] + ifFalse: [total + 1]! - ifTrue: [nDigits] - ifFalse: [nDigits + (q numberOfDigitsInBase: b)]! Item was changed: ----- Method: Integer>>raisedTo:modulo: (in category 'mathematical functions') ----- + raisedTo: n modulo: m + "Answer the modular exponential. + Note: this implementation is optimized for case of large integers raised to large powers." + | a s mInv | + n = 0 ifTrue: [^1]. + (self >= m or: [self < 0]) ifTrue: [^self \\ m raisedTo: n modulo: m]. + n < 0 ifTrue: [^(self reciprocalModulo: m) raisedTo: n negated modulo: m]. + (n < 4096 or: [m even]) + ifTrue: + ["Overhead of Montgomery method might cost more than naive divisions, use naive" + ^self slidingLeftRightRaisedTo: n modulo: m]. + + mInv := 256 - ((m bitAnd: 255) reciprocalModulo: 256). + + "Initialize the result to R=256 raisedTo: m digitLength" + a := (1 bitShift: m digitLength*8) \\ m. + + "Montgomerize self (multiply by R)" + (s := self montgomeryTimes: (a*a \\ m) modulo: m mInvModB: mInv) + ifNil: + ["No Montgomery primitive available ? fallback to naive divisions" + ^self slidingLeftRightRaisedTo: n modulo: m]. + + "Exponentiate self*R" + a := s montgomeryRaisedTo: n times: a modulo: m mInvModB: mInv. + + "Demontgomerize the result (divide by R)" + ^a montgomeryTimes: 1 modulo: m mInvModB: mInv! - raisedTo: y modulo: n - "Answer the modular exponential. Code by Jesse Welton." - | s t u | - s := 1. - t := self. - u := y. - [u = 0] whileFalse: [ - u odd ifTrue: [ - s := s * t. - s >= n ifTrue: [s := s \\\ n]]. - t := t * t. - t >= n ifTrue: [t := t \\\ n]. - u := u bitShift: -1]. - ^ s - ! Item was changed: ----- Method: Integer>>raisedToInteger:modulo: (in category 'mathematical functions') ----- raisedToInteger: exp modulo: m + self deprecated: 'rather use #raisedTo:modulo: for efficiency'. (exp = 0) ifTrue: [^ 1]. exp even ifTrue: [^ (self raisedToInteger: (exp // 2) modulo: m) squared \\ m] ifFalse: [^ (self * (self raisedToInteger: (exp - 1) modulo: m)) \\ m].! Item was added: + ----- Method: Integer>>slidingLeftRightRaisedTo:modulo: (in category 'private') ----- + slidingLeftRightRaisedTo: n modulo: m + "Private - compute (self raisedTo: n) \\ m, + Note: this method has to be fast because it is generally used with large integers in cryptography. + It thus operate on exponent bits from left to right by packets with a sliding window rather than bit by bit (see below)." + + | pow j k w index oddPowersOfSelf square | + + "Precompute powers of self for odd bit patterns xxxx1 up to length w + 1. + The width w is chosen with respect to the total bit length of n, + such that each bit pattern will on average be encoutered P times in the whole bit sequence of n. + This costs (2 raisedTo: w) multiplications, but more will be saved later (see below)." + k := n highBit. + w := (k highBit - 1 >> 1 min: 16) max: 1. + oddPowersOfSelf := Array new: 1 << w. + oddPowersOfSelf at: 1 put: (pow := self). + square := self * self \\\ m. + 2 to: oddPowersOfSelf size do: [:i | pow := oddPowersOfSelf at: i put: pow * square \\\ m]. + + "Now exponentiate by searching precomputed bit patterns with a sliding window" + pow := 1. + [k > 0] + whileTrue: + [pow := pow * pow \\\ m. + "Skip bits set to zero (the sliding window)" + (n bitAt: k) = 0 + ifFalse: + ["Find longest odd bit pattern up to window length (w + 1)" + j := k - w max: 1. + [j < k and: [(n bitAt: j) = 0]] whileTrue: [j := j + 1]. + "We found an odd bit pattern of length k-j+1; + perform the square powers for each bit + (same cost as bitwise algorithm); + compute the index of this bit pattern in the precomputed powers." + index := 0. + [k > j] whileTrue: + [pow := pow * pow \\\ m. + index := index << 1 + (n bitAt: k). + k := k - 1]. + "Perform a single multiplication for the whole bit pattern. + This saves up to (k-j) multiplications versus a naive algorithm operating bit by bit" + pow := pow * (oddPowersOfSelf at: index + 1) \\\ m]. + k := k - 1]. + ^pow normalize!

1 0

The Trunk: Kernel-nice.589.mcz
by commits＠source.squeak.org 19 May '11

19 May '11

1 0

The Trunk: Kernel-nice.589.mcz
by commits＠source.squeak.org 19 May '11

19 May '11

1 0

The Trunk: MultilingualTests-ul.15.mcz
by commits＠source.squeak.org 17 May '11

17 May '11

Levente Uzonyi uploaded a new version of MultilingualTests to project The Trunk: http://source.squeak.org/trunk/MultilingualTests-ul.15.mcz ==================== Summary ==================== Name: MultilingualTests-ul.15 Author: ul Time: 17 May 2011, 5:13:59.587 pm UUID: 1d0bc7c1-c0c2-5348-b023-7658526d160f Ancestors: MultilingualTests-ul.14 A few tests for http://bugs.squeak.org/view.php?id=7602 . =============== Diff against MultilingualTests-ul.14 =============== Item was changed: + ----- Method: MultiByteFileStreamTest>>tearDown (in category 'running') ----- - ----- Method: MultiByteFileStreamTest>>tearDown (in category 'as yet unclassified') ----- tearDown fileName ifNotNil: [ FileDirectory default deleteFileNamed: fileName ]! Item was added: + ----- Method: MultiByteFileStreamTest>>testLineEndConvention:withConverter:ifFail: (in category 'helpers') ----- + testLineEndConvention: lineEndConvention withConverter: textConverterClass ifFail: failBlock + + | expectedResult result | + [ + MultiByteFileStream forceNewFileNamed: fileName do: [ :file | + file + converter: textConverterClass new; + lineEndConvention: lineEndConvention; + cr; + nextPut: Character cr; + nextPutAll: String cr; + nextPutAll: String cr asWideString ]. + result := StandardFileStream oldFileNamed: fileName do: [ :file | + file contents ]. + expectedResult := String streamContents: [ :stream | + 4 timesRepeat: [ stream perform: lineEndConvention ] ]. + result = expectedResult ifFalse: [ + failBlock value: expectedResult asByteArray value: result asByteArray ] ] + on: Error + do: [ :err | failBlock value: err messageText value: err messageText ]! Item was added: + ----- Method: MultiByteFileStreamTest>>testLineEndConversion (in category 'testing') ----- + testLineEndConversion + + | failures | + fileName := 'foolinendconversion.txt'. + failures := OrderedCollection new. + TextConverter allSubclassesDo: [ :textConverterClass | + textConverterClass encodingNames ifNotEmpty: [ + #(cr lf crlf) do: [ :lineEndConvention | + self + testLineEndConvention: lineEndConvention + withConverter: textConverterClass + ifFail: [ :expectedResult :result | + failures add: { + textConverterClass. + lineEndConvention. + expectedResult. + result } ] ] ] ]. + self assert: failures isEmpty! Item was added: + ----- Method: MultiByteFileStreamTest>>testLineEndingWithWideStrings (in category 'testing') ----- + testLineEndingWithWideStrings + + | cr lf crlf | + fileName := 'foolinend.txt'. + cr := String cr asWideString. + lf := String lf asWideString. + crlf := String crlf asWideString. + MultiByteFileStream forceNewFileNamed: fileName do: [ :file | + file + wantsLineEndConversion: false; + nextPutAll: 'line 1'; nextPutAll: cr; + nextPutAll: 'line 2'; nextPutAll: crlf; + nextPutAll: 'line 3'; nextPutAll: lf; + nextPutAll: 'line 4' ]. + { + {#cr. 'line 1' , String cr , 'line 2' , String cr , 'line 3' , String cr , 'line 4'}. + {#lf. 'line 1' , String cr , 'line 2' , String cr , 'line 3' , String cr , 'line 4'}. + {#crlf. 'line 1' , String cr , 'line 2' , String cr , 'line 3' , String cr , 'line 4'}. + {nil. 'line 1' , String cr , 'line 2' , String crlf , 'line 3' , String lf , 'line 4'} + } do: [ :lineEndingResult | + MultiByteFileStream oldFileNamed: fileName do: [ :file | + file lineEndConvention: lineEndingResult first. + self assert: file upToEnd = lineEndingResult last ] ]! Item was changed: ----- Method: MultiByteFileStreamTest>>testNextLine (in category 'testing') ----- testNextLine + fileName := 'foonextline.txt'. - fileName := 'foobackchunk.txt'. MultiByteFileStream forceNewFileNamed: fileName do: [ :file | file wantsLineEndConversion: false; nextPutAll: 'line 1'; cr; nextPutAll: 'line 2'; crlf; nextPutAll: 'line 3'; lf; nextPutAll: 'line 4' ]. #(cr lf crlf nil) do: [:lineEnding | MultiByteFileStream oldFileNamed: fileName do: [ :file | file lineEndConvention: lineEnding. self assert: file nextLine = 'line 1'; assert: file nextLine = 'line 2'; assert: file nextLine = 'line 3'; assert: file nextLine = 'line 4'; assert: file nextLine = nil ] ]!

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages May 2011