Merge pull request #363 from seandenigris/enh_number-thousands-sep

[Enh]: Number Reading - Thousands Separators
magritte-metamodel · Sep 10, 2024 · fff9868 · fff9868
2 parents 2cad103 + 65d800f
commit fff9868
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 3 deletions.
diff --git a/source/Magritte-Model/MANumberDescription.class.st b/source/Magritte-Model/MANumberDescription.class.st
@@ -12,6 +12,12 @@ MANumberDescription class >> defaultKind [
 	^ Number
 ]
 
+{ #category : #'accessing-defaults' }
+MANumberDescription class >> defaultThousandsSeparator [
+
+	^ $,
+]
+
 { #category : #testing }
 MANumberDescription class >> isAbstract [
 	^ false
@@ -41,3 +47,19 @@ MANumberDescription >> beNegative [
 MANumberDescription >> bePositive [
 	self addCondition: (MACondition selector: #positive) labelled: 'No positive number was entered'
 ]
+
+{ #category : #accessing }
+MANumberDescription >> thousandsSeparator [
+
+	^ self 
+		propertyAt: #thousandsSeparator
+		ifAbsent: [ self class defaultThousandsSeparator ]
+]
+
+{ #category : #accessing }
+MANumberDescription >> thousandsSeparator: aCharacter [
+
+	^ self 
+		propertyAt: #thousandsSeparator
+		putRemovingNil: aCharacter
+]
diff --git a/source/Magritte-Model/MAStringReader.class.st b/source/Magritte-Model/MAStringReader.class.st
@@ -114,9 +114,12 @@ MAStringReader >> visitMultipleOptionDescription: aDescription [
 
 { #category : #'visiting-description' }
 MAStringReader >> visitNumberDescription: aDescription [
-	| isContentsValid |
-	isContentsValid := NumberParser isValidNumber: self contents.
+	| isContentsValid cleanedContents |
+	cleanedContents := self contents reject: [ :e | e = aDescription thousandsSeparator ].
+	isContentsValid := NumberParser isValidNumber: cleanedContents.
 	isContentsValid ifFalse: [ MAReadError signal ].
+
+	self stream: cleanedContents readStream.
 	super visitNumberDescription: aDescription
 ]
 

diff --git a/source/Magritte-Tests-Model/MANumberDescriptionTest.class.st b/source/Magritte-Tests-Model/MANumberDescriptionTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #MANumberDescriptionTest,
 	#superclass : #MAMagnitudeDescriptionTest,
-	#category : 'Magritte-Tests-Model-Description'
+	#category : #'Magritte-Tests-Model-Description'
 }
 
 { #category : #testing }
@@ -85,6 +85,25 @@ MANumberDescriptionTest >> testFromString [
 			= -20 description: 'Negative numbers should be accepted'
 ]
 
+{ #category : #private }
+MANumberDescriptionTest >> testThousandsSeparatorCustom [
+
+	self 
+		assert: (self description
+			thousandsSeparator: $.;
+			fromString: '20.000')
+		equals: 20000 "By default, commas should be ignored"
+]
+
+{ #category : #private }
+MANumberDescriptionTest >> testThousandsSeparatorDefault [
+
+	"self assert: (self description fromString: '') isNil description: 'Empty string should be parsed to nil'."
+	self 
+		assert: (self description fromString: '20,000')
+		equals: 20000 "By default, commas should be ignored"
+]
+
 { #category : #tests }
 MANumberDescriptionTest >> testValidateConditions [
 ]