[Enh]: Fix Issue magritte-metamodel#27: All Option Descriptions Shoul…

…d Be Extensible; now MultipleOptionDescriptions can be #extensible, too! Implementation note: #initializer had to be pushed up, since we need to supply a way to create the new instance. This pushes us a bit closer to my suspicion that #classes for reference descriptions should be #factories, which would probably mean a name-change for #initializer
zweidenker · Aug 8, 2018 · 039957b · 039957b
1 parent acf0bec
commit 039957b
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 11 deletions.
diff --git a/source/Magritte-Model.package/MAMultipleOptionDescription.class/instance/validateKind..st b/source/Magritte-Model.package/MAMultipleOptionDescription.class/instance/validateKind..st
@@ -1,5 +1,4 @@
 validating
 validateKind: anObject
 	super validateKind: anObject.
-	(anObject allSatisfy: [ :each | self options includes: each ])
-		ifFalse: [ MAKindError description: self signal: self kindErrorMessage ]
+	anObject do: [ :e | self validateOptionKind: e ]
diff --git a/...cription.class/class/defaultExtensible.st → ...cription.class/class/defaultExtensible.st b/...cription.class/class/defaultExtensible.st → ...cription.class/class/defaultExtensible.st
diff --git a/...escription.class/instance/beExtensible.st → ...escription.class/instance/beExtensible.st b/...escription.class/instance/beExtensible.st → ...escription.class/instance/beExtensible.st
diff --git a/...onDescription.class/instance/beLimited.st → ...onDescription.class/instance/beLimited.st b/...onDescription.class/instance/beLimited.st → ...onDescription.class/instance/beLimited.st
diff --git a/...n.class/instance/descriptionExtensible.st → ...n.class/instance/descriptionExtensible.st b/...n.class/instance/descriptionExtensible.st → ...n.class/instance/descriptionExtensible.st
diff --git a/...Description.class/instance/extensible..st → ...Description.class/instance/extensible..st b/...Description.class/instance/extensible..st → ...Description.class/instance/extensible..st
diff --git a/...nDescription.class/instance/extensible.st → ...nDescription.class/instance/extensible.st b/...nDescription.class/instance/extensible.st → ...nDescription.class/instance/extensible.st
diff --git a/...escription.class/instance/isExtensible.st → ...escription.class/instance/isExtensible.st b/...escription.class/instance/isExtensible.st → ...escription.class/instance/isExtensible.st
diff --git a/source/Magritte-Model.package/MAOptionDescription.class/instance/shouldNotInclude..st b/source/Magritte-Model.package/MAOptionDescription.class/instance/shouldNotInclude..st
@@ -1,3 +1,3 @@
 accessing-dynamic
 shouldNotInclude: anObject
-	^ anObject isNil or: [ self options includes: anObject ]
+	^ self isExtensible not or: [ anObject isNil or: [ self options includes: anObject ] ]
diff --git a/source/Magritte-Model.package/MAOptionDescription.class/instance/validateOptionKind..st b/source/Magritte-Model.package/MAOptionDescription.class/instance/validateOptionKind..st
@@ -0,0 +1,7 @@
+validating
+validateOptionKind: anObject
+	(self options includes: anObject)
+		ifTrue: [ ^ self ].
+	self isExtensible
+		ifTrue: [ self reference validate: anObject ]
+		ifFalse: [ MAKindError description: self signal: self kindErrorMessage ]
diff --git a/...escription.class/instance/initializer..st → ...escription.class/instance/initializer..st b/...escription.class/instance/initializer..st → ...escription.class/instance/initializer..st
diff --git a/...Description.class/instance/initializer.st → ...Description.class/instance/initializer.st b/...Description.class/instance/initializer.st → ...Description.class/instance/initializer.st
diff --git a/source/Magritte-Model.package/MASingleOptionDescription.class/instance/shouldNotInclude..st b/source/Magritte-Model.package/MASingleOptionDescription.class/instance/shouldNotInclude..st
diff --git a/source/Magritte-Model.package/MASingleOptionDescription.class/instance/validateKind..st b/source/Magritte-Model.package/MASingleOptionDescription.class/instance/validateKind..st
@@ -1,8 +1,4 @@
 validating
 validateKind: anObject
 	super validateKind: anObject.
-	(self options includes: anObject)
-		ifTrue: [ ^ self ].
-	self isExtensible
-		ifTrue: [ self reference validate: anObject ]
-		ifFalse: [ MAKindError description: self signal: self kindErrorMessage ]
+	self validateOptionKind: anObject
diff --git a/source/Magritte-Model.package/NumberParser.extension/class/isNumber..st b/source/Magritte-Model.package/NumberParser.extension/class/isNumber..st
@@ -0,0 +1,7 @@
+*Magritte-Model
+isNumber: aStringOrStream
+
+	| stream |
+	stream := aStringOrStream readStream.
+	NumberParser parse: stream onError: [ ^ false ].
+	^ stream atEnd
diff --git a/source/Magritte-Model.package/NumberParser.extension/properties.json b/source/Magritte-Model.package/NumberParser.extension/properties.json
@@ -0,0 +1,3 @@
+{
+	"name" : "NumberParser"
+}