Fix moosetechnology/Famix#577

Consider FMProperty default value when comparing slots
moosetechnology · Jul 19, 2024 · 3d276dd · 3d276dd
1 parent ee00fe1
commit 3d276dd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Fame-Core/FMProperty.class.st b/src/Fame-Core/FMProperty.class.st
@@ -32,6 +32,13 @@ FMProperty >> defaultValue: aValue [
 	defaultValue := aValue
 ]
 
+{ #category : #comparing }
+FMProperty >> hasSameDefinitionAs: otherSlot [
+
+	^ (super hasSameDefinitionAs: otherSlot) and: [
+		  defaultValue = otherSlot defaultValue ]
+]
+
 { #category : #testing }
 FMProperty >> isFameSlot [
 	^ true

diff --git a/src/Fame-Core/Object.extension.st b/src/Fame-Core/Object.extension.st
@@ -34,14 +34,14 @@ Object >> metaDescriptionIn: aMetamodel [
 ]
 
 { #category : #'*Fame-Core' }
-Object >> metamodel [
-
-	^ self class metamodel
+Object class >> metamodel [ 
+	^ nil
 ]
 
 { #category : #'*Fame-Core' }
-Object class >> metamodel [ 
-	^ nil
+Object >> metamodel [
+
+	^ self class metamodel
 ]
 
 { #category : #'*Fame-Core' }