suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bitmap printing in the teaching languages

Browse Source 
closes PR 14049
This commit is contained in:
Robby Findler 2013-09-26 21:57:43 -05:00
parent 24a77c22f9
commit 9276cc86aa
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/drracket-pkgs/drracket-test/tests/drracket/language-test.rkt
View File

@ -68,6 +68,10 @@ the settings above should match r5rs
(prepare-for-test-expression)
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
"{image}"
"{image}")
(test-expression "'|.|" "'|.|")
(test-expression '("(equal? (list " image ") (list " image "))")
"#t")
@ -145,7 +149,11 @@ the settings above should match r5rs
(test-expression "#lang racket" #rx"read: #lang not enabled in the current context" "")
(test-expression "(define (f)\n(+ (raise-user-error 'a \"b\")))\n(if (zero? (random 1)) (void) (set! f void))\n(f)"
"a: b")))
"a: b")
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
"{image}"
"{image}")))
;
@ -249,7 +257,11 @@ the settings above should match r5rs
""
#rx"read: #lang not enabled in the current context")
(test-expression "(define (f)\n(+ (raise-user-error 'a \"b\")))\n(if (zero? (random 1)) (void) (set! f void))\n(f)"
"a: b")))
"a: b")
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
"{image}"
"{image}")))
;
;
@ -358,7 +370,11 @@ the settings above should match r5rs
(regexp (regexp-quote "#%module-begin: illegal use (not a module body) in: (#%module-begin)"))
#rx"read: #lang not enabled in the current context")
(test-expression "(define (f)\n(+ (raise-user-error 'a \"b\")))\n(if (zero? (random 1)) (void) (set! f void))\n(f)"
#rx"cannot reference undefined identifier")))
#rx"cannot reference undefined identifier")
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
#rx"require: undefined"
#rx"require: undefined")))
;
@ -507,7 +523,11 @@ the settings above should match r5rs
"read: #lang not enabled in the current context")
(test-expression "(define (f)\n(+ (raise-user-error 'a \"b\")))\n(if (zero? (random 1)) (void) (set! f void))\n(f)"
"define: expected at least one variable after the function name, but found none"
#rx"define: function definitions are not allowed in the interactions window"))
#rx"define: function definitions are not allowed in the interactions window")
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
"{image}"
"{image}"))
;
@ -657,7 +677,11 @@ the settings above should match r5rs
"read: #lang not enabled in the current context")
(test-expression "(define (f)\n(+ (raise-user-error 'a \"b\")))\n(if (zero? (random 1)) (void) (set! f void))\n(f)"
"define: expected at least one variable after the function name, but found none"
#rx"define: function definitions are not allowed in the interactions window")))
#rx"define: function definitions are not allowed in the interactions window")
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
"{image}"
"{image}")))
;
@ -802,7 +826,11 @@ the settings above should match r5rs
"read: #lang not enabled in the current context")
(test-expression "(define (f)\n(+ (raise-user-error 'a \"b\")))\n(if (zero? (random 1)) (void) (set! f void))\n(f)"
"define: expected at least one variable after the function name, but found none"
#rx"define: expected at least one variable after the function name, but found none")))
#rx"define: expected at least one variable after the function name, but found none")
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
"{image}"
"{image}")))
@ -944,7 +972,11 @@ the settings above should match r5rs
"read: #lang not enabled in the current context")
(test-expression "(define (f)\n(+ (raise-user-error 'a \"b\")))\n(if (zero? (random 1)) (void) (set! f void))\n(f)"
"define: expected at least one variable after the function name, but found none"
#rx"define: expected at least one variable after the function name, but found none")))
#rx"define: expected at least one variable after the function name, but found none")
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
"{image}"
"{image}")))
@ -1095,9 +1127,11 @@ the settings above should match r5rs
"read: #lang not enabled in the current context")
(test-expression "(define (f)\n(+ (raise-user-error 'a \"b\")))\n(if (zero? (random 1)) (void) (set! f void))\n(f)"
#rx"raise-user-error"
#rx"raise-user-error")))
#rx"raise-user-error")
(test-expression "(require racket/gui/base)(require racket/class)(make-object bitmap% 1 1)"
"{image}"
"{image}")))
(define (prepare-for-test-expression)

1
pkgs/drracket-pkgs/drracket/drracket/private/language.rkt
View File

@ -523,6 +523,7 @@
;; leave-snips-alone-hook : any? (any? -> printable) any? -> printable
(define ((leave-snips-alone-hook sh) expr basic-convert sub-convert)
(if (or (is-a? expr snip%)
(is-a? expr bitmap%)
(to-snip-value? expr))
expr
(sh expr basic-convert sub-convert)))