Merge pull request #19 from pharo-contributions/fix-metarecursion

Fixed metaRecursion for borderline cases
pharo-contributions · Jul 16, 2024 · bb8911d · bb8911d
2 parents 4627ba2 + fe6db35
commit bb8911d
Show file tree

Hide file tree

Showing 17 changed files with 246 additions and 1,299 deletions.
diff --git a/src/MethodProxies-Tests/MpAbstractMethodProxyTest.class.st b/src/MethodProxies-Tests/MpAbstractMethodProxyTest.class.st
@@ -1,34 +1,36 @@
 Class {
-	#name : #MpAbstractMethodProxyTest,
-	#superclass : #TestCase,
+	#name : 'MpAbstractMethodProxyTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'trackedWrappers'
 	],
-	#category : #'MethodProxies-Tests'
+	#category : 'MethodProxies-Tests',
+	#package : 'MethodProxies-Tests'
 }
 
-{ #category : #testing }
+{ #category : 'testing' }
 MpAbstractMethodProxyTest class >> isAbstract [
 
 	^ self == MpAbstractMethodProxyTest
 ]
 
-{ #category : #'tests - dead representation' }
+{ #category : 'tests - dead representation' }
 MpAbstractMethodProxyTest >> installMethodProxy: aMethodProxy [
 
 	trackedWrappers add: aMethodProxy.
-	aMethodProxy install.
-
+	aMethodProxy
+		install;
+		enableInstrumentation
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 MpAbstractMethodProxyTest >> setUp [
 
 	super setUp.
 	trackedWrappers := OrderedCollection new
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 MpAbstractMethodProxyTest >> tearDown [
 
 	| stillInstalled |

diff --git a/src/MethodProxies-Tests/MpAfterCounterHandler.class.st b/src/MethodProxies-Tests/MpAfterCounterHandler.class.st
@@ -3,26 +3,27 @@ I am a method proxy handler for testing that increments a counter after the meth
 I therefore test method exit
 "
 Class {
-	#name : #MpAfterCounterHandler,
-	#superclass : #MpHandler,
+	#name : 'MpAfterCounterHandler',
+	#superclass : 'MpHandler',
 	#instVars : [
 		'count'
 	],
-	#category : #'MethodProxies-Tests'
+	#category : 'MethodProxies-Tests',
+	#package : 'MethodProxies-Tests'
 }
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 MpAfterCounterHandler >> afterMethod [
 
 	count := count + 1
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MpAfterCounterHandler >> count [
 	^ count
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 MpAfterCounterHandler >> initialize [
 
 	super initialize.

diff --git a/src/MethodProxies-Tests/MpAfterResultHandler.class.st b/src/MethodProxies-Tests/MpAfterResultHandler.class.st
@@ -1,24 +1,25 @@
 Class {
-	#name : #MpAfterResultHandler,
-	#superclass : #MpHandler,
+	#name : 'MpAfterResultHandler',
+	#superclass : 'MpHandler',
 	#instVars : [
 		'count'
 	],
-	#category : #'MethodProxies-Tests'
+	#category : 'MethodProxies-Tests',
+	#package : 'MethodProxies-Tests'
 }
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 MpAfterResultHandler >> afterExecutionWithReceiver: anObject arguments: anArrayOfObjects returnValue: aReturnValue [
 
 	^ 'trapped [', aReturnValue asString, ']'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MpAfterResultHandler >> count [
 	^ count
 ]
 
-{ #category : #evaluating }
+{ #category : 'evaluating' }
 MpAfterResultHandler >> initialize [
 
 	super initialize.

diff --git a/src/MethodProxies-Tests/MpClassA.class.st b/src/MethodProxies-Tests/MpClassA.class.st
@@ -3,76 +3,77 @@ Instance Variables:
 	x	<Integer>
 "
 Class {
-	#name : #MpClassA,
-	#superclass : #Object,
+	#name : 'MpClassA',
+	#superclass : 'Object',
 	#instVars : [
 		'x'
 	],
-	#category : #'MethodProxies-Tests'
+	#category : 'MethodProxies-Tests',
+	#package : 'MethodProxies-Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MpClassA >> methodAcceptingABlock: aBlock [
 
 	^ aBlock value
 ]
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassA >> methodDelay [
 
 	(Delay forMilliseconds: 1) wait.
 ]
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassA >> methodLastingOneSecond [
 
 	(Delay forMilliseconds: 0.5) wait.
 	^ 999
 ]
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassA >> methodOne [
 
 	^ 101
 ]
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassA >> methodTwo [
 	^ 42
 ]
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassA >> methodWithArgument: anInteger [
 
 	self x: self x + anInteger.
 	^ self x
 ]
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassA >> methodWithException [
 
 	1/0
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MpClassA >> methodWithNonLocalReturn [
 
 	self methodAcceptingABlock: [ ^ self ]
 ]
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassA >> methodWithWarning [
 
 	Warning new signal: 'I warned you'.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MpClassA >> x [
 
 	^ x
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 MpClassA >> x: anInteger [
 
 	x := anInteger

diff --git a/src/MethodProxies-Tests/MpClassB.class.st b/src/MethodProxies-Tests/MpClassB.class.st
@@ -1,16 +1,17 @@
 Class {
-	#name : #MpClassB,
-	#superclass : #MpClassA,
-	#category : #'MethodProxies-Tests'
+	#name : 'MpClassB',
+	#superclass : 'MpClassA',
+	#category : 'MethodProxies-Tests',
+	#package : 'MethodProxies-Tests'
 }
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassB >> methodThree [
 
 	^ 789
 ]
 
-{ #category : #debugging }
+{ #category : 'debugging' }
 MpClassB >> methodTwo [
 
 	^ 84