Merge pull request #514 from ApptiveGrid/reapply-scaled-decimal-fix

reapplied scaled decimal changes to have controlled conversion
ApptiveGrid · Nov 21, 2023 · 4190c4e · 4190c4e
2 parents 3948543 + 504c6ac
commit 4190c4e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Soil-Serializer-Tests/SoilPrimitiveSerializationTest.class.st b/src/Soil-Serializer-Tests/SoilPrimitiveSerializationTest.class.st
@@ -513,7 +513,7 @@ SoilPrimitiveSerializationTest >> testSerializationScaledDecimal [
 	serialized := SoilSerializer serializeToBytes: object.
 
 	self assert: (serialized at: 1) equals: TypeCodeScaledDecimal.
-	self assert: serialized equals: #[9 10 1 2].
+	self assert: serialized equals: #[9 5 10 1 2].
 	materialized := SoilMaterializer materializeFromBytes: serialized.
 	self assert: materialized class equals: ScaledDecimal.
 	self assert: materialized equals: object

diff --git a/src/Soil-Serializer/SoilBasicMaterializer.class.st b/src/Soil-Serializer/SoilBasicMaterializer.class.st
@@ -104,7 +104,7 @@ SoilBasicMaterializer >> nextScaledDecimal: aClass [
 
 	| scaledDecimal |
 	scaledDecimal := aClass new
-		                 setNumerator: self nextLengthEncodedInteger
+		                 setNumerator: self nextSoilObject
 		                 denominator: self nextLengthEncodedInteger
 		                 scale: self nextLengthEncodedInteger.
 	self registerObject: scaledDecimal.

diff --git a/src/Soil-Serializer/SoilBasicSerializer.class.st b/src/Soil-Serializer/SoilBasicSerializer.class.st
@@ -121,7 +121,7 @@ SoilBasicSerializer >> nextPutScaledDecimal: aNumber [
 	"we know that numerator, denominator and scale are SmallIntegers"
 	self
 		nextPutByte: TypeCodeScaledDecimal;
-		nextPutLengthEncodedInteger: aNumber numerator;
+		nextPutInteger: aNumber numerator;
 		nextPutLengthEncodedInteger: aNumber denominator;
 		nextPutLengthEncodedInteger: aNumber scale 
 ]