Exporter: filterAttributesToSet:for: takes a type instead of an object

moosetechnology · Oct 30, 2024 · df294fa · df294fa
1 parent e18362d
commit df294fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Famix-Value-Exporter/FamixValue2FASTJavaVisitor.class.st b/src/Famix-Value-Exporter/FamixValue2FASTJavaVisitor.class.st
@@ -377,11 +377,11 @@ FamixValue2FASTJavaVisitor >> ensureReflectionField: attribute [
 ]
 
 { #category : 'private' }
-FamixValue2FASTJavaVisitor >> filterAttributesToSet: attributes for: object [
+FamixValue2FASTJavaVisitor >> filterAttributesToSet: attributes for: type [
 	"No need to set attributes that are set in the constructor."
 
 	^ constructorCache
-		  at: object type
+		  at: type
 		  ifPresent: [ :constructor |
 			  constructorCache
 				  at: constructor
@@ -487,7 +487,7 @@ FamixValue2FASTJavaVisitor >> makeHelperClass [
 		  addModifier: (model newModifier token: 'public');
 		  addDeclaration: (model newMethodEntity
 				   name: 'ModestHelper';
-				   modifiers: { (model newModifier token: 'private') };
+				   addModifier: (model newModifier token: 'private');
 				   statementBlock: model newStatementBlock);
 		  yourself
 ]

diff --git a/src/Famix-Value-Exporter/FamixValueHelperObjectExportStrategy.class.st b/src/Famix-Value-Exporter/FamixValueHelperObjectExportStrategy.class.st
@@ -45,7 +45,7 @@ FamixValueHelperObjectExportStrategy >> buildMethodFor: object withParametersFor
 	visitor constructObject: object.
 	self
 		makeSetterInvocationsFor:
-		(visitor filterAttributesToSet: attributes for: object)
+		(visitor filterAttributesToSet: attributes for: object type)
 		on: visitor.
 	visitor statementBlock addStatement:
 		(model newReturnStatement expression:

diff --git a/src/Famix-Value-Exporter/FamixValueInlineObjectExportStrategy.class.st b/src/Famix-Value-Exporter/FamixValueInlineObjectExportStrategy.class.st
@@ -14,8 +14,10 @@ Class {
 FamixValueInlineObjectExportStrategy >> export: object on: visitor [
 
 	visitor constructObject: object.
-	(visitor filterAttributesToSet: object relevantAttributes for: object)
-		do: [ :attribute | visitor visitObjectAttribute: attribute ]
+	(visitor
+		 filterAttributesToSet: object relevantAttributes
+		 for: object type) do: [ :attribute |
+		visitor visitObjectAttribute: attribute ]
 ]
 
 { #category : 'ast' }