From 2ba142cc1de62cbb2087a80ea60a8f4fe1bcbc17 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Mon, 24 Jan 2022 20:41:35 +0100 Subject: [PATCH 1/3] pharo10: - removed codecs and texts based on TextConverter or LanguageEnvironment (deprecated in pharo 9) - changes sends of tempAt: by namedTempAt: --- .../README.md | 0 .../class/basicForEncoding..st | 3 -- .../class/codecs.st | 5 --- .../class/supportsEncoding..st | 3 -- .../instance/decode..st | 36 ------------------- .../instance/decoderFor..st | 5 --- .../instance/encodedStringClass.st | 3 -- .../instance/encoderFor..st | 5 --- .../instance/invalidUtf8.st | 3 -- .../instance/name.st | 3 -- .../instance/url.st | 3 -- .../properties.json | 11 ------ .../GRPharoGenericCodec.class/README.md | 0 .../class/basicForEncoding..st | 5 --- .../GRPharoGenericCodec.class/class/codecs.st | 8 ----- .../class/supportedEncodingNames.st | 8 ----- .../class/supportsEncoding..st | 4 --- .../instance/converter.st | 3 -- .../instance/decoderFor..st | 3 -- .../instance/encoderFor..st | 5 --- .../instance/initializeWithName..st | 7 ---- .../instance/name.st | 3 -- .../GRPharoGenericCodec.class/instance/url.st | 5 --- .../GRPharoGenericCodec.class/properties.json | 14 -------- .../setutf8CodectoDeprecatedTextConverter.st | 4 --- .../instance/setutf8CodectoZinc.st | 4 --- .../instance/utf8CodecClass.st | 8 ----- .../GRPharoPlatform.class/properties.json | 4 +-- .../GRPharoUtf8Codec.class/class/codecs.st | 4 +-- .../class/supportsEncoding..st | 2 +- .../instance/testThisContext.st | 6 ++-- .../instance/testLanguageTag.st | 21 ----------- .../instance/testGreaseIntegerOnCharacter.st | 9 +---- 33 files changed, 7 insertions(+), 200 deletions(-) delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/README.md delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/basicForEncoding..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/codecs.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/supportsEncoding..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/decode..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/decoderFor..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/encodedStringClass.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/encoderFor..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/invalidUtf8.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/name.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/url.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/properties.json delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/README.md delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/basicForEncoding..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/codecs.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/supportsEncoding..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/converter.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/decoderFor..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/encoderFor..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/initializeWithName..st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/name.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/url.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/properties.json delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/setutf8CodectoDeprecatedTextConverter.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/setutf8CodectoZinc.st delete mode 100644 repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/utf8CodecClass.st delete mode 100644 repository/Grease-Tests-Pharo-Core.package/GRPharoCodecTest.class/instance/testLanguageTag.st diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/README.md b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/README.md deleted file mode 100644 index e69de29b..00000000 diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/basicForEncoding..st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/basicForEncoding..st deleted file mode 100644 index d4c4a74b..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/basicForEncoding..st +++ /dev/null @@ -1,3 +0,0 @@ -private -basicForEncoding: aString - ^ self new \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/codecs.st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/codecs.st deleted file mode 100644 index 6e52e620..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/codecs.st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -codecs - ^ GRPlatform current utf8CodecClass == self - ifTrue:[ Array with: self new ] - ifFalse: [ Array new ] \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/supportsEncoding..st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/supportsEncoding..st deleted file mode 100644 index cf74d916..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/class/supportsEncoding..st +++ /dev/null @@ -1,3 +0,0 @@ -testing -supportsEncoding: aString - ^ GRPlatform current utf8CodecClass == self and: [(#('utf-8' 'UTF-8') includes: aString) or: [ UTF8TextConverter encodingNames includes: aString ] ] \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/decode..st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/decode..st deleted file mode 100644 index 60eea74c..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/decode..st +++ /dev/null @@ -1,36 +0,0 @@ -convenience -decode: aString - "Convert the given string from UTF-8 using the fast path if converting to Latin-1" - | outStream byte1 byte2 byte3 byte4 unicode stream | - stream := aString readStream. - outStream := WriteStream on: (String new: aString size). - [ stream atEnd not ] whileTrue: [ - byte1 := stream next asInteger. - unicode := byte1. - (byte1 bitAnd: 16rE0) = 192 ifTrue: [ "two bytes" - byte2 := stream next asInteger. - (byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. - unicode := ((byte1 bitAnd: 31) bitShift: 6) + (byte2 bitAnd: 63) ]. - (byte1 bitAnd: 16rF0) = 224 ifTrue: [ "three bytes" - byte2 := stream next asInteger. - (byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. - byte3 := stream next asInteger. - (byte3 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. - unicode := ((byte1 bitAnd: 15) bitShift: 12) + ((byte2 bitAnd: 63) bitShift: 6) - + (byte3 bitAnd: 63) ]. - (byte1 bitAnd: 16rF8) = 240 ifTrue: [ "four bytes" - byte2 := stream next asInteger. - (byte2 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. - byte3 := stream next asInteger. - (byte3 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. - byte4 := stream next asInteger. - (byte4 bitAnd: 16rC0) = 16r80 ifFalse: [ self invalidUtf8 ]. - unicode := ((byte1 bitAnd: 16r7) bitShift: 18) + - ((byte2 bitAnd: 63) bitShift: 12) + - ((byte3 bitAnd: 63) bitShift: 6) + - (byte4 bitAnd: 63) ]. - unicode ifNil: [ self invalidUtf8 ]. - unicode = 16rFEFF "ignore BOM" ifFalse: [ - outStream nextPut: (Character codePoint: unicode) ]. - unicode := nil ]. - ^ outStream contents \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/decoderFor..st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/decoderFor..st deleted file mode 100644 index 9a221440..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/decoderFor..st +++ /dev/null @@ -1,5 +0,0 @@ -convenience -decoderFor: aStream - ^ GRPharoDeprecatedUtf8CodecStream - on: aStream - converter: UTF8TextConverter new \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/encodedStringClass.st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/encodedStringClass.st deleted file mode 100644 index 97aca951..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/encodedStringClass.st +++ /dev/null @@ -1,3 +0,0 @@ -conversion -encodedStringClass - ^ String \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/encoderFor..st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/encoderFor..st deleted file mode 100644 index ad1614eb..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/encoderFor..st +++ /dev/null @@ -1,5 +0,0 @@ -convenience -encoderFor: aStream - ^ GRPharoDeprecatedUtf8CodecStream - on: aStream - converter: UTF8TextConverter new \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/invalidUtf8.st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/invalidUtf8.st deleted file mode 100644 index bf9b0111..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/invalidUtf8.st +++ /dev/null @@ -1,3 +0,0 @@ -convenience -invalidUtf8 - ^ GRInvalidUtf8Error signal: 'Invalid UTF-8 input' \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/name.st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/name.st deleted file mode 100644 index 7886c830..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/name.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -name - ^ 'utf-8' \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/url.st b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/url.st deleted file mode 100644 index 4696d714..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/instance/url.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -url - ^ self \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/properties.json b/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/properties.json deleted file mode 100644 index 7fbb2356..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoDeprecatedUtf8Codec.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "", - "super" : "GRCodec", - "category" : "Grease-Pharo10-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "GRPharoDeprecatedUtf8Codec", - "type" : "normal" -} \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/README.md b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/README.md deleted file mode 100644 index e69de29b..00000000 diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/basicForEncoding..st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/basicForEncoding..st deleted file mode 100644 index f6b18bd4..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/basicForEncoding..st +++ /dev/null @@ -1,5 +0,0 @@ -private -basicForEncoding: aString - (self supportsEncoding: aString) - ifFalse: [ self unsupportedEncoding: aString ]. - ^ self basicNew initializeWithName: aString \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/codecs.st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/codecs.st deleted file mode 100644 index f1293d05..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/codecs.st +++ /dev/null @@ -1,8 +0,0 @@ -accessing -codecs - ^ (TextConverter allEncodingNames - select: [ :each | - "exclude UFT-8 which is handeled by WAUtf8Codec" - self supportsEncoding: each ]) - collect: [ :each | - self basicForEncoding: each greaseString ] \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st deleted file mode 100644 index d1c6d00b..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st +++ /dev/null @@ -1,8 +0,0 @@ -private -supportedEncodingNames - "answers the names of the encodings supported by this class" - - ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asSet asOrderedCollection - removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; - removeAllFoundIn: UTF8TextConverter encodingNames; - yourself \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/supportsEncoding..st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/supportsEncoding..st deleted file mode 100644 index 43a27325..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/class/supportsEncoding..st +++ /dev/null @@ -1,4 +0,0 @@ -testing -supportsEncoding: aString - "Answer whether the the given encoding name is supported." - ^ self supportedEncodingNames includes: aString \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/converter.st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/converter.st deleted file mode 100644 index 02b8754b..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/converter.st +++ /dev/null @@ -1,3 +0,0 @@ -private -converter - ^ TextConverter newForEncoding: self name \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/decoderFor..st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/decoderFor..st deleted file mode 100644 index be53dfea..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/decoderFor..st +++ /dev/null @@ -1,3 +0,0 @@ -conversion -decoderFor: aStream - ^ self encoderFor: aStream \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/encoderFor..st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/encoderFor..st deleted file mode 100644 index 94f2fc13..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/encoderFor..st +++ /dev/null @@ -1,5 +0,0 @@ -conversion -encoderFor: aStream - ^ GRPharoConverterCodecStream - on: aStream - converter: self converter \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/initializeWithName..st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/initializeWithName..st deleted file mode 100644 index fe95783c..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/initializeWithName..st +++ /dev/null @@ -1,7 +0,0 @@ -initialization -initializeWithName: aString - self initialize. - name := aString. - urlCodec := (#('iso-8859-15' 'cp-1252') includes: aString) - ifFalse: [ GRCodec forEncoding: 'utf-8' ] - ifTrue: [ self ] \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/name.st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/name.st deleted file mode 100644 index 22077c20..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/name.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -name - ^ name \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/url.st b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/url.st deleted file mode 100644 index 232ad239..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/instance/url.st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -url - "RFC 3986: When a new URI scheme defines a component that represents textual data consisting of characters from the Universal Character Set [UCS], the data should first be encoded as octets according to the UTF-8 character encoding." - - ^ urlCodec \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/properties.json b/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/properties.json deleted file mode 100644 index 239a5cd3..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoGenericCodec.class/properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "commentStamp" : "", - "super" : "GRCodec", - "category" : "Grease-Pharo10-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "name", - "urlCodec" - ], - "name" : "GRPharoGenericCodec", - "type" : "normal" -} \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/setutf8CodectoDeprecatedTextConverter.st b/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/setutf8CodectoDeprecatedTextConverter.st deleted file mode 100644 index dc394f4f..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/setutf8CodectoDeprecatedTextConverter.st +++ /dev/null @@ -1,4 +0,0 @@ -utf8 codec -setutf8CodectoDeprecatedTextConverter - "Set to the GRPharoDeprecatedUtf8Codec that uses the deprecated TextConverter for utf8 encoding" - utf8DeprecatedCodecFlag := true \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/setutf8CodectoZinc.st b/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/setutf8CodectoZinc.st deleted file mode 100644 index 2f43e9ab..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/setutf8CodectoZinc.st +++ /dev/null @@ -1,4 +0,0 @@ -utf8 codec -setutf8CodectoZinc - "Set to GRPharoUtf8Codec that uses Zinc for utf8 encoding" - utf8DeprecatedCodecFlag := false \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/utf8CodecClass.st b/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/utf8CodecClass.st deleted file mode 100644 index 86376f5c..00000000 --- a/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/instance/utf8CodecClass.st +++ /dev/null @@ -1,8 +0,0 @@ -utf8 codec -utf8CodecClass - - ^ utf8DeprecatedCodecFlag - ifNil: [ GRPharoUtf8Codec ] - ifNotNil: [ utf8DeprecatedCodecFlag - ifTrue:[ GRPharoDeprecatedUtf8Codec ] - ifFalse: [ GRPharoUtf8Codec ] ] \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/properties.json b/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/properties.json index c2b116eb..7a263830 100644 --- a/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/properties.json +++ b/repository/Grease-Pharo10-Core.package/GRPharoPlatform.class/properties.json @@ -8,9 +8,7 @@ "UrlTable", "XmlTable" ], - "instvars" : [ - "utf8DeprecatedCodecFlag" - ], + "instvars" : [ ], "name" : "GRPharoPlatform", "type" : "normal" } \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoUtf8Codec.class/class/codecs.st b/repository/Grease-Pharo10-Core.package/GRPharoUtf8Codec.class/class/codecs.st index 6e52e620..632b84fb 100644 --- a/repository/Grease-Pharo10-Core.package/GRPharoUtf8Codec.class/class/codecs.st +++ b/repository/Grease-Pharo10-Core.package/GRPharoUtf8Codec.class/class/codecs.st @@ -1,5 +1,3 @@ accessing codecs - ^ GRPlatform current utf8CodecClass == self - ifTrue:[ Array with: self new ] - ifFalse: [ Array new ] \ No newline at end of file + ^ Array with: self new \ No newline at end of file diff --git a/repository/Grease-Pharo10-Core.package/GRPharoUtf8Codec.class/class/supportsEncoding..st b/repository/Grease-Pharo10-Core.package/GRPharoUtf8Codec.class/class/supportsEncoding..st index 54e91f2e..f1f07f4a 100644 --- a/repository/Grease-Pharo10-Core.package/GRPharoUtf8Codec.class/class/supportsEncoding..st +++ b/repository/Grease-Pharo10-Core.package/GRPharoUtf8Codec.class/class/supportsEncoding..st @@ -1,3 +1,3 @@ private supportsEncoding: aString - ^ GRPlatform current utf8CodecClass == self and: [ (#('utf-8' 'UTF-8' 'utf8') includes: aString) ] \ No newline at end of file + ^ (#('utf-8' 'UTF-8' 'utf8') includes: aString) \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testThisContext.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testThisContext.st index fd515dd9..640f1966 100644 --- a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testThisContext.st +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testThisContext.st @@ -10,9 +10,9 @@ testThisContext ifTrue: [ self assert: blockContext receiver = block ] ifFalse: [ self assert: blockContext receiver = self. - self assert: (blockContext namedTempAt: (blockContext tempNames indexOf: #blockContext)) == blockContext ]. - self assert: (blockContext namedTempAt: (blockContext tempNames indexOf: #methodContext)) == methodContext ]. + self assert: (blockContext tempNamed: 'blockContext') == blockContext ]. + self assert: (blockContext tempNamed: 'methodContext') == methodContext ]. block value. self assert: self returnSender = methodContext. self assert: methodContext receiver = self. - self assert: (self platform thisContext namedTempAt: (self platform thisContext tempNames indexOf: #block)) == block \ No newline at end of file + self assert: (self platform thisContext tempNamed: 'block') == block \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoCodecTest.class/instance/testLanguageTag.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoCodecTest.class/instance/testLanguageTag.st deleted file mode 100644 index 1207dc5f..00000000 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoCodecTest.class/instance/testLanguageTag.st +++ /dev/null @@ -1,21 +0,0 @@ -tests -testLanguageTag - - "this makes sure the encoder doesn't fall on the nose with unicode" - - "Make Japanese String from unicode. see http://www.unicode.org/charts/PDF/U3040.pdf" - - | leading hiraA hiraO hiraAO | - SystemVersion current major >= 9 ifTrue: [ - GRPlatform current setutf8CodectoDeprecatedTextConverter ]. - [ - leading := (Smalltalk classNamed: #JapaneseEnvironment) leadingChar. - hiraA := (Character leadingChar: leading code: 12354) greaseString. "HIRAGANA LETTER A" - hiraO := (Character leadingChar: leading code: 12362) greaseString. "HIRAGANA LETTER O" - hiraAO := hiraA , hiraO. - self assertEncodingIgnoresLanguageTat: hiraA. - self assertEncodingIgnoresLanguageTat: hiraO. - self assertEncodingIgnoresLanguageTat: hiraAO - ] ensure: [ - SystemVersion current major >= 9 ifTrue: [ - GRPlatform current setutf8CodectoZinc ] ] \ No newline at end of file diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testGreaseIntegerOnCharacter.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testGreaseIntegerOnCharacter.st index b62275e7..c6c6c2ea 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testGreaseIntegerOnCharacter.st +++ b/repository/Grease-Tests-Pharo-Core.package/GRPharoPlatformTest.class/instance/testGreaseIntegerOnCharacter.st @@ -4,11 +4,4 @@ testGreaseIntegerOnCharacter character := Character codePoint: 19982. self assert: character greaseInteger = 19982. character := Unicode value: 19982. - self assert: character greaseInteger = 19982. - LanguageEnvironment allSubclassesDo: [ :each | - (each class selectors includes: #leadingChar) ifTrue: [ - "fuck me gently with a chainsaw" - character := Character - leadingChar: each leadingChar - code: 19982. - self assert: character greaseInteger = 19982 ] ] \ No newline at end of file + self assert: character greaseInteger = 19982 \ No newline at end of file From 7a35c98fe4dc972d75683a78e21aa18cd42a95f7 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 19 Mar 2022 16:03:43 +0100 Subject: [PATCH 2/3] ping the CI for PR#134 --- .../GRPharoZnUtf8CodecStream.class/instance/nextPut..st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/Grease-Pharo10-Core.package/GRPharoZnUtf8CodecStream.class/instance/nextPut..st b/repository/Grease-Pharo10-Core.package/GRPharoZnUtf8CodecStream.class/instance/nextPut..st index 30014e3d..3cad62a0 100644 --- a/repository/Grease-Pharo10-Core.package/GRPharoZnUtf8CodecStream.class/instance/nextPut..st +++ b/repository/Grease-Pharo10-Core.package/GRPharoZnUtf8CodecStream.class/instance/nextPut..st @@ -1,3 +1,3 @@ accessing nextPut: aCharacter - encoder nextPut: aCharacter asCharacter toStream: stream \ No newline at end of file + encoder nextPut: aCharacter asCharacter toStream: stream \ No newline at end of file From 4a8e347676845c5ef63fdfeb7c7f1d542193d922 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 19 Mar 2022 16:14:35 +0100 Subject: [PATCH 3/3] Fix test for GRPharoGenericCodec to be skipped in Pharo10 --- .../instance/testNoAmbiguities.st | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoGenericCodecTest.class/instance/testNoAmbiguities.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoGenericCodecTest.class/instance/testNoAmbiguities.st index 28ee8c57..341866ff 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPharoGenericCodecTest.class/instance/testNoAmbiguities.st +++ b/repository/Grease-Tests-Pharo-Core.package/GRPharoGenericCodecTest.class/instance/testNoAmbiguities.st @@ -1,6 +1,7 @@ tests testNoAmbiguities - #('utf-8' 'UTF-8' 'utf8') do: [ :each | - self deny: (GRPharoGenericCodec supportsEncoding: each) ]. - GRPharoLatin1Codec supportedEncodingNames do: [ :each | - self deny: (GRPharoGenericCodec supportsEncoding: each) ] \ No newline at end of file + (Smalltalk includesKey: #GRPharoGenericCodec) ifTrue:[ + #('utf-8' 'UTF-8' 'utf8') do: [ :each | + self deny: ((Smalltalk at: #GRPharoGenericCodec) supportsEncoding: each) ]. + GRPharoLatin1Codec supportedEncodingNames do: [ :each | + self deny: ((Smalltalk at: #GRPharoGenericCodec) supportsEncoding: each) ] ] \ No newline at end of file