Merge jv
authorMerge Script
Wed, 08 Jun 2016 07:02:12 +0200
branchjv
changeset 5132 10cfd15b629e
parent 5130 436b5fa0e195 (current diff)
parent 5131 832766a9972f (diff)
child 5135 f583ce9d9f3c
child 5136 4da82b9b74bc
Merge
DoWhatIMeanSupport.st
--- a/DoWhatIMeanSupport.st	Tue Jun 07 06:40:31 2016 +0200
+++ b/DoWhatIMeanSupport.st	Wed Jun 08 07:02:12 2016 +0200
@@ -5543,7 +5543,7 @@
 
 addClassesOfExpression:expr inClass:classOrNil to:setOfTypes
     |cls exprVal varName varScope instVarClass classVarClass poolVarClass sym|
-    
+
     expr isLiteral ifTrue:[
         exprVal := expr value.
         cls := exprVal class.         
@@ -5562,6 +5562,8 @@
         ^ setOfTypes.
     ].
 
+    thisContext isRecursive ifTrue:[^ setOfTypes].
+
     expr isVariable ifTrue:[
         varName := expr name.
         varName = 'self' ifTrue:[
@@ -5656,6 +5658,8 @@
     ].    
 
     ^ setOfTypes
+
+    "Modified: / 07-06-2016 / 11:33:19 / cg"
 !
 
 addClassesOfInstVarNamed:varName inClass:aClass to:setOfTypes