Revert "Revert "21876 Re-evaluating of class definition with slots cl…

…eans the class instance variables"" This reverts commit fa3ea82. I am reintroduced the changes performed by Guille, so I can recheck the errors and fix the problem.
pharo-project · Jan 2, 2019 · 9f8fd52 · 9f8fd52
1 parent 6de2c92
commit 9f8fd52
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/src/Hermes/HEInstaller.class.st b/src/Hermes/HEInstaller.class.st
@@ -70,7 +70,8 @@ HEInstaller >> build: aHEClass [
 		sharedVariables:  (self asClassVariables:aHEClass classVariables);
 		sharedPools: aHEClass sharedPools;
 		category: aHEClass category;
-		classSlots: (self asSlots: aHEClass classInstancevariables) ].
+		classSlots: (self asSlots: aHEClass classInstancevariables);
+		copyClassSlotsFromExistingClass ].
 
 	self processTraitsFrom: aHEClass in: newClass.
 

diff --git a/src/Kernel/Class.class.st b/src/Kernel/Class.class.st
@@ -1161,7 +1161,8 @@ Class >> subclass: aSubclassSymbol  layout: layoutClass slots: slotDefinition cl
 		layoutClass: layoutClass;
 		slots: slotDefinition;
 		sharedVariables: classVarDefinition;
-		category: aCategorySymbol ].
+		category: aCategorySymbol;
+		copyClassSlotsFromExistingClass ].
 
 ]
 
@@ -1182,7 +1183,8 @@ Class >> subclass: aSubclassSymbol  layout: layoutClass  slots: slotDefinition c
 		slots: slotDefinition;
 		sharedVariables:  classVarDefinition;
 		sharedPools: someSharedPoolNames;
-		category: aCategorySymbol ].
+		category: aCategorySymbol;
+		copyClassSlotsFromExistingClass ].
 
 ]
 
@@ -1205,7 +1207,8 @@ Class >> subclass: aSubclassSymbol slots: slotDefinition classVariables: classVa
 				superclass: self;
 				slots: slotDefinition;
 				sharedVariables: classVarDefinition;
-				category: aCategorySymbol ]
+				category: aCategorySymbol;
+				copyClassSlotsFromExistingClass ]
 ]
 
 { #category : #'subclass creation - slots' }
@@ -1224,8 +1227,8 @@ Class >> subclass: aSubclassSymbol slots: slotDefinition classVariables: classVa
 		slots: slotDefinition;
 		sharedVariables:  classVarDefinition;
 		sharedPools: someSharedPoolNames;
-		category: aCategorySymbol ].
-
+		category: aCategorySymbol;
+		copyClassSlotsFromExistingClass ]
 ]
 
 { #category : #'accessing class hierarchy' }

diff --git a/src/Monticello/MCClassDefinition.class.st b/src/Monticello/MCClassDefinition.class.st
@@ -268,7 +268,8 @@ MCClassDefinition >> createClass [
 				classTraitComposition: self classTraitCompositionCompiled;
 				comment: comment stamp: commentStamp;
 				category: category;
-				environment: superClass environment ] ]
+				environment: superClass environment;
+				copyClassSlotsFromExistingClass ] ]
 		on: Warning , DuplicatedVariableError
 		do: [ :ex | ex resume ]
 ]

diff --git a/src/SUnit-Core/ClassFactoryWithOrganization.class.st b/src/SUnit-Core/ClassFactoryWithOrganization.class.st
@@ -51,7 +51,8 @@ ClassFactoryWithOrganization >> newClassNamed: aString subclassOf: aClass instan
 				sharedVariablesFromString: classVarsString;
 				sharedPools: '';
 				category: category asSymbol;
-				environment: self organization environment ].
+				environment: self organization environment;
+				copyClassSlotsFromExistingClass ].
 	self createdClasses add: newClass.
 	^ newClass
 ]
@@ -78,7 +79,8 @@ ClassFactoryWithOrganization >> newSubclassOf: aClass instanceVariableNames: ivN
 				sharedVariablesFromString: classVarsString;
 				sharedPools: '';
 				category: category asSymbol;
-				environment: self organization environment ].
+				environment: self organization environment;
+				copyClassSlotsFromExistingClass ].
 	self createdClasses add: newClass.
 	^ newClass
 ]

diff --git a/src/Shift-ClassInstaller/Class.extension.st b/src/Shift-ClassInstaller/Class.extension.st
@@ -13,7 +13,8 @@ Class >> addClassSlot: aSlot [
 			sharedVariablesFromString: self classVariablesString;
 			sharedPools: self sharedPoolsString;
 			category: self category;
-			environment: self environment]
+			environment: self environment;
+			copyClassSlotsFromExistingClass ]
 ]
 
 { #category : #'*Shift-ClassInstaller' }

diff --git a/src/TraitsV2/Trait.class.st b/src/TraitsV2/Trait.class.st
@@ -92,7 +92,8 @@ Trait class >> named: aName uses: aTraitCompositionOrCollection slots: someSlots
 				category: aCategory;
 				traitComposition: aTraitCompositionOrCollection asTraitComposition;
 				classTraitComposition: aTraitCompositionOrCollection asTraitComposition classComposition;
-				classSlots: #() ].
+				classSlots: #();
+				copyClassSlotsFromExistingClass ].
 
 	self assert: [ trait class class = MetaclassForTraits ].
 	self assert: [ trait class superclass = Trait ].