Merge pull request #137 from SeasideSt/grpackage-pharo100

Move all codecs in Pharo10 to use Zinc
SeasideSt · Apr 9, 2022 · aa57cee · aa57cee
2 parents 1d8daee + 3c4fa03
commit aa57cee
Show file tree

Hide file tree

Showing 58 changed files with 60 additions and 236 deletions.
diff --git a/...sitory/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/README.md b/...sitory/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/README.md
diff --git a/...ory/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/class/on.converter..st b/...ory/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/class/on.converter..st
diff --git a/...-Core.package/GRPharoConverterCodecStream.class/instance/greaseNext.putAll.startingAt..st b/...-Core.package/GRPharoConverterCodecStream.class/instance/greaseNext.putAll.startingAt..st
diff --git a/...aro100-Core.package/GRPharoConverterCodecStream.class/instance/initializeOn.converter..st b/...aro100-Core.package/GRPharoConverterCodecStream.class/instance/initializeOn.converter..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/instance/next..st b/repository/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/instance/next..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/instance/next.st b/repository/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/instance/next.st
diff --git a/...itory/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/instance/nextPut..st b/...itory/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/instance/nextPut..st
diff --git a/...ry/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/instance/nextPutAll..st b/...ry/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/instance/nextPutAll..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/properties.json b/repository/Grease-Pharo100-Core.package/GRPharoConverterCodecStream.class/properties.json
diff --git a/...y/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/README.md b/...y/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/README.md
diff --git a/...tory/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/crlf.st b/...tory/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/crlf.st
diff --git a/...e-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/encodeDefault..st b/...e-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/encodeDefault..st
diff --git a/...ease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/encodeFast..st b/...ease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/encodeFast..st
diff --git a/....package/GRPharoDeprecatedUtf8CodecStream.class/instance/greaseNext.putAll.startingAt..st b/....package/GRPharoDeprecatedUtf8CodecStream.class/instance/greaseNext.putAll.startingAt..st
diff --git a/...kage/GRPharoDeprecatedUtf8CodecStream.class/instance/greaseNext.putAllFast.startingAt..st b/...kage/GRPharoDeprecatedUtf8CodecStream.class/instance/greaseNext.putAllFast.startingAt..st
diff --git a/...ease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/invalidUtf8.st b/...ease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/invalidUtf8.st
diff --git a/...ory/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/next..st b/...ory/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/next..st
diff --git a/...tory/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/next.st b/...tory/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/next.st
diff --git a/.../Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/nextPut..st b/.../Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/nextPut..st
diff --git a/...ease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/nextPutAll..st b/...ease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/instance/nextPutAll..st
diff --git a/...itory/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/properties.json b/...itory/Grease-Pharo100-Core.package/GRPharoDeprecatedUtf8CodecStream.class/properties.json
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf16Codec.class/class/basicForEncoding..st b/repository/Grease-Pharo100-Core.package/GRPharoUtf16Codec.class/class/basicForEncoding..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf16Codec.class/class/codecs.st b/repository/Grease-Pharo100-Core.package/GRPharoUtf16Codec.class/class/codecs.st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf16Codec.class/class/supportsEncoding..st b/repository/Grease-Pharo100-Core.package/GRPharoUtf16Codec.class/class/supportsEncoding..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf16Codec.class/instance/name.st b/repository/Grease-Pharo100-Core.package/GRPharoUtf16Codec.class/instance/name.st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/README.md b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/README.md
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/class/basicForEncoding..st b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/class/basicForEncoding..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/class/codecs.st b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/class/codecs.st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/class/supportsEncoding..st b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/class/supportsEncoding..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/decoderFor..st b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/decoderFor..st
diff --git a/...sitory/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/encodedStringClass.st b/...sitory/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/encodedStringClass.st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/encoderFor..st b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/encoderFor..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/invalidUtf8.st b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/invalidUtf8.st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/url.st b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/instance/url.st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/properties.json b/repository/Grease-Pharo100-Core.package/GRPharoUtf8Codec.class/properties.json
diff --git a/...package/GRPharoUtf16Codec.class/README.md → ...re.package/GRPharoZnCodec.class/README.md b/...package/GRPharoUtf16Codec.class/README.md → ...re.package/GRPharoZnCodec.class/README.md
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/class/basicForEncoding..st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/class/basicForEncoding..st
@@ -0,0 +1,5 @@
+private
+basicForEncoding: aString
+	(self supportsEncoding: aString)
+		ifFalse: [ self unsupportedEncoding: aString ].
+	^ self basicNew initializeWithName: aString
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/class/codecs.st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/class/codecs.st
@@ -0,0 +1,4 @@
+accessing
+codecs
+	^ self supportedEncodingNames
+		collect: [ :each | self basicForEncoding: each greaseString ]
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/class/supportedEncodingNames.st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/class/supportedEncodingNames.st
@@ -0,0 +1,13 @@
+accessing
+supportedEncodingNames
+	"answers the names of the encodings supported by this class"
+
+	| all |
+	all := ZnCharacterEncoder knownEncodingIdentifiers asOrderedCollection.
+	(all includes: 'utf8')
+		ifTrue:[ all addAll: #('utf-8' 'UTF-8') ].
+	(all includes: 'utf16')
+		ifTrue:[ all addAll: #('utf-16' 'UTF-16') ].
+	(all includes: 'macroman')
+		ifTrue:[ all add: 'mac-roman' ].
+	^ all
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/class/supportsEncoding..st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/class/supportsEncoding..st
@@ -0,0 +1,3 @@
+accessing
+supportsEncoding: aName
+	^ self supportedEncodingNames includes: aName
diff --git a/...RPharoUtf8Codec.class/instance/decode..st → .../GRPharoZnCodec.class/instance/decode..st b/...RPharoUtf8Codec.class/instance/decode..st → .../GRPharoZnCodec.class/instance/decode..st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/instance/decoderFor..st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/instance/decoderFor..st
@@ -0,0 +1,3 @@
+conversion
+decoderFor: aStream 
+	^ self encoderFor: aStream
diff --git a/...odec.class/instance/encodedStringClass.st → ...odec.class/instance/encodedStringClass.st b/...odec.class/instance/encodedStringClass.st → ...odec.class/instance/encodedStringClass.st
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/instance/encoderFor..st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/instance/encoderFor..st
@@ -0,0 +1,5 @@
+conversion
+encoderFor: aStream 
+	^ GRPharoZnCodecStream 
+		on: aStream
+		withEncoder: (ZnCharacterEncoder newForEncoding: self name)
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/instance/initializeWithName..st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/instance/initializeWithName..st
@@ -0,0 +1,7 @@
+initialization
+initializeWithName: aString
+	self initialize.
+	name := aString.
+	urlCodec := (#('iso-8859-15' 'cp-1252' 'utf8' 'utf-8' 'UTF-8') includes: aString) 
+		ifFalse: [ GRCodec forEncoding: 'utf8' ]
+		ifTrue: [ self ]
diff --git a/...e/GRPharoUtf8Codec.class/instance/name.st → ...age/GRPharoZnCodec.class/instance/name.st b/...e/GRPharoUtf8Codec.class/instance/name.st → ...age/GRPharoZnCodec.class/instance/name.st
@@ -1,3 +1,3 @@
 accessing
 name
-	^ 'utf-8'
+	^ name
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/instance/url.st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodec.class/instance/url.st
@@ -0,0 +1,5 @@
+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
diff --git a/...e/GRPharoUtf16Codec.class/properties.json → ...kage/GRPharoZnCodec.class/properties.json b/...e/GRPharoUtf16Codec.class/properties.json → ...kage/GRPharoZnCodec.class/properties.json
@@ -5,7 +5,10 @@
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],
-	"instvars" : [ ],
-	"name" : "GRPharoUtf16Codec",
+	"instvars" : [
+		"name",
+		"urlCodec"
+	],
+	"name" : "GRPharoZnCodec",
 	"type" : "normal"
 }
diff --git a/.../GRPharoZnUtf8CodecStream.class/README.md → ...kage/GRPharoZnCodecStream.class/README.md b/.../GRPharoZnUtf8CodecStream.class/README.md → ...kage/GRPharoZnCodecStream.class/README.md
diff --git a/repository/Grease-Pharo100-Core.package/GRPharoZnCodecStream.class/class/on.withEncoder..st b/repository/Grease-Pharo100-Core.package/GRPharoZnCodecStream.class/class/on.withEncoder..st
@@ -0,0 +1,3 @@
+instance creation
+on: aStream withEncoder: aZnEncoder
+	^ self basicNew initializeOn: aStream withEncoder: aZnEncoder
diff --git a/...instance/greaseNext.putAll.startingAt..st → ...instance/greaseNext.putAll.startingAt..st b/...instance/greaseNext.putAll.startingAt..st → ...instance/greaseNext.putAll.startingAt..st
diff --git a/...se-Pharo100-Core.package/GRPharoZnCodecStream.class/instance/initializeOn.withEncoder..st b/...se-Pharo100-Core.package/GRPharoZnCodecStream.class/instance/initializeOn.withEncoder..st
@@ -0,0 +1,5 @@
+initialization
+initializeOn: aStream withEncoder: aZnEncoder
+	self initialize.
+	stream := aStream.
+	encoder := aZnEncoder
diff --git a/...ZnUtf8CodecStream.class/instance/next..st → ...haroZnCodecStream.class/instance/next..st b/...ZnUtf8CodecStream.class/instance/next..st → ...haroZnCodecStream.class/instance/next..st
diff --git a/...oZnUtf8CodecStream.class/instance/next.st → ...PharoZnCodecStream.class/instance/next.st b/...oZnUtf8CodecStream.class/instance/next.st → ...PharoZnCodecStream.class/instance/next.st
diff --git a/...tf8CodecStream.class/instance/nextPut..st → ...oZnCodecStream.class/instance/nextPut..st b/...tf8CodecStream.class/instance/nextPut..st → ...oZnCodecStream.class/instance/nextPut..st
diff --git a/...CodecStream.class/instance/nextPutAll..st → ...CodecStream.class/instance/nextPutAll..st b/...CodecStream.class/instance/nextPutAll..st → ...CodecStream.class/instance/nextPutAll..st
diff --git a/...roZnUtf8CodecStream.class/properties.json → ...RPharoZnCodecStream.class/properties.json b/...roZnUtf8CodecStream.class/properties.json → ...RPharoZnCodecStream.class/properties.json
@@ -8,6 +8,6 @@
 	"instvars" : [
 		"encoder"
 	],
-	"name" : "GRPharoZnUtf8CodecStream",
+	"name" : "GRPharoZnCodecStream",
 	"type" : "normal"
 }