Skip to content

Commit

Permalink
revert commit 9a71781 (see #14 (comment))
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbrichau
jbrichau committed Jun 9, 2023
1 parent cfca715 commit 67db0da
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions ...Multilingual-TextConversion.package/UTF8TextConverter.class/instance/nextPut.toStream..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ nextPut: aCharacter toStream: aStream
ucs2code := aCharacter asUnicode.
ucs2code ifNil: [^ aStream].

highBitOffset := 1. "#highBit 1-indexed on Pharo, but 0-indexed on GemStone"
nBytes := ucs2code highBit + highBitOffset + 3 // 5.
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).
Expand Down
2 changes: 1 addition & 1 deletion repository/Multilingual-TextConversion.package/UTF8TextConverter.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"errorMalformedInput" : "ar 4/6/2006 10:15",
"leadingChar" : "yo 11/8/2002 16:17",
"nextFromStream:" : "GabrielOmarCotelli 5/25/2010 21:22",
"nextPut:toStream:" : "KrisGybels 11/06/2019 11:26" } }
"nextPut:toStream:" : "JohanBrichau 06/09/2023 07:48" } }
2 changes: 1 addition & 1 deletion repository/Multilingual-TextConversion.package/monticello.meta/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Multilingual-TextConversion-JohanBrichau.24' message 'Fixed use of #highBit in UTF8TextConverter>>#nextPut:toStream: to take into account that this is 1-indexed on Pharo but 0-indexed on GemStone; added class Unicode (with method Unicode class>>#value:) used in UTF8TextConverter>>#nextFromStream:.' id '8224a1b8-2e5f-48ec-8e46-9415cba31682' date '06/08/2023' time '19:03:38' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-JohanBrichau.23' message 'Fixed use of #highBit in UTF8TextConverter>>#nextPut:toStream: to take into account that this is 1-indexed on Pharo but 0-indexed on GemStone; added class Unicode (with method Unicode class>>#value:) used in UTF8TextConverter>>#nextFromStream:.' id '0c991eee-5401-4f83-90fc-c9276b83badc' date '06/08/2023' time '19:01:45' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-dkh.22' message 'Issue #140: fix SBNI issue ... method not used' id '62ff0b8f-41e2-4fe8-9e74-b5507ebf1011' date '05/22/2023' time '19:47:14' author 'dkh' ancestors ((name 'Multilingual-TextConversion-dkh.21' message 'GsDevKit/GsDevKit#140: take care of a couple of sources of sent but not implemented messages, that did not actually affect the test results (green)' id 'ed2376bd-6061-4381-930f-2632da98eadf' date '05/17/2023' time '18:18:09' author 'dkh' ancestors ((name 'Multilingual-TextConversion-dkh.20' message 'GsDevKit/GsDevKit#140: port to GemStone 3.7.0; clean up some long standing collections with glass' id '7b84168f-c8dc-4833-a74f-a529e84f7ac7' date '05/17/2023' time '17:23:39' author 'dkh' ancestors ((name 'Multilingual-TextConversion-JohanBrichau.19' message 'Fix UTF8TextConverter' id '4a64f575-68c9-489d-b891-44c9eeb0c442' date '04/16/2021' time '14:05:51' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-MarianoMartinezPeck.18' message '#reset should use instVar ''itsCollection'' not the none-existing ''collection''' id '2c189859-34cc-4f48-a4c1-a3a2bf756971' date '11/21/2013' time '12:52:21' author 'MarianoMartinezPeck' ancestors ((name 'Multilingual-TextConversion-KrisGybels.17' message 'Added TextConverter class>>defaultConverterClassForEncoding:' id 'bc4d90b3-52f3-4a1d-b026-efaf4cd66776' date '07/17/2013' time '15:24:08' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-JohanBrichau.16' message 'fix position vs positionA bug in method overwrite' id 'f82e8022-eacd-4371-b361-e55de6b4c8b2' date '03/09/2013' time '08:09:58' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-KrisGybels.15' message 'Moved up extension methods on String to CharacterCollection.' id 'b9a4adfc-2059-459e-b8bf-adeb6a25bb98' date '02/28/1913' time '11:36:46' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.14' message 'Added Latin1TextConverter and KOI8RTextConverter.' id '7303ccfe-be6e-4903-97a4-525662e52e19' date '02/21/1913' time '16:43:58' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.13' message 'Added ISO885915TextConverter and ISO88597TextConverter.' id 'be3c4ccf-c35f-4fa4-b784-60d985a9381d' date '02/21/1913' time '16:39:35' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.12' message 'Added CP1250TextConverter and CP1253TextConverter.' id '43db5614-75ea-47fd-b809-9093bd5273d0' date '02/21/1913' time '16:36:08' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.11' message 'Changed uses of Unicode class>>value: in UTF16TextConverter>>charFromStream:withFirst: to use Character class>>codePoint: instead. (Makes UTF16TextConverterTest>>testByteOrders work.)' id '0bbd1046-fdcc-4a53-a2b0-b3af3256f789' date '02/21/1913' time '16:12:25' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.10' message 'Added missing ''latin1Map'' and ''latin1Encodings'' instance and class instance variables to TextConverter; and necessary initialization methods. (Makes UTF16TextConverterTest>>testBOMWrite work).' id '44afc389-f3b7-4e4d-9b29-5f9ef2f186a3' date '02/21/1913' time '16:07:38' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.9' message 'Fixed compatibility problem in UTF16TextConverter>>checkBOMOn: due to "String new writeStream position" being 0 in Pharo but 1 in GemStone.' id '5cf06130-0c1c-4663-8ae3-bb982ea18fb2' date '02/21/1913' time '15:56:59' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.8' message 'Added Integer>>asByteArray. (Makes UTF16TextConverterTest>>testNoBOMWriteInMiddleOfFile work).' id 'db263e1c-cb2e-4f7c-9929-db9b6eceb418' date '02/21/1913' time '15:54:22' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.7' message 'Added UTF16TextConverter (+ fixed parse error in nextFromStream: method due to double statement separator).' id '763cd4fd-2022-41d9-8adb-0161f48979ee' date '02/21/1913' time '15:51:00' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.6' message '- Added UTF8TextConverter.- Added Character>>storeBinaryOn: as needed for UTF8TextConverter.' id 'c1e46006-6534-4083-8860-ba065cbf4a85' date '02/21/1913' time '13:44:34' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.5' message '- Added ISO88592TextConverter.- Added MultiByteBinaryOrTextStream and (extension) methods necessary to make the other two tests (besides testConversionToFrom) in ByteTextConverterTest work.' id 'b2339a37-a513-4003-a82f-c74151d25c84' date '02/21/1913' time '12:32:50' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.4' message '- Removed optimization code for ByteString from TextConverter>>nextPutAll:toStream:- Added additional (extension) methods as needed to get ByteTextConverterTest>>testConversionToFrom to work.' id '89375b60-e9a3-4859-a986-7bf4fa0a63d8' date '02/21/1913' time '11:24:37' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.3' message 'Added String extension methods for converting to / from encoding.' id 'c3e0edd2-5bca-4498-bc01-f1e16b30e4b6' date '02/21/1913' time '11:09:41' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.2' message 'Added MacRomanTextConverter.' id '89faf36e-850e-41dd-8de0-b2a912d7cc82' date '02/21/1913' time '11:02:41' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-ThomasCleenewerck.1' message 'initial partial port of the pharo packageonly support for GRXXXConverterCodecStream' id '9443015f-af83-42ce-a12f-0e7489cc4d9e' date '11/16/1912' time '23:06:00' author 'ThomasCleenewerck' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(id 'bc4d90b3-52f3-4a1d-b026-efaf4cd66776')) stepChildren ())) stepChildren ())
(name 'Multilingual-TextConversion-JohanBrichau.26' message 'revert change (see https://github.com/GsDevKit/PharoCompatibility/pull/14#issuecomment-1583460007)' id '10cacb56-32ae-495a-85e2-2ff992ff915c' date '06/09/2023' time '07:54:26' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-JohanBrichau.25' message 'revert change' id '5b630afd-5bdb-4bb4-9d47-e89476f411c3' date '06/09/2023' time '07:50:17' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-JohanBrichau.24' message 'Fixed use of #highBit in UTF8TextConverter>>#nextPut:toStream: to take into account that this is 1-indexed on Pharo but 0-indexed on GemStone; added class Unicode (with method Unicode class>>#value:) used in UTF8TextConverter>>#nextFromStream:.' id '8224a1b8-2e5f-48ec-8e46-9415cba31682' date '06/08/2023' time '19:03:38' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-JohanBrichau.23' message 'Fixed use of #highBit in UTF8TextConverter>>#nextPut:toStream: to take into account that this is 1-indexed on Pharo but 0-indexed on GemStone; added class Unicode (with method Unicode class>>#value:) used in UTF8TextConverter>>#nextFromStream:.' id '0c991eee-5401-4f83-90fc-c9276b83badc' date '06/08/2023' time '19:01:45' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-dkh.22' message 'Issue #140: fix SBNI issue ... method not used' id '62ff0b8f-41e2-4fe8-9e74-b5507ebf1011' date '05/22/2023' time '19:47:14' author 'dkh' ancestors ((name 'Multilingual-TextConversion-dkh.21' message 'GsDevKit/GsDevKit#140: take care of a couple of sources of sent but not implemented messages, that did not actually affect the test results (green)' id 'ed2376bd-6061-4381-930f-2632da98eadf' date '05/17/2023' time '18:18:09' author 'dkh' ancestors ((name 'Multilingual-TextConversion-dkh.20' message 'GsDevKit/GsDevKit#140: port to GemStone 3.7.0; clean up some long standing collections with glass' id '7b84168f-c8dc-4833-a74f-a529e84f7ac7' date '05/17/2023' time '17:23:39' author 'dkh' ancestors ((name 'Multilingual-TextConversion-JohanBrichau.19' message 'Fix UTF8TextConverter' id '4a64f575-68c9-489d-b891-44c9eeb0c442' date '04/16/2021' time '14:05:51' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-MarianoMartinezPeck.18' message '#reset should use instVar ''itsCollection'' not the none-existing ''collection''' id '2c189859-34cc-4f48-a4c1-a3a2bf756971' date '11/21/2013' time '12:52:21' author 'MarianoMartinezPeck' ancestors ((name 'Multilingual-TextConversion-KrisGybels.17' message 'Added TextConverter class>>defaultConverterClassForEncoding:' id 'bc4d90b3-52f3-4a1d-b026-efaf4cd66776' date '07/17/2013' time '15:24:08' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-JohanBrichau.16' message 'fix position vs positionA bug in method overwrite' id 'f82e8022-eacd-4371-b361-e55de6b4c8b2' date '03/09/2013' time '08:09:58' author 'JohanBrichau' ancestors ((name 'Multilingual-TextConversion-KrisGybels.15' message 'Moved up extension methods on String to CharacterCollection.' id 'b9a4adfc-2059-459e-b8bf-adeb6a25bb98' date '02/28/1913' time '11:36:46' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.14' message 'Added Latin1TextConverter and KOI8RTextConverter.' id '7303ccfe-be6e-4903-97a4-525662e52e19' date '02/21/1913' time '16:43:58' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.13' message 'Added ISO885915TextConverter and ISO88597TextConverter.' id 'be3c4ccf-c35f-4fa4-b784-60d985a9381d' date '02/21/1913' time '16:39:35' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.12' message 'Added CP1250TextConverter and CP1253TextConverter.' id '43db5614-75ea-47fd-b809-9093bd5273d0' date '02/21/1913' time '16:36:08' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.11' message 'Changed uses of Unicode class>>value: in UTF16TextConverter>>charFromStream:withFirst: to use Character class>>codePoint: instead. (Makes UTF16TextConverterTest>>testByteOrders work.)' id '0bbd1046-fdcc-4a53-a2b0-b3af3256f789' date '02/21/1913' time '16:12:25' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.10' message 'Added missing ''latin1Map'' and ''latin1Encodings'' instance and class instance variables to TextConverter; and necessary initialization methods. (Makes UTF16TextConverterTest>>testBOMWrite work).' id '44afc389-f3b7-4e4d-9b29-5f9ef2f186a3' date '02/21/1913' time '16:07:38' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.9' message 'Fixed compatibility problem in UTF16TextConverter>>checkBOMOn: due to "String new writeStream position" being 0 in Pharo but 1 in GemStone.' id '5cf06130-0c1c-4663-8ae3-bb982ea18fb2' date '02/21/1913' time '15:56:59' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.8' message 'Added Integer>>asByteArray. (Makes UTF16TextConverterTest>>testNoBOMWriteInMiddleOfFile work).' id 'db263e1c-cb2e-4f7c-9929-db9b6eceb418' date '02/21/1913' time '15:54:22' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.7' message 'Added UTF16TextConverter (+ fixed parse error in nextFromStream: method due to double statement separator).' id '763cd4fd-2022-41d9-8adb-0161f48979ee' date '02/21/1913' time '15:51:00' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.6' message '- Added UTF8TextConverter.- Added Character>>storeBinaryOn: as needed for UTF8TextConverter.' id 'c1e46006-6534-4083-8860-ba065cbf4a85' date '02/21/1913' time '13:44:34' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.5' message '- Added ISO88592TextConverter.- Added MultiByteBinaryOrTextStream and (extension) methods necessary to make the other two tests (besides testConversionToFrom) in ByteTextConverterTest work.' id 'b2339a37-a513-4003-a82f-c74151d25c84' date '02/21/1913' time '12:32:50' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.4' message '- Removed optimization code for ByteString from TextConverter>>nextPutAll:toStream:- Added additional (extension) methods as needed to get ByteTextConverterTest>>testConversionToFrom to work.' id '89375b60-e9a3-4859-a986-7bf4fa0a63d8' date '02/21/1913' time '11:24:37' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.3' message 'Added String extension methods for converting to / from encoding.' id 'c3e0edd2-5bca-4498-bc01-f1e16b30e4b6' date '02/21/1913' time '11:09:41' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-KrisGybels.2' message 'Added MacRomanTextConverter.' id '89faf36e-850e-41dd-8de0-b2a912d7cc82' date '02/21/1913' time '11:02:41' author 'KrisGybels' ancestors ((name 'Multilingual-TextConversion-ThomasCleenewerck.1' message 'initial partial port of the pharo packageonly support for GRXXXConverterCodecStream' id '9443015f-af83-42ce-a12f-0e7489cc4d9e' date '11/16/1912' time '23:06:00' author 'ThomasCleenewerck' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(id 'bc4d90b3-52f3-4a1d-b026-efaf4cd66776')) stepChildren ())) stepChildren ())) stepChildren ())(id '8224a1b8-2e5f-48ec-8e46-9415cba31682')) stepChildren ())
Expand Down

0 comments on commit 67db0da

Please sign in to comment.