Merge pull request #12 from svenvc/master

Update zinc: fix edge case in ZnUTF8Encoder>>#ensureAtBeginOfCodePointOnStream:

repository/Zinc-Character-Encoding-Core.package/SocketStream.extension/instance/rawStream.st

@@ -0,0 +1,7 @@
+*Zinc-Character-Encoding-Core
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Since this the base stream, answer ourself."
+
+	^ self

repository/Zinc-Character-Encoding-Core.package/SocketStream.extension/instance/wrappedStream.st

@@ -0,0 +1,6 @@
+*Zinc-Character-Encoding-Core
+wrappedStream
+	"Answer the stream that the receiver wraps.
+	Since this the base stream, answer nil"
+
+	^ nil

repository/Zinc-Character-Encoding-Core.package/SocketStream.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "SocketStream"
+}

repository/Zinc-Character-Encoding-Core.package/Stream.extension/instance/rawStream.st

@@ -0,0 +1,7 @@
+*Zinc-Character-Encoding-Core
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Since this the base stream, answer ourself."
+
+	^ self

repository/Zinc-Character-Encoding-Core.package/Stream.extension/instance/wrappedStream.st

@@ -0,0 +1,6 @@
+*Zinc-Character-Encoding-Core
+wrappedStream
+	"Answer the stream that the receiver wraps.
+	Since this the base stream, answer nil"
+
+	^ nil

repository/Zinc-Character-Encoding-Core.package/Stream.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "Stream"
+}

repository/Zinc-Character-Encoding-Core.package/ZnBufferedReadStream.class/instance/rawStream.st

@@ -0,0 +1,7 @@
+accessing
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Defer to the wrappedStream."
+
+	^ self wrappedStream rawStream

repository/Zinc-Character-Encoding-Core.package/ZnBufferedReadWriteStream.class/instance/rawStream.st

@@ -0,0 +1,7 @@
+accessing
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Defer to the wrappedStream."
+
+	^ self wrappedStream rawStream

repository/Zinc-Character-Encoding-Core.package/ZnBufferedWriteStream.class/instance/rawStream.st

@@ -0,0 +1,7 @@
+initialize-release
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Defer to the wrappedStream."
+
+	^ self wrappedStream rawStream

repository/Zinc-Character-Encoding-Core.package/ZnBufferedWriteStream.class/instance/wrappedStream.st

@@ -0,0 +1,4 @@
+initialize-release
+wrappedStream
+
+	^ stream

repository/Zinc-Character-Encoding-Core.package/ZnEncodedStream.class/instance/rawStream.st

@@ -0,0 +1,7 @@
+accessing
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Defer to the wrappedStream."
+
+	^ self wrappedStream rawStream

repository/Zinc-Character-Encoding-Core.package/ZnNewLineWriterStream.class/instance/rawStream.st

@@ -0,0 +1,7 @@
+accessing
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Defer to the wrappedStream."
+
+	^ self wrappedStream rawStream

repository/Zinc-Character-Encoding-Core.package/ZnPositionableReadStream.class/instance/rawStream.st

@@ -0,0 +1,7 @@
+accessing
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Defer to the wrappedStream."
+
+	^ self wrappedStream rawStream

repository/Zinc-Character-Encoding-Core.package/ZnUTF8Encoder.class/instance/ensureAtBeginOfCodePointOnStream..st

@@ -4,6 +4,8 @@ ensureAtBeginOfCodePointOnStream: stream
 	if not move further backwards. This is necessary when a position in the binary stream is set,
 	not knowing if that position is on a proper encoded character boundary."
 
+	"If we are at end-of-stream, we can't be in the middle of an encoded codepoint
+	(unless that codepoint is incomplete and thus invalid, which we won't worry about)"
+	stream atEnd ifTrue: [ ^ self ].
 	"Back up until we are not longer on a continuation byte but on a leading byte"
-
 	[ (stream peek bitAnd: 2r11000000) == 2r10000000 ] whileTrue: [ stream back ]

repository/Zinc-Character-Encoding-Core.package/monticello.meta/categories.st

@@ -1 +1 @@
-SystemOrganization addCategory: #'Zinc-Character-Encoding-Core'!
+self packageOrganizer ensurePackage: #'Zinc-Character-Encoding-Core' withTags: #()!

repository/Zinc-Character-Encoding-Tests.package/ZnCharacterStreamTest.class/instance/testUTF8ReadStreamPositioning.st

@@ -17,4 +17,6 @@ testUTF8ReadStreamPositioning
 	stream position: 5.
 	self assert: stream next equals: $v.
 	stream position: 6.
-	self assert: stream next equals: $e
+	self assert: stream next equals: $e.
+	stream position: 7.
+	self assert: stream atEnd.

repository/Zinc-Character-Encoding-Tests.package/monticello.meta/categories.st

@@ -1 +1 @@
-SystemOrganization addCategory: #'Zinc-Character-Encoding-Tests'!
+self packageOrganizer ensurePackage: #'Zinc-Character-Encoding-Tests' withTags: #()!

repository/Zinc-HTTP.package/ZnHtmlOutputStream.class/instance/rawStream.st

@@ -0,0 +1,7 @@
+accessing
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Defer to the wrappedStream."
+
+	^ self wrappedStream rawStream

repository/Zinc-HTTP.package/ZnLoggingReadStream.class/instance/rawStream.st

@@ -0,0 +1,7 @@
+accessing
+rawStream
+	"Answer the innermost stream wrapped by the receiver, e.g. a raw binary file stream,
+	socket stream, or regular Read/WriteStream.
+	Defer to the wrappedStream."
+
+	^ self wrappedStream rawStream

repository/Zinc-HTTP.package/monticello.meta/categories.st

@@ -1,8 +1 @@
-SystemOrganization addCategory: #'Zinc-HTTP'!
-SystemOrganization addCategory: #'Zinc-HTTP-Client-Server'!
-SystemOrganization addCategory: #'Zinc-HTTP-Core'!
-SystemOrganization addCategory: #'Zinc-HTTP-Exceptions'!
-SystemOrganization addCategory: #'Zinc-HTTP-Logging'!
-SystemOrganization addCategory: #'Zinc-HTTP-Streaming'!
-SystemOrganization addCategory: #'Zinc-HTTP-Support'!
-SystemOrganization addCategory: #'Zinc-HTTP-Variables'!
+self packageOrganizer ensurePackage: #'Zinc-HTTP' withTags: #(#'Client-Server' #Core #Exceptions #Logging #Streaming #Support #Variables)!