Run Resyntax on drracket/private

Resyntax fixed 46 issues in 16 files:

  * Fixed 27 occurences of let-to-define
  * Fixed 5 occurences of cond-let-to-cond-define
  * Fixed 4 occurences of if-let-to-cond
  * Fixed 2 occurences of hash-ref-with-constant-lambda-to-hash-ref-without-lambda
  * Fixed 2 occurences of for-each-to-for
  * Fixed 1 occurence of format-identity
  * Fixed 1 occurence of if-begin-to-cond
  * Fixed 1 occurence of string-append-identity
  * Fixed 1 occurence of if-else-false-to-and
  * Fixed 1 occurence of define-lambda-to-define
  * Fixed 1 occurence of single-argument-plus-to-identity

Author: jackfirth

drracket/drracket/private/bindings-browser.rkt

@@ -130,7 +130,7 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
       (send outer-t insert (make-object turn-snip% 
                              (λ () (hide-details))
                              (λ () (show-details))))
-      (send outer-t insert (format "bindings\n"))
+      (send outer-t insert "bindings\n")
       (send outer-t insert inner-es)
       (make-modern outer-t)
 
@@ -178,16 +178,17 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
           (state state)))
 
       (define/override (draw dc x y left top right bottom dx dy draw-caret)
-        (let ([bitmap (case state
-                        [(up) up-bitmap]
-                        [(down) down-bitmap]
-                        [(up-click) up-click-bitmap]
-                        [(down-click) down-click-bitmap])])
-          (cond
-            [(send bitmap ok?)
-             (send dc draw-bitmap bitmap x y)]
-            [(send dc draw-rectangle x y 10 10)
-             (send dc drawline x y 10 10)])))
+        (define bitmap
+          (case state
+            [(up) up-bitmap]
+            [(down) down-bitmap]
+            [(up-click) up-click-bitmap]
+            [(down-click) down-click-bitmap]))
+        (cond
+          [(send bitmap ok?)
+           (send dc draw-bitmap bitmap x y)]
+          [(send dc draw-rectangle x y 10 10)
+           (send dc drawline x y 10 10)]))
 
 
       (define/override (get-extent dc x y w h descent space lspace rspace)
@@ -199,54 +200,54 @@ Marshalling (and hence the 'read' method of the snipclass omitted for fast proto
         (set-box/f! h arrow-snip-height))
 
       (define/override (on-event dc x y editorx editory evt)
-        (let ([snip-evt-x (- (send evt get-x) x)]
-              [snip-evt-y (- (send evt get-y) y)])
-          (cond
-            [(send evt button-down? 'left)
-             (set-state (case state
-                          [(up) 'up-click]
-                          [(down) 'down-click]
-                          [else 'down-click]))]
-            [(and (send evt button-up? 'left)
-                  (<= 0 snip-evt-x arrow-snip-width)
-                  (<= 0 snip-evt-y arrow-snip-height))
-             (set-state (case state
-                          [(up up-click) 
-                           (on-down)
-                           'down]
-                          [(down down-click)
-                           (on-up)
-                           'up]
-                          [else 'down]))]
-            [(send evt button-up? 'left)
-             (set-state (case state
-                          [(up up-click) 'up]
-                          [(down down-click) 'down]
-                          [else 'up]))]
-            [(and (send evt get-left-down)
-                  (send evt dragging?)
-                  (<= 0 snip-evt-x arrow-snip-width)
-                  (<= 0 snip-evt-y arrow-snip-height))
-             (set-state (case state
-                          [(up up-click) 'up-click]
-                          [(down down-click) 'down-click]
-                          [else 'up-click]))]
-            [(and (send evt get-left-down)
-                  (send evt dragging?))
-             (set-state (case state
-                          [(up up-click) 'up]
-                          [(down down-click) 'down]
-                          [else 'up-click]))]
-            [else
-             (super on-event dc x y editorx editory evt)])))
+        (define snip-evt-x (- (send evt get-x) x))
+        (define snip-evt-y (- (send evt get-y) y))
+        (cond
+          [(send evt button-down? 'left)
+           (set-state (case state
+                        [(up) 'up-click]
+                        [(down) 'down-click]
+                        [else 'down-click]))]
+          [(and (send evt button-up? 'left)
+                (<= 0 snip-evt-x arrow-snip-width)
+                (<= 0 snip-evt-y arrow-snip-height))
+           (set-state (case state
+                        [(up up-click) 
+                         (on-down)
+                         'down]
+                        [(down down-click)
+                         (on-up)
+                         'up]
+                        [else 'down]))]
+          [(send evt button-up? 'left)
+           (set-state (case state
+                        [(up up-click) 'up]
+                        [(down down-click) 'down]
+                        [else 'up]))]
+          [(and (send evt get-left-down)
+                (send evt dragging?)
+                (<= 0 snip-evt-x arrow-snip-width)
+                (<= 0 snip-evt-y arrow-snip-height))
+           (set-state (case state
+                        [(up up-click) 'up-click]
+                        [(down down-click) 'down-click]
+                        [else 'up-click]))]
+          [(and (send evt get-left-down)
+                (send evt dragging?))
+           (set-state (case state
+                        [(up up-click) 'up]
+                        [(down down-click) 'down]
+                        [else 'up-click]))]
+          [else
+           (super on-event dc x y editorx editory evt)]))
 
       (inherit get-admin)
       (define/private (set-state new-state)
         (unless (eq? state new-state)
           (set! state new-state)
-          (let ([admin (get-admin)])
-            (when admin
-              (send admin needs-update this 0 0 arrow-snip-width arrow-snip-height)))))
+          (define admin (get-admin))
+          (when admin
+            (send admin needs-update this 0 0 arrow-snip-width arrow-snip-height))))
 
       (define/override (adjust-cursor dc x y editorx editory event) arrow-snip-cursor)
 

drracket/drracket/private/drracket-normal.rkt

@@ -112,10 +112,12 @@
       (cond
         [the-splash-bitmap
          (set-splash-bitmap
-          (if (eq? special-state match)
-              (begin (set! special-state #f) the-splash-bitmap)
-              (begin (set! special-state match)
-                     (magic-image-bitmap match))))]
+          (cond
+            [(eq? special-state match)
+             (set! special-state #f) the-splash-bitmap]
+            [else
+             (set! special-state match)
+             (magic-image-bitmap match)]))]
         [else
          (set! magic-to-draw
                (if magic-to-draw
@@ -223,10 +225,10 @@
                size))]
     [(ada-lovelace-bday? startup-date)
      (set-splash-progress-bar?! #f)
-     (let ([size (dynamic-require 'drracket/private/ada 'ada-size)])
-       (vector (dynamic-require 'drracket/private/ada 'draw-splash-ada) 
-               size 
-               size))]
+     (define size (dynamic-require 'drracket/private/ada 'ada-size))
+     (vector (dynamic-require 'drracket/private/ada 'draw-splash-ada) 
+             size 
+             size)]
     [(texas-independence-day? startup-date)
      (collection-file-path texas-plt-bw.gif "icons")]
     [(halloween? startup-date)
@@ -299,22 +301,22 @@
 
 (when (getenv "PLTDRBREAK")
   (printf "PLTDRBREAK: creating break frame\n") (flush-output)
-  (let ([to-break (eventspace-handler-thread (current-eventspace))])
-    (parameterize ([current-eventspace (make-eventspace)])
-      (define f (new frame% (label "Break DrRacket")))
-      (new button%
-           (label "Break Main Thread")
-           (callback
-            (λ (x y)
-              (break-thread to-break)))
-           (parent f))
-      (new button%
-           (label "Break All Threads")
-           (callback
-            (λ (x y)
-              ((dynamic-require 'drracket/private/key 'break-threads))))
-           (parent f))
-      (send f show #t))))
+  (define to-break (eventspace-handler-thread (current-eventspace)))
+  (parameterize ([current-eventspace (make-eventspace)])
+    (define f (new frame% (label "Break DrRacket")))
+    (new button%
+         (label "Break Main Thread")
+         (callback
+          (λ (x y)
+            (break-thread to-break)))
+         (parent f))
+    (new button%
+         (label "Break All Threads")
+         (callback
+          (λ (x y)
+            ((dynamic-require 'drracket/private/key 'break-threads))))
+         (parent f))
+    (send f show #t)))
 
 (dynamic-require 'drracket/tool-lib #f)
 (shutdown-splash)

drracket/drracket/private/embedded-snip-utils.rkt

@@ -10,18 +10,18 @@
   (define (topwin)
     (let ([canvas (send an-editor get-canvas)])
       (and canvas (send canvas get-top-level-window))))
-  (let ([admin (send an-editor get-admin)])
-    (if (and admin (is-a? admin editor-snip-editor-admin<%>))
-        (let ([enclosing-editor-snip (send admin get-snip)])
-          (if (get-snip-outer-editor enclosing-editor-snip)
-              (get-enclosing-editor-frame (get-snip-outer-editor
-                                           enclosing-editor-snip))
-              (topwin)))
-        (topwin))))
+  (define admin (send an-editor get-admin))
+  (if (and admin (is-a? admin editor-snip-editor-admin<%>))
+      (let ([enclosing-editor-snip (send admin get-snip)])
+        (if (get-snip-outer-editor enclosing-editor-snip)
+            (get-enclosing-editor-frame (get-snip-outer-editor
+                                         enclosing-editor-snip))
+            (topwin)))
+      (topwin)))
 
 ;; get-snip-outer-editor: snip% -> (or/c editor<%> #f)
 ;; Returns the immediate outer editor enclosing the snip, or false if we
 ;; can't find it.
 (define (get-snip-outer-editor a-snip)
-  (let ([admin (send a-snip get-admin)])
-    (and admin (send admin get-editor))))
+  (define admin (send a-snip get-admin))
+  (and admin (send admin get-editor)))