From b456d36b730b738b9abe7120eba1a3de12e8433d Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Wed, 31 Oct 2007 07:06:54 +0000
Subject: [PATCH] Move the "show-lambdas-as-lambdas" language-specific
 parameter to the stepper into stepper-language<%>.

svn: r7598
---
 collects/lang/htdp-langs.ss                 | 20 ++++++++++++++------
 collects/lang/stepper-language-interface.ss |  4 +++-
 collects/stepper/stepper-tool.ss            |  8 +++-----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/collects/lang/htdp-langs.ss b/collects/lang/htdp-langs.ss
index ed0a373a0c..382e86d3b1 100644
--- a/collects/lang/htdp-langs.ss
+++ b/collects/lang/htdp-langs.ss
@@ -890,12 +890,15 @@
             (class* % (stepper-language<%>)
               (init-field stepper:supported)
               (init-field stepper:enable-let-lifting)
+	      (init-field stepper:show-lambdas-as-lambdas)
               (define/override (stepper:supported?) stepper:supported)
               (define/override (stepper:enable-let-lifting?) stepper:enable-let-lifting)
+              (define/override (stepper:show-lambdas-as-lambdas?) stepper:show-lambdas-as-lambdas)
               (super-new))
             (class* % ()
               (init stepper:supported)
               (init stepper:enable-let-lifting)
+              (init stepper:show-lambdas-as-lambdas)
               (super-new))))
 
       (define (debugger-settings-language %)
@@ -1401,7 +1404,8 @@
            (allow-sharing? #t)
            (reader-module '(lib "htdp-advanced-reader.ss" "lang"))
 	   (stepper:supported #f)
-	   (stepper:enable-let-lifting #t)))
+	   (stepper:enable-let-lifting #t)
+	   (stepper:show-lambdas-as-lambdas #t)))
         
         (add-htdp-language
          (instantiate htdp-language% ()
@@ -1428,9 +1432,10 @@
            (allow-sharing? #f)
            (reader-module '(lib "htdp-intermediate-lambda-reader.ss" "lang"))
 	   (stepper:supported #t)
-           (stepper:enable-let-lifting #t)))
+           (stepper:enable-let-lifting #t)
+	   (stepper:show-lambdas-as-lambdas #t)))
         
-        (add-htdp-language
+	(add-htdp-language
          (instantiate htdp-language% ()
            (one-line-summary (string-constant intermediate-one-line-summary))
            (module '(lib "htdp-intermediate.ss" "lang"))
@@ -1447,7 +1452,8 @@
            (use-function-output-syntax? #t)
            (reader-module '(lib "htdp-intermediate-reader.ss" "lang"))
 	   (stepper:supported #t)
-           (stepper:enable-let-lifting #t)))
+           (stepper:enable-let-lifting #t)
+	   (stepper:show-lambdas-as-lambdas #f)))
         
         (add-htdp-language
          (instantiate htdp-language% ()
@@ -1465,7 +1471,8 @@
            (allow-sharing? #f)
            (reader-module '(lib "htdp-beginner-abbr-reader.ss" "lang"))
 	   (stepper:supported #t)
-           (stepper:enable-let-lifting #t)))
+           (stepper:enable-let-lifting #t)
+	   (stepper:show-lambdas-as-lambdas #f)))
         
         (add-htdp-language
          (instantiate htdp-language% ()
@@ -1484,7 +1491,8 @@
            (accept-quasiquote? #f)
            (reader-module '(lib "htdp-beginner-reader.ss" "lang"))
 	   (stepper:supported #t)
-           (stepper:enable-let-lifting #t)))
+           (stepper:enable-let-lifting #t)
+	   (stepper:show-lambdas-as-lambdas #f)))
         
         (drscheme:get/extend:extend-unit-frame frame-tracing-mixin)
         (drscheme:get/extend:extend-tab tab-tracing-mixin)))))
diff --git a/collects/lang/stepper-language-interface.ss b/collects/lang/stepper-language-interface.ss
index 4d0202d2ca..85b2c63ded 100644
--- a/collects/lang/stepper-language-interface.ss
+++ b/collects/lang/stepper-language-interface.ss
@@ -6,4 +6,6 @@
   (define stepper-language<%>
     (interface ()
       stepper:supported?
-      stepper:enable-let-lifting?)))
+      stepper:enable-let-lifting?
+      stepper:show-lambdas-as-lambdas?
+      stepper:render-to-sexp)))
diff --git a/collects/stepper/stepper-tool.ss b/collects/stepper/stepper-tool.ss
index d83b25aa3c..7ed07a411a 100644
--- a/collects/stepper/stepper-tool.ss
+++ b/collects/stepper/stepper-tool.ss
@@ -39,6 +39,8 @@
 		   (define (stepper:supported?) #f)
                    (public stepper:enable-let-lifting?)
                    (define (stepper:enable-let-lifting?) #f)
+		   (public stepper:show-lambdas-as-lambdas?)
+		   (define (stepper:show-lambdas-as-lambdas?) #t)
 		   (public stepper:render-to-sexp)
 		   (define (stepper:render-to-sexp val settings language-level)
 		     (parameterize ([current-print-convert-hook
@@ -464,11 +466,7 @@
          program-expander-prime receive-result
          (get-render-settings render-to-string render-to-sexp 
                               (send language-level stepper:enable-let-lifting?))
-         ;; coerce to boolean to satisfy contract checker:
-         (if (member language-level-name
-                     (list (string-constant intermediate-student/lambda)
-                           (string-constant advanced-student)))
-             #t #f)
+	 (send language-level stepper:show-lambdas-as-lambdas?)
          language-level
          run-on-drscheme-side)
         (send s-frame show #t)