Merge jv
authorMerge Script
Sat, 03 Dec 2016 07:03:54 +0100
branchjv
changeset 5369 eae844f753f0
parent 5367 591f350aba7b (current diff)
parent 5368 1b5ca0f20be5 (diff)
child 5371 dce886c0d8f7
Merge
DoWhatIMeanSupport.st
--- a/DoWhatIMeanSupport.st	Tue Nov 29 07:04:06 2016 +0100
+++ b/DoWhatIMeanSupport.st	Sat Dec 03 07:03:54 2016 +0100
@@ -6162,7 +6162,7 @@
      it is a good idea to know what the reveiver's value is.
      Sigh - returns nil both if unknown AND if a real nil is there."
 
-    |nodeSelector nodeReceiver isNonDestructive receiverValue arg1Value|
+    |nodeSelector nodeReceiver receiverValue arg1Value|
 
     aNode isLiteral ifTrue:[
         ^ aNode value
@@ -6184,17 +6184,16 @@
 
         receiverValue := self valueOfNode:nodeReceiver.
         receiverValue notNil ifTrue:[
-            isNonDestructive := self isNonDestructive:aNode whenSentTo:receiverValue.
-            isNonDestructive ifTrue:[
-                nodeSelector argumentCount == 1 ifTrue:[
-                    arg1Value := self valueOfNode:(aNode arg1).
-                    [
+            (self isNonDestructive:aNode whenSentTo:receiverValue) ifTrue:[
+                [
+                     nodeSelector argumentCount == 1 ifTrue:[
+                        arg1Value := self valueOfNode:(aNode arg1).
                         ^ receiverValue perform: nodeSelector with: arg1Value.
-                    ] on:Error do:[
-                        ^ nil
-                    ]    
-                ].    
-                ^ receiverValue perform: nodeSelector.
+                    ].    
+                    ^ receiverValue perform: nodeSelector.
+                ] on:Error do:[
+                    ^ nil
+                ]    
             ].
         ].
     ].