use package instead of category in class builder

tomooda · May 28, 2024 · 4e522f0 · 4e522f0
1 parent 3c000b4
commit 4e522f0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/repository/ViennaTalk-Transpiler-Core/ViennaVDM2SmalltalkClass.class.st b/repository/ViennaTalk-Transpiler-Core/ViennaVDM2SmalltalkClass.class.st
@@ -94,26 +94,24 @@ ViennaVDM2SmalltalkClass >> createDocumentClassWithInstVars: anArrayOfString [
 
 { #category : 'utilities' }
 ViennaVDM2SmalltalkClass >> createDocumentClassWithInstVars: anArrayOfString1 stateVars: anArrayOfString2 [
+
 	| documentClassName |
 	documentClassName := self requestClassName: '' for: 'Document'.
 	documentClassName ifNil: [ ^ nil ].
-	^ (ShiftClassInstaller
-		make: [ :builder | 
-	builder
-		name: documentClassName asSymbol;
-		superclass: ViennaTranspiledObject;
-		slots:
-			(anArrayOfString1 asArray
-				collect: [ :instVarName | InstanceVariableSlot named: instVarName asSymbol ])
-				,
-					(anArrayOfString2 asArray
-						collect: [ :instVarName | 
-							(runtimeAssertionCheck = true
-								ifTrue: [ ViennaStateSlot ]
-								ifFalse: [ InstanceVariableSlot ]) named: instVarName asSymbol ]);
-		category: 'Auto Generated from VDM' ])
-		specification: source;
-		yourself
+	^ (ShiftClassInstaller make: [ :builder |
+			   builder
+				   name: documentClassName asSymbol;
+				   superclass: ViennaTranspiledObject;
+				   slots: (anArrayOfString1 asArray collect: [ :instVarName |
+							    InstanceVariableSlot named: instVarName asSymbol ])
+					   , (anArrayOfString2 asArray collect: [ :instVarName |
+								    (runtimeAssertionCheck = true
+									     ifTrue: [ ViennaStateSlot ]
+									     ifFalse: [ InstanceVariableSlot ]) named:
+										    instVarName asSymbol ]);
+				   package: 'Auto Generated from VDM' ])
+		  specification: source;
+		  yourself
 ]
 
 { #category : 'utilities' }

diff --git a/repository/ViennaTalk-Transpiler-Core/ViennaVDM2SmalltalkObject.class.st b/repository/ViennaTalk-Transpiler-Core/ViennaVDM2SmalltalkObject.class.st
@@ -12,20 +12,18 @@ ViennaVDM2SmalltalkObject >> createDocumentClassWithInstVars: anArrayOfString [
 
 { #category : 'utilities' }
 ViennaVDM2SmalltalkObject >> createDocumentClassWithInstVars: anArrayOfString1 stateVars: anArrayOfString2 [
-	^ ShiftAnonymousClassInstaller
-		make: [ :builder | 
-			builder
-				superclass: ViennaTranspiledObject;
-				slots:
-					(anArrayOfString1 asArray
-						collect: [ :instVarName | InstanceVariableSlot named: instVarName asSymbol ])
-						,
-							(anArrayOfString2 asArray
-								collect: [ :instVarName | 
-									(runtimeAssertionCheck = true
-										ifTrue: [ ViennaStateSlot ]
-										ifFalse: [ InstanceVariableSlot ]) named: instVarName asSymbol ]);
-				category: 'Auto Generated from VDM' ]
+
+	^ ShiftAnonymousClassInstaller make: [ :builder |
+		  builder
+			  superclass: ViennaTranspiledObject;
+			  slots: (anArrayOfString1 asArray collect: [ :instVarName |
+						   InstanceVariableSlot named: instVarName asSymbol ])
+				  , (anArrayOfString2 asArray collect: [ :instVarName |
+							   (runtimeAssertionCheck = true
+								    ifTrue: [ ViennaStateSlot ]
+								    ifFalse: [ InstanceVariableSlot ]) named:
+									   instVarName asSymbol ]);
+			  package: 'Auto Generated from VDM' ]
 ]
 
 { #category : 'utilities' }