hg/stx-libbasic: comparison CharacterEncoderImplementations__ISO10646_to

equal deleted inserted replaced

-:1f113cce940e
+:37d697b9bf8d
-"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 2004 by eXept Software AG
 	      All Rights Reserved
 This software is furnished under a license and may be used
 Decoding (utf8 to unicode):
 |t|
-t := ISO10646_to_UTF8 encodeString:'Hello'.
+t := ISO10646_to_UTF8 encodeString:'Hello�'.
 ISO10646_to_UTF8 decodeString:t.
 "
 ! !
 !ISO10646_to_UTF8 class methodsFor:'instance creation'!
 not for being used inside ST/X.
 If you work a lot with utf8 encoded textFiles,
 this is a first-class candidate for a primitive."
-|s|
+|s
+stringSize "{ Class: SmallInteger }"|
 "/ avoid creation of new strings if possible
 aUnicodeString containsNon7BitAscii ifFalse:[
 ^ aUnicodeString asSingleByteString
 ].
-s := WriteStream on:(String uninitializedNew:(aUnicodeString size * 3 // 2)).
+stringSize := aUnicodeString size.
-aUnicodeString do:[:eachCharacter |
+s := WriteStream on:(String uninitializedNew:(stringSize * 3 // 2)).
-|codePoint "{Class: SmallInteger }" b1 b2 b3 b4 b5 v "{Class: SmallInteger }"|
+1 to:stringSize do:[:idx |
+|character codePoint "{Class: SmallInteger }" b1 b2 b3 b4 b5 v "{Class: SmallInteger }"|
-codePoint := eachCharacter codePoint.
+character := aUnicodeString at:idx.
+codePoint := character codePoint.
 codePoint <= 16r7F ifTrue:[
-s nextPut:eachCharacter.
+s nextPut:character.
 ] ifFalse:[
 b1 := Character value:((codePoint bitAnd:16r3F) bitOr:2r10000000).
 v := codePoint bitShift:-6.
 v <= 16r1F ifTrue:[
 s nextPut:(Character value:(v bitOr:2r11000000)).
 v <= 16r01 ifTrue:[
 s nextPut:(Character value:(v bitOr:2r11111100)).
 s nextPut:b5; nextPut:b4; nextPut:b3; nextPut:b2; nextPut:b1.
 ] ifFalse:[
 "/ cannot happen - we only support up to 30 bit characters
-EncodingError raiseWith:eachCharacter errorString:'codePoint > 31bit in #utf8Encode'.
+EncodingError raiseWith:character errorString:'codePoint > 31bit in #utf8Encode'.
 ]
 ].
 ].
 ].
 ].

changeset 18625	37d697b9bf8d
parent 18604	54caf7b64994
child 18630	a74d669db937
child 19838	a6ca726d596c