rename and refactor newExpression method

DurieuxPol · Feb 9, 2024 · 3168693 · 3168693
1 parent cdc5b52
commit 3168693
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 34 deletions.
diff --git a/src/MuTalk-Model/MTAssignmentNullifierOperator.class.st b/src/MuTalk-Model/MTAssignmentNullifierOperator.class.st
@@ -19,11 +19,10 @@ MTAssignmentNullifierOperator >> description [
 ]
 
 { #category : 'applying' }
-MTAssignmentNullifierOperator >> newExpression [
+MTAssignmentNullifierOperator >> newNodeFrom: anOldNode [
 
-	^ [ :anOldNode |
-	  | nodeCopy |
-	  nodeCopy := anOldNode copy.
-	  nodeCopy value: (RBLiteralValueNode value: nil).
-	  nodeCopy ]
+	| nodeCopy |
+	nodeCopy := anOldNode copy.
+	nodeCopy value: (RBLiteralValueNode value: nil).
+	^ nodeCopy
 ]
diff --git a/src/MuTalk-Model/MTEmptyMethodOperator.class.st b/src/MuTalk-Model/MTEmptyMethodOperator.class.st
@@ -19,7 +19,7 @@ MTEmptyMethodOperator >> description [
 ]
 
 { #category : 'applying' }
-MTEmptyMethodOperator >> newExpression [
+MTEmptyMethodOperator >> newNodeFrom: anOldNode [
 
-	^ [ :anOldNode | RBSequenceNode statements: #() ]
+	^ RBSequenceNode statements: #(  )
 ]
diff --git a/src/MuTalk-Model/MTLiteralBooleanNegateOperator.class.st b/src/MuTalk-Model/MTLiteralBooleanNegateOperator.class.st
@@ -20,7 +20,7 @@ MTLiteralBooleanNegateOperator >> description [
 ]
 
 { #category : 'applying' }
-MTLiteralBooleanNegateOperator >> newExpression [
+MTLiteralBooleanNegateOperator >> newNodeFrom: anOldNode [
 
-	^ [ :anOldNode | RBLiteralValueNode value: anOldNode value not ]
+	^ RBLiteralValueNode value: anOldNode value not
 ]
diff --git a/src/MuTalk-Model/MTLiteralIntegersDecreaseOperator.class.st b/src/MuTalk-Model/MTLiteralIntegersDecreaseOperator.class.st
@@ -20,7 +20,7 @@ MTLiteralIntegersDecreaseOperator >> description [
 ]
 
 { #category : 'applying' }
-MTLiteralIntegersDecreaseOperator >> newExpression [
+MTLiteralIntegersDecreaseOperator >> newNodeFrom: anOldNode [
 
-	^ [ :anOldNode | RBLiteralValueNode value: anOldNode value - 1 ]
+	^ RBLiteralValueNode value: anOldNode value - 1
 ]
diff --git a/src/MuTalk-Model/MTLiteralIntegersIncreaseOperator.class.st b/src/MuTalk-Model/MTLiteralIntegersIncreaseOperator.class.st
@@ -20,7 +20,7 @@ MTLiteralIntegersIncreaseOperator >> description [
 ]
 
 { #category : 'applying' }
-MTLiteralIntegersIncreaseOperator >> newExpression [
+MTLiteralIntegersIncreaseOperator >> newNodeFrom: anOldNode [
 
-	^ [ :anOldNode | RBLiteralValueNode value: anOldNode value + 1 ]
+	^ RBLiteralValueNode value: anOldNode value + 1
 ]
diff --git a/src/MuTalk-Model/MTLiteralIntegersToZeroOperator.class.st b/src/MuTalk-Model/MTLiteralIntegersToZeroOperator.class.st
@@ -20,7 +20,7 @@ MTLiteralIntegersToZeroOperator >> description [
 ]
 
 { #category : 'applying' }
-MTLiteralIntegersToZeroOperator >> newExpression [
+MTLiteralIntegersToZeroOperator >> newNodeFrom: anOldNode [
 
-	^ [ :anOldNode | RBLiteralValueNode value: 0 ]
+	^ RBLiteralValueNode value: 0
 ]
diff --git a/src/MuTalk-Model/MTLiteralStringChangeOperator.class.st b/src/MuTalk-Model/MTLiteralStringChangeOperator.class.st
@@ -20,9 +20,9 @@ MTLiteralStringChangeOperator >> description [
 ]
 
 { #category : 'applying' }
-MTLiteralStringChangeOperator >> newExpression [
+MTLiteralStringChangeOperator >> newNodeFrom: anOldNode [
 
-	^ [ :anOldNode | RBLiteralValueNode value: self stringReplaced  ]
+	^ RBLiteralValueNode value: self stringReplaced
 ]
 
 { #category : 'applying' }

diff --git a/src/MuTalk-Model/MTLiteralStringToEmptyOperator.class.st b/src/MuTalk-Model/MTLiteralStringToEmptyOperator.class.st
@@ -20,7 +20,7 @@ MTLiteralStringToEmptyOperator >> description [
 ]
 
 { #category : 'applying' }
-MTLiteralStringToEmptyOperator >> newExpression [
+MTLiteralStringToEmptyOperator >> newNodeFrom: anOldNode [
 
-	^ [ :anOldNode | RBLiteralValueNode value: '' ]
+	^ RBLiteralValueNode value: ''
 ]
diff --git a/src/MuTalk-Model/MTMessageSendArgumentsNullifierOperator.class.st b/src/MuTalk-Model/MTMessageSendArgumentsNullifierOperator.class.st
@@ -25,14 +25,13 @@ MTMessageSendArgumentsNullifierOperator >> description [
 ]
 
 { #category : 'applying' }
-MTMessageSendArgumentsNullifierOperator >> newExpression [
-
-	| whichToReplace nodeCopy |
-	^ [ :anOldNode | 
-	  nodeCopy := anOldNode copy.
-	  whichToReplace := nodeCopy arguments at: self whichArgument.
-	  whichToReplace replaceWith: (RBLiteralValueNode value: nil).
-	 nodeCopy]
+MTMessageSendArgumentsNullifierOperator >> newNodeFrom: anOldNode [
+
+	| nodeCopy whichToReplace |
+	nodeCopy := anOldNode copy.
+	whichToReplace := nodeCopy arguments at: self whichArgument.
+	whichToReplace replaceWith: (RBLiteralValueNode value: nil).
+	^ nodeCopy
 ]
 
 { #category : 'applying' }

diff --git a/src/MuTalk-Model/MTMessageSendToYourselfOperator.class.st b/src/MuTalk-Model/MTMessageSendToYourselfOperator.class.st
@@ -19,11 +19,9 @@ MTMessageSendToYourselfOperator >> description [
 ]
 
 { #category : 'applying' }
-MTMessageSendToYourselfOperator >> newExpression [
+MTMessageSendToYourselfOperator >> newNodeFrom: anOldNode [
 
 	| nodeCopy |
-	^ [ :anOldNode | 
-	  nodeCopy := anOldNode copy.
-		RBMessageNode receiver: nodeCopy receiver selector: #yourself
-	   ]
+	nodeCopy := anOldNode copy.
+	^ RBMessageNode receiver: nodeCopy receiver selector: #yourself
 ]
diff --git a/src/MuTalk-Model/MTPredicateBasedMutantOperator.class.st b/src/MuTalk-Model/MTPredicateBasedMutantOperator.class.st
@@ -51,9 +51,15 @@ MTPredicateBasedMutantOperator >> modifiedSourceFor: aCompiledMethod with: aPars
 	^ parseTreeCopy formattedCode
 ]
 
-{ #category : 'instance creation' }
+{ #category : 'applying' }
 MTPredicateBasedMutantOperator >> newExpression [
 
+	^ [ :anOldNode | self newNodeFrom: anOldNode ]
+]
+
+{ #category : 'instance creation' }
+MTPredicateBasedMutantOperator >> newNodeFrom: anOldNode [
+
 	self subclassResponsibility
 ]