Move ClassDefinitionPrinters loading later in the bootstrap process

bootstrap/scripts/4-build.sh

@@ -147,7 +147,7 @@ ${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" perform  --save SystemVers
 
 ${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes InitializePackagesCommandLineHandler.hermes --save
 
-${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Collections-Atomic.hermes AST-Core.hermes Collections-Arithmetic.hermes ClassDefinitionPrinters.hermes System-SourcesCondenser.hermes System-NumberPrinting.hermes --save --no-fail-on-undeclared
+${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Collections-Atomic.hermes AST-Core.hermes Collections-Arithmetic.hermes System-SourcesCondenser.hermes System-NumberPrinting.hermes --save --no-fail-on-undeclared
 
 echo $(date -u) "[Compiler] Initializing the packages in the Kernel"
 ${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" initializePackages --protocols=protocolsKernel.txt --packages --save

src/BaselineOfBasicTools/BaselineOfBasicTools.class.st

@@ -61,7 +61,8 @@ BaselineOfBasicTools >> baseline: spec [
 			spec
 				loads: 'Core';
 				repository: repository ].
-
+
+		spec package: 'ClassDefinitionPrinters'.
 		spec package: 'Tool-ProcessBrowser'.
 		spec package: 'Tool-Profilers'.
 		spec package: 'NECompletion'.
@@ -73,6 +74,7 @@ BaselineOfBasicTools >> baseline: spec [
 		spec package: 'MonticelloGUI' with: [ spec requires: #( 'Tool-Diff' ) ].
 		spec package: 'System-Sources-Tests'. "<= Not sure this one should be here but it is where the classes were loaded before been extracted from Tests package."
 
+		spec package: 'ClassDefinitionPrinters-Tests'.
 		spec package: 'Kernel-CodeModel-Tests'.
 		spec package: 'Monticello-Tests'.
 		spec package: 'MonticelloGUI-Tests'.

src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st

@@ -84,7 +84,6 @@ BaselineOfPharoBootstrap >> baseline: spec [
 		spec package: 'Collections-Support'.
 		spec package: 'Collections-Unordered'.
 		spec package: 'Collections-Weak'.
-		spec package: 'ClassDefinitionPrinters'.
 		spec package: 'Debugging-Core'.
 		spec package: 'Files'.
 		spec package: 'FileSystem-Path'.
@@ -206,7 +205,6 @@ BaselineOfPharoBootstrap >> baseline: spec [
 			'Collections-Atomic'.
 			'CodeImport'.
 			'CodeImportCommandLineHandlers'.
-			'ClassDefinitionPrinters'.
 			'System-SourcesCondenser'.
 			'Debugging-Utils'.
 			'OpalCompiler-Core'}.

src/Kernel-Tests/ClassDefinitionPrinterConfigurationTest.class.st → src/ClassDefinitionPrinters-Tests/ClassDefinitionPrinterConfigurationTest.class.st

@@ -1,9 +1,8 @@
 Class {
 	#name : 'ClassDefinitionPrinterConfigurationTest',
 	#superclass : 'CommonClassDefinitionPrinterTest',
-	#category : 'Kernel-Tests-Fluid',
-	#package : 'Kernel-Tests',
-	#tag : 'Fluid'
+	#category : 'ClassDefinitionPrinters-Tests',
+	#package : 'ClassDefinitionPrinters-Tests'
 }
 
 { #category : 'tests' }

src/Kernel-Tests/CommonClassDefinitionPrinterTest.class.st → src/ClassDefinitionPrinters-Tests/CommonClassDefinitionPrinterTest.class.st

@@ -8,9 +8,8 @@ Class {
 	#instVars : [
 		'slotDisplay'
 	],
-	#category : 'Kernel-Tests-Fluid',
-	#package : 'Kernel-Tests',
-	#tag : 'Fluid'
+	#category : 'ClassDefinitionPrinters-Tests',
+	#package : 'ClassDefinitionPrinters-Tests'
 }
 
 { #category : 'running' }

src/Kernel-Tests/FluidClassDefinitionPrinterTest.class.st → src/ClassDefinitionPrinters-Tests/FluidClassDefinitionPrinterTest.class.st

@@ -1,9 +1,8 @@
 Class {
 	#name : 'FluidClassDefinitionPrinterTest',
 	#superclass : 'CommonClassDefinitionPrinterTest',
-	#category : 'Kernel-Tests-Fluid',
-	#package : 'Kernel-Tests',
-	#tag : 'Fluid'
+	#category : 'ClassDefinitionPrinters-Tests',
+	#package : 'ClassDefinitionPrinters-Tests'
 }
 
 { #category : 'helpers' }

src/Kernel-Tests/LegacyClassDefinitionPrinterTest.class.st → src/ClassDefinitionPrinters-Tests/LegacyClassDefinitionPrinterTest.class.st

@@ -1,9 +1,8 @@
 Class {
 	#name : 'LegacyClassDefinitionPrinterTest',
 	#superclass : 'CommonClassDefinitionPrinterTest',
-	#category : 'Kernel-Tests-Fluid',
-	#package : 'Kernel-Tests',
-	#tag : 'Fluid'
+	#category : 'ClassDefinitionPrinters-Tests',
+	#package : 'ClassDefinitionPrinters-Tests'
 }
 
 { #category : 'helpers' }

src/Kernel-Tests/MockWithComplexSlot.class.st → src/ClassDefinitionPrinters-Tests/MockWithComplexSlot.class.st

@@ -9,9 +9,8 @@ Class {
 	#instVars : [
 		'#aComplexSlot => ObservableSlot'
 	],
-	#category : 'Kernel-Tests-Fluid',
-	#package : 'Kernel-Tests',
-	#tag : 'Fluid'
+	#category : 'ClassDefinitionPrinters-Tests',
+	#package : 'ClassDefinitionPrinters-Tests'
 }
 
 { #category : 'initialization' }

src/Kernel-Tests/OldClassDefinitionPrinterTest.class.st → src/ClassDefinitionPrinters-Tests/OldClassDefinitionPrinterTest.class.st

@@ -1,9 +1,8 @@
 Class {
 	#name : 'OldClassDefinitionPrinterTest',
 	#superclass : 'CommonClassDefinitionPrinterTest',
-	#category : 'Kernel-Tests-Fluid',
-	#package : 'Kernel-Tests',
-	#tag : 'Fluid'
+	#category : 'ClassDefinitionPrinters-Tests',
+	#package : 'ClassDefinitionPrinters-Tests'
 }
 
 { #category : 'tests - expanded' }

src/ClassDefinitionPrinters-Tests/package.st

@@ -0,0 +1 @@
+Package { #name : 'ClassDefinitionPrinters-Tests' }

src/ClassDefinitionPrinters/ObjectLayout.extension.st

@@ -15,13 +15,3 @@ ObjectLayout >> subclassDefiningSymbol [
 	supported"
 	^self class subclassDefiningSymbol
 ]
-
-{ #category : '*ClassDefinitionPrinters' }
-ObjectLayout class >> subclassDefiningSymbol [
-	"Answer a keyword that describes the receiver's kind of subclass
-	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
-	else!"
-	"As a fallback we just return a standard class creation symbol. This will be called for user
-	defined Layouts, for old style class definitions that can not support user defined Layouts"
-	^#subclass:
-]

src/Kernel-CodeModel/ByteLayout.class.st

@@ -16,6 +16,14 @@ ByteLayout class >> extending: superLayout scope: aScope host: aClass [
 		yourself
 ]
 
+{ #category : 'description' }
+ByteLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	^#variableByteSubclass:
+]
+
 { #category : 'accessing' }
 ByteLayout >> bytesPerSlot [
 

src/Kernel-CodeModel/CompiledMethodLayout.class.st

@@ -19,6 +19,15 @@ CompiledMethodLayout class >> extending: superLayout scope: aScope host: aClass
 		yourself
 ]
 
+{ #category : 'description' }
+CompiledMethodLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	"there is no way to define classes of this Layput, the system shows them as variable classes"
+	^#variableByteSubclass:
+]
+
 { #category : 'extending' }
 CompiledMethodLayout >> extend [
 	self error: 'CompiledMethodLayout can not be extendend'

src/Kernel-CodeModel/DoubleByteLayout.class.st

@@ -16,6 +16,14 @@ DoubleByteLayout class >> extending: superLayout scope: aScope host: aClass [
 		yourself
 ]
 
+{ #category : 'description' }
+DoubleByteLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	^#variableDoubleByteSubclass:
+]
+
 { #category : 'accessing' }
 DoubleByteLayout >> bytesPerSlot [
 

src/Kernel-CodeModel/DoubleWordLayout.class.st

@@ -16,6 +16,14 @@ DoubleWordLayout class >> extending: superLayout scope: aScope host: aClass [
 		yourself
 ]
 
+{ #category : 'description' }
+DoubleWordLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	^#variableDoubleWordSubclass:
+]
+
 { #category : 'extending' }
 DoubleWordLayout >> extendDoubleWord [
 	^ DoubleWordLayout new

src/Kernel-CodeModel/EphemeronLayout.class.st

@@ -17,6 +17,14 @@ EphemeronLayout class >> extending: superLayout scope: aScope host: aClass [
 		yourself
 ]
 
+{ #category : 'description' }
+EphemeronLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	^#ephemeronSubclass:
+]
+
 { #category : 'format' }
 EphemeronLayout >> instanceSpecification [
 	^ 5

src/Kernel-CodeModel/ImmediateLayout.class.st

@@ -18,6 +18,14 @@ ImmediateLayout class >> extending: superLayout scope: aScope host: aClass [
 		yourself
 ]
 
+{ #category : 'description' }
+ImmediateLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	^#immediateSubclass:
+]
+
 { #category : 'extending' }
 ImmediateLayout >> extend [
 	self error: 'ImmediateLayout can not be extendend'

src/Kernel-CodeModel/ObjectLayout.class.st

@@ -32,6 +32,16 @@ ObjectLayout class >> layoutForSubclassDefiningSymbol: aSymbol [
 		ifNone: [ FixedLayout ]
 ]
 
+{ #category : 'description' }
+ObjectLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	"As a fallback we just return a standard class creation symbol. This will be called for user
+	defined Layouts, for old style class definitions that can not support user defined Layouts"
+	^#subclass:
+]
+
 { #category : 'extending' }
 ObjectLayout >> extend [
 	"Answer a default extension of me."

src/Kernel-CodeModel/VariableLayout.class.st

@@ -19,6 +19,14 @@ VariableLayout class >> extending: superLayout scope: aScope host: aClass [
 		yourself
 ]
 
+{ #category : 'description' }
+VariableLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	^#variableSubclass:
+]
+
 { #category : 'format' }
 VariableLayout >> instanceSpecification [
 	^ self hasFields

src/Kernel-CodeModel/WeakLayout.class.st

@@ -21,6 +21,14 @@ WeakLayout class >> extending: superLayout scope: aScope host: aClass [
 		yourself
 ]
 
+{ #category : 'description' }
+WeakLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	^#weakSubclass:
+]
+
 { #category : 'format' }
 WeakLayout >> instanceSpecification [
 	^ 4

src/Kernel-CodeModel/WordLayout.class.st

@@ -16,6 +16,14 @@ WordLayout class >> extending: superLayout scope: aScope host: aClass [
 		yourself
 ]
 
+{ #category : 'description' }
+WordLayout class >> subclassDefiningSymbol [
+	"Answer a keyword that describes the receiver's kind of subclass
+	Note: this is for printing the ST80 style class definiton, usage makes no sense for anything
+	else!"
+	^#variableWordSubclass:
+]
+
 { #category : 'accessing' }
 WordLayout >> bytesPerSlot [