From 9eaee0e6f183706459d8af035954b991b0974d76 Mon Sep 17 00:00:00 2001
From: John Clements <clements@racket-lang.org>
Date: Mon, 6 Dec 2010 17:15:06 -0800
Subject: [PATCH] about to give up for now...

---
 collects/stepper/private/annotate.rkt    | 6 ++++--
 collects/stepper/private/model.rkt       | 1 +
 collects/stepper/private/reconstruct.rkt | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/collects/stepper/private/annotate.rkt b/collects/stepper/private/annotate.rkt
index f6f5cf6995..0a5fe417e9 100644
--- a/collects/stepper/private/annotate.rkt
+++ b/collects/stepper/private/annotate.rkt
@@ -546,13 +546,15 @@
                        
                        [ap-struct-maker 
                         (cond [(pair? procedure-name-info)
-                               #`(#%app
+                               #`(#%plain-app
                                   #,make-ap-struct
+                                  #,annotated-lambda
                                   #,closure-info
                                   #,(cadr procedure-name-info))]
                               [else
-                               #`(#%app
+                               #`(#%plain-app
                                   #,make-ap-struct
+                                  #,annotated-lambda
                                   #,closure-info
                                   #f)])]
                        
diff --git a/collects/stepper/private/model.rkt b/collects/stepper/private/model.rkt
index 2dc76a4be1..a4733a1848 100644
--- a/collects/stepper/private/model.rkt
+++ b/collects/stepper/private/model.rkt
@@ -322,6 +322,7 @@
   (define (step-through-expression expanded expand-next-expression)
     (let* ([annotated (a:annotate expanded break show-lambdas-as-lambdas?
                                   language-level)])
+      (printf "annotated: ~v\n" (syntax->datum annotated))
       (parameterize ([test-engine:test-silence #t])
         (eval-syntax annotated))
       (expand-next-expression)))
diff --git a/collects/stepper/private/reconstruct.rkt b/collects/stepper/private/reconstruct.rkt
index 45bfada54f..46f39acb06 100644
--- a/collects/stepper/private/reconstruct.rkt
+++ b/collects/stepper/private/reconstruct.rkt
@@ -110,7 +110,9 @@
     (opt-lambda (val render-settings [assigned-name #f])
       (if (hash-ref finished-xml-box-table val (lambda () #f))
           (stepper-syntax-property #`(quote #,val) 'stepper-xml-value-hint 'from-xml-box)
-          (let ([closure-record (closure-table-lookup val (lambda () #f))])     
+          (let (#;[closure-record (closure-table-lookup val (lambda () #f))]
+                [closure-record (and (annotated-proc? val)
+                                     (annotated-proc-info val))])
             (if closure-record
                 (let* ([mark (closure-record-mark closure-record)]
                        [base-name (closure-record-name closure-record)])