From 4e9be63437636c70befc4559b65fa207c228c09b Mon Sep 17 00:00:00 2001 From: Guillaume Marceau Date: Fri, 17 Jun 2005 01:27:58 +0000 Subject: [PATCH] merged mztake 205:206 from /plt/branches/gmarceau/mztake svn: r207 --- collects/mztake/debug-tool.ss | 29 +++++++++++++++++------------ collects/mztake/info.ss | 10 +++++----- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/collects/mztake/debug-tool.ss b/collects/mztake/debug-tool.ss index 3ecc1f3066..3fe53afb2b 100644 --- a/collects/mztake/debug-tool.ss +++ b/collects/mztake/debug-tool.ss @@ -15,7 +15,8 @@ (lib "annotator.ss" "mztake") (lib "load-annotator.ss" "mztake" "private") ;(lib "framework.ss" "framework") - #;(lib "string-constant.ss" "string-constants")) + #;(lib "string-constant.ss" "string-constants") + ) (provide tool@) @@ -203,7 +204,8 @@ (let* ([frames (send parent get-stack-frames)] [pos-vec (send parent get-pos-vec)] [id (vector-ref pos-vec pos)] - #;[_ (printf "frames = ~a~npos-vec = ~a~nid = ~a~n" + #; + [_ (printf "frames = ~a~npos-vec = ~a~nid = ~a~n" frames pos-vec id)]) (send parent set-mouse-over-msg @@ -215,7 +217,8 @@ (lambda (id2) (module-identifier=? id id2)) frames (lambda () (k #f - #;(format "~a = ~a" id-sym + #; + (format "~a = ~a" id-sym (namespace-variable-value id-sym #f @@ -289,7 +292,8 @@ (let* ([frames (send parent get-stack-frames)] [pos-vec (send parent get-pos-vec)] [id (vector-ref pos-vec pos)] - #;[_ (printf "frames = ~a~npos-vec = ~a~nid = ~a~n" + #; + [_ (printf "frames = ~a~npos-vec = ~a~nid = ~a~n" frames pos-vec id)]) (unless (and id frames @@ -349,7 +353,8 @@ (send dc set-brush bp-tmp-brush)]) ;(drscheme:arrow:draw-arrow dc xl yl xr yr dx dy) (send dc draw-ellipse (+ xl dx) (+ yl dy yoff) diameter diameter) - #;(send dc draw-polygon stop-sign + #; + (send dc draw-polygon stop-sign (+ xl dx) (+ yl dy 2)) (send dc set-pen op) @@ -368,7 +373,8 @@ [else (send dc set-pen pc-pen) (send dc set-brush pc-brush)])) (drscheme:arrow:draw-arrow dc xl ym xr ym dx dy)) - #;(let loop ([end-pos pos] + #; + (let loop ([end-pos pos] [marks (send parent get-stack-frames)]) (when (cons? marks) (let*-values ([(start-pos) (syntax-position (mark-source (first marks)))] @@ -510,8 +516,7 @@ get-definitions-text get-interactions-text get-menu-bar -;; break-callback TODO -;; reset-offer-kill + get-current-tab get-top-level-window) (define breakpoints (make-hash-table)) @@ -639,7 +644,8 @@ (alignment '(center center)) (style '(border)))) (send debug-parent-panel change-children (lambda (l) null)) - #;(instantiate button% () + #; + (instantiate button% () (label "Hide") (parent debug-panel) (callback (lambda (x y) (hide-debug))) @@ -684,9 +690,8 @@ (bell) (begin (set! want-suspend-on-break? #t) -;; (break-callback) -;; (reset-offer-kill) - )))] + (send (get-current-tab) break-callback) + (send (get-current-tab) reset-offer-kill))))] [enabled #t])) (define resume-button diff --git a/collects/mztake/info.ss b/collects/mztake/info.ss index 9a951f01ca..416c461464 100644 --- a/collects/mztake/info.ss +++ b/collects/mztake/info.ss @@ -1,7 +1,7 @@ (module info (lib "infotab.ss" "setup") - (define name "Debugger") - #;(define tools '(#;("mztake-lang.ss") ("debug-tool.ss"))) - (define blurb '("MzTake is a scripted debugger for PLT Scheme." "A debugging tool for DrScheme")) - #;(define tool-names '(#;"MzTake Debugger" "Skipper")) - #;(define tool-icons '(#;("emblem-ohno.png" "mztake" "icons") ("icon-big.png" "mztake" "icons"))) + (define name "MzTake Debugger") + (define tools '(("debug-tool.ss"))) + (define blurb '("MzTake is a scripted debugger for PLT Scheme.")) + (define tool-names '("MzTake Debugger")) + (define tool-icons '(("emblem-ohno.png" "mztake" "icons"))) )