Improved Contextr>argAndVarNames to better deal with inlined blocks jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sat, 26 Dec 2015 08:30:34 +0100
branchjv
changeset 19001 b798921e18e4
parent 19000 ebd2ca4ecb51
child 19002 465130ccbe52
Improved Contextr>argAndVarNames to better deal with inlined blocks
Context.st
--- a/Context.st	Sat Dec 26 08:45:38 2015 +0100
+++ b/Context.st	Sat Dec 26 08:30:34 2015 +0100
@@ -499,14 +499,14 @@
     |l|
 
     receiver isJavaObject ifTrue:[
-	"/ chances are good that I am a javContext ...
-	self method isJavaMethod ifTrue:[
-	    ^ self javaLineNumber
-	]
+        "/ chances are good that I am a javContext ...
+        self method isJavaMethod ifTrue:[
+            ^ self javaLineNumber
+        ]
     ].
 
     lineNr notNil ifTrue:[
-	l := lineNr bitAnd:16rFFFF.
+        l := lineNr bitAnd:16rFFFF.
     ].
 
 "/    self isJavaContext ifTrue:[ |nr m|
@@ -2600,7 +2600,7 @@
                     ]
                 ].
                 numVars > 0 ifTrue:[
-                    vars := blockNode variablesIncludingInlined: (homeMethod code notNil and:[homeMethod byteCode isNil]).
+                    vars := blockNode variablesIncludingInlined: (homeMethod hasCode and:[homeMethod isDynamic not]).
                     vars notEmptyOrNil ifTrue:[
                         varNames := vars collect:[:var | var name].
                     ]
@@ -2666,7 +2666,7 @@
 
     ^ #()
 
-    "Modified: / 19-08-2013 / 12:13:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 26-12-2015 / 08:20:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 canResume