--- a/MessageTracer.st	Thu May 30 03:25:37 2013 +0000
+++ b/MessageTracer.st	Mon Jun 03 12:43:50 2013 +0200
@@ -344,6 +344,7 @@
     s := WriteStream on:String new.
     s nextPutAll:spec.
     s cr.
+    s nextPutAll:'<context: #return>'; cr.
     s nextPutAll:'|retVal stubClass|'; cr.
     entryBlock notNil ifTrue:[
         s nextPutAll:'#literal1 yourself value:thisContext.'; cr.
@@ -359,13 +360,14 @@
         withSTCCompilation:#never
         do:[
             Class withoutUpdatingChangesDo:[
-                trapMethod := Compiler compile:s contents 
-                                  forClass:orgClass 
+                trapMethod := Compiler 
+                                compile:s contents 
+                                forClass:orgClass 
                                 inCategory:'trapping'
-                                 notifying:nil
-                                   install:false
+                                notifying:nil
+                                install:false
                                 skipIfSame:false
-                                    silent:true.
+                                silent:true.
             ]
         ].
 
@@ -1613,6 +1615,7 @@
     "
     s := WriteStream on:String new.
     s nextPutAll:spec.
+    s nextPutAll:' <context: #return>'.
     s nextPutAll:' |retVal context| '.
     s nextPutAll:' context := thisContext.'.
     unwindBlock notNil ifTrue:[
@@ -1644,13 +1647,14 @@
             [
                 Compiler allowUnderscoreInIdentifier:true.
                 Class withoutUpdatingChangesDo:[
-                    trapMethod := Compiler compile:src 
-                                      forClass:UndefinedObject 
+                    trapMethod := Compiler 
+                                    compile:src 
+                                    forClass:UndefinedObject 
                                     inCategory:aMethod category
-                                     notifying:nil
-                                       install:false
+                                    notifying:nil
+                                    install:false
                                     skipIfSame:false
-                                        silent:false. "/ true.
+                                    silent:false. "/ true.
                 ]
             ] ensure:[
                 Compiler allowUnderscoreInIdentifier:saveUS.
@@ -2535,6 +2539,7 @@
     spec := Parser methodSpecificationForSelector:aSelector.
     s := WriteStream on:String new.
     s nextPutAll:spec.
+    s nextPutAll:' <context: #return>'.
     s nextPutAll:' |retVal stubClass '.
     additionalVariables notNil ifTrue:[
         s nextPutAll:additionalVariables.
@@ -2567,13 +2572,14 @@
         withSTCCompilation:#never
         do:[
             Class withoutUpdatingChangesDo:[
-                trapMethod := Compiler compile:s contents 
-                                  forClass:newClass 
+                trapMethod := Compiler 
+                                compile:s contents 
+                                forClass:newClass 
                                 inCategory:'breakpointed'
-                                 notifying:nil
-                                   install:false
+                                notifying:nil
+                                install:false
                                 skipIfSame:false
-                                    silent:true.
+                                silent:true.
             ]
         ].
 
@@ -3262,7 +3268,7 @@
 !MessageTracer class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.121 2013-05-07 13:16:52 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.122 2013-06-03 10:43:50 cg Exp $'
 ! !