Changes for #85

instantiations · Jun 28, 2021 · fa05497 · fa05497
1 parent 9488047
commit fa05497
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/source/.configmaps b/source/.configmaps
@@ -27,8 +27,8 @@
 			},
 			{
 				#name : 'TonelReaderModel',
-				#versionName : 'strategies-2',
-				#ts : 3802344748
+				#versionName : 'strategies-3',
+				#ts : 3802346469
 			},
 			{
 				#name : 'TonelTools',

diff --git a/source/TonelReaderModel/CfsPath.extension.st b/source/TonelReaderModel/CfsPath.extension.st
@@ -25,3 +25,15 @@ CfsPath >> readUtf8StreamDo: aBlock [
 				] ensure: [stream close].
 				latin1 ifNotNil: [aBlock value: latin1 readStream]]
 ]
+
+{ #category : '*TonelReaderModel',
+ #vaCategories : ['CFS-API'] }
+CfsPath >> utf8Contents [
+	"Answer the contents of receiver asuming it was encoded using UTF-8."
+
+	| output |
+
+	output := WriteStream on: String new.
+	self readUtf8StreamDo: [:input | [input atEnd] whileFalse: [output nextPut: input next]].
+	^output contents
+]
diff --git a/source/TonelReaderModel/TonelReader.class.st b/source/TonelReaderModel/TonelReader.class.st
@@ -124,9 +124,7 @@ TonelReader >> readConfigurationMapsFrom: sourceDirPath [
 	configurationMaps :=
 		(sourceDirPath append: self configMapsFilename) exists
 			ifTrue: [
-				(STONReader on: (
-					CfsReadFileStream open: (sourceDirPath append: self configMapsFilename) asString))
-						next]
+				(STONReader on: ((sourceDirPath append: self configMapsFilename) utf8Contents readStream)) next]
 			ifFalse: [OrderedCollection new]
 ]