From 84f2c8e524c26bfc20f6d2e5bb05f79a640e83fb Mon Sep 17 00:00:00 2001 From: Matthias Felleisen Date: Wed, 24 Sep 2014 19:33:42 -0400 Subject: [PATCH] Jack Clay: use concatenate instead of juxtapose, better for students --- pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt | 4 ++-- pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt index c45058966f..749fc760db 100644 --- a/pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt +++ b/pkgs/htdp-pkgs/htdp-lib/lang/private/beginner-funs.rkt @@ -508,7 +508,7 @@ @interaction[#:eval (bsl-eval) (range 0 10 2)] } @defproc[((beginner-append append) [x list?][y list?][z list?] ...) list?]{ - Creates a single list from several, by juxtaposition of the items. + Creates a single list from several, by concatenation of the items. @interaction[#:eval (bsl) (append (cons 1 (cons 2 empty)) (cons "a" (cons "b" empty)))] } @defproc[(length (l list?)) natural-number?]{ @@ -801,7 +801,7 @@ @interaction[#:eval (bsl) (string-copy "hello")] } @defproc[(string-append [s string] ...) string]{ - Juxtaposes the characters of several strings. + Concatenates the characters of several strings. @interaction[#:eval (bsl) (string-append "hello" " " "world" " " "good bye")] } @defproc[(string=? [s string][t string][x string] ...) boolean?]{ diff --git a/pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt b/pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt index af6fd756e7..1e7a77307f 100644 --- a/pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt +++ b/pkgs/htdp-pkgs/htdp-lib/lang/private/intermediate-funs.rkt @@ -48,7 +48,7 @@ ("Lists" @defproc[((intermediate-append append) [l (listof any)] ...) (listof any)]{ - Creates a single list from several, by juxtaposition of the items. + Creates a single list from several, by concatenation of the items. In ISL and up: @racket[append] also works when applied to one list or none. @interaction[#:eval (isl) (append (cons 1 (cons 2 empty)) (cons "a" (cons "b" empty)))