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

Roll back the "expr -> expression" change in the grammar documentation of the

Browse Source 
teaching languages. The extra width was breaking some browsers.
(cherry picked from commit 7134d67921)
This commit is contained in:
Guillaume Marceau 2011-07-15 03:34:59 -04:00 committed by Eli Barzilay
parent 8c54e212da
commit 29e8c44ba9
6 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
collects/scribblings/htdp-langs/advanced.scrbl
View File

@ -15,40 +15,40 @@
(check-expect check-within check-error check-member-of check-range require) (check-expect check-within check-error check-member-of check-range require)
[program (code:line def-or-expr ...)] [program (code:line def-or-expr ...)]
[def-or-expr definition [def-or-expr definition
expression expr
test-case test-case
library-require] library-require]
[definition (define (name variable ...) expression) [definition (define (name variable ...) expr)
(define name expression) (define name expr)
(define-struct name (name ...)) (define-struct name (name ...))
(define-datatype name (name name ...) ...)] (define-datatype name (name name ...) ...)]
[expression (begin expression expression ...) [expr (begin expr expr ...)
(begin0 expression expression ...) (begin0 expr expr ...)
(set! variable expression) (set! variable expr)
(delay expression) (delay expr)
(lambda (variable ...) expression) (lambda (variable ...) expr)
(λ (variable ...) expression) (λ (variable ...) expr)
(local [definition ...] expression) (local [definition ...] expr)
(letrec ([name expression] ...) expression) (letrec ([name expr] ...) expr)
(shared ([name expression] ...) expression) (shared ([name expr] ...) expr)
(let ([name expression] ...) expression) (let ([name expr] ...) expr)
(let name ([name expression] ...) expression) (let name ([name expr] ...) expr)
(let* ([name expression] ...) expression) (let* ([name expr] ...) expr)
(recur name ([name expression] ...) expression) (recur name ([name expr] ...) expr)
(code:line (expression expression ...)) (code:line (expr expr ...))
(cond [expression expression] ... [expression expression]) (cond [expr expr] ... [expr expr])
(cond [expression expression] ... [else expression]) (cond [expr expr] ... [else expr])
(case expression [(choice choice ...) expression] ... (case expr [(choice choice ...) expr] ...
[(choice choice ...) expression]) [(choice choice ...) expr])
(case expression [(choice choice ...) expression] ... (case expr [(choice choice ...) expr] ...
[else expression]) [else expr])
(match expression [pattern expression] ...) (match expr [pattern expr] ...)
(if expression expression expression) (if expr expr expr)
(when expression expression) (when expr expr)
(unless expression expression) (unless expr expr)
(and expression expression expression ...) (and expr expr expr ...)
(or expression expression expression ...) (or expr expr expr ...)
(time expression) (time expr)
(code:line name) (code:line name)
(code:line @#,elem{@racketvalfont{'}@racket[_quoted]}) (code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
(code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]}) (code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]})

22
collects/scribblings/htdp-langs/beginner-abbr.scrbl
View File

@ -14,20 +14,20 @@
(check-expect check-within check-member-of check-range check-error require) (check-expect check-within check-member-of check-range check-error require)
[program (code:line def-or-expr ...)] [program (code:line def-or-expr ...)]
[def-or-expr definition [def-or-expr definition
expression expr
test-case test-case
library-require] library-require]
[definition (define (name variable variable ...) expression) [definition (define (name variable variable ...) expr)
(define name expression) (define name expr)
(define name (lambda (variable variable ...) expression)) (define name (lambda (variable variable ...) expr))
(define-struct name (name ...))] (define-struct name (name ...))]
[expression (code:line (name expression expression ...)) [expr (code:line (name expr expr ...))
(code:line (prim-op expression ...)) (code:line (prim-op expr ...))
(cond [expression expression] ... [expression expression]) (cond [expr expr] ... [expr expr])
(cond [expression expression] ... [else expression]) (cond [expr expr] ... [else expr])
(if expression expression expression) (if expr expr expr)
(and expression expression expression ...) (and expr expr expr ...)
(or expression expression expression ...) (or expr expr expr ...)
name name
(code:line @#,elem{@racketvalfont{'}@racket[_quoted]}) (code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
(code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]}) (code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]})

20
collects/scribblings/htdp-langs/beginner.scrbl
View File

@ -13,19 +13,19 @@
(check-expect check-within check-member-of check-range check-error require) (check-expect check-within check-member-of check-range check-error require)
[program (code:line def-or-expr ...)] [program (code:line def-or-expr ...)]
[def-or-expr definition [def-or-expr definition
expression expr
test-case test-case
library-require] library-require]
[definition (define (name variable variable ...) expression) [definition (define (name variable variable ...) expr)
(define name expression) (define name expr)
(define name (lambda (variable variable ...) expression)) (define name (lambda (variable variable ...) expr))
(define-struct name (name ...))] (define-struct name (name ...))]
[expression (code:line (name expression expression ...)) [expr (code:line (name expr expr ...))
(cond [expression expression] ... [expression expression]) (cond [expr expr] ... [expr expr])
(cond [expression expression] ... [else expression]) (cond [expr expr] ... [else expr])
(if expression expression expression) (if expr expr expr)
(and expression expression expression ...) (and expr expr expr ...)
(or expression expression expression ...) (or expr expr expr ...)
name name
(code:line @#,elem{@racketvalfont{'}@racket[name]}) (code:line @#,elem{@racketvalfont{'}@racket[name]})
number number

32
collects/scribblings/htdp-langs/intermediate-lambda.scrbl
View File

@ -12,25 +12,25 @@
(check-expect check-within check-member-of check-range check-error require) (check-expect check-within check-member-of check-range check-error require)
[program (code:line def-or-expr ...)] [program (code:line def-or-expr ...)]
[def-or-expr definition [def-or-expr definition
expression expr
test-case test-case
library-require] library-require]
[definition (define (name variable variable ...) expression) [definition (define (name variable variable ...) expr)
(define name expression) (define name expr)
(define-struct name (name ...))] (define-struct name (name ...))]
[expression (lambda (variable variable ...) expression) [expr (lambda (variable variable ...) expr)
(λ (variable variable ...) expression) (λ (variable variable ...) expr)
(local [definition ...] expression) (local [definition ...] expr)
(letrec ([name expression] ...) expression) (letrec ([name expr] ...) expr)
(let ([name expression] ...) expression) (let ([name expr] ...) expr)
(let* ([name expression] ...) expression) (let* ([name expr] ...) expr)
(code:line (expression expression expression ...)) (code:line (expr expr expr ...))
(cond [expression expression] ... [expression expression]) (cond [expr expr] ... [expr expr])
(cond [expression expression] ... [else expression]) (cond [expr expr] ... [else expr])
(if expression expression expression) (if expr expr expr)
(and expression expression expression ...) (and expr expr expr ...)
(or expression expression expression ...) (or expr expr expr ...)
(time expression) (time expr)
(code:line name) (code:line name)
(code:line prim-op) (code:line prim-op)
(code:line @#,elem{@racketvalfont{'}@racket[_quoted]}) (code:line @#,elem{@racketvalfont{'}@racket[_quoted]})

34
collects/scribblings/htdp-langs/intermediate.scrbl
View File

@ -13,32 +13,32 @@
(check-expect check-within check-member-of check-range check-error require) (check-expect check-within check-member-of check-range check-error require)
[program (code:line def-or-expr ...)] [program (code:line def-or-expr ...)]
[def-or-expr definition [def-or-expr definition
expression expr
test-case test-case
library-require] library-require]
[definition (define (name variable variable ...) expression) [definition (define (name variable variable ...) expr)
(define name expression) (define name expr)
(define name (lambda (variable variable ...) expression)) (define name (lambda (variable variable ...) expr))
(define-struct name (name ...))] (define-struct name (name ...))]
[expression (local [definition ...] expression) [expr (local [definition ...] expr)
(letrec ([name expr-for-let] ...) expression) (letrec ([name expr-for-let] ...) expr)
(let ([name expr-for-let] ...) expression) (let ([name expr-for-let] ...) expr)
(let* ([name expr-for-let] ...) expression) (let* ([name expr-for-let] ...) expr)
(code:line (name expression expression ...) ) (code:line (name expr expr ...) )
(cond [expression expression] ... [expression expression]) (cond [expr expr] ... [expr expr])
(cond [expression expression] ... [else expression]) (cond [expr expr] ... [else expr])
(if expression expression expression) (if expr expr expr)
(and expression expression expression ...) (and expr expr expr ...)
(or expression expression expression ...) (or expr expr expr ...)
(time expression) (time expr)
(code:line name) (code:line name)
(code:line @#,elem{@racketvalfont{'}@racket[_quoted]}) (code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
(code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]}) (code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]})
number number
string string
character] character]
[expr-for-let (lambda (variable variable ...) expression) [expr-for-let (lambda (variable variable ...) expr)
expression] expr]
] ]
@prim-nonterms[("intermediate") define define-struct] @prim-nonterms[("intermediate") define define-struct]

16
collects/scribblings/htdp-langs/std-grammar.rkt
View File

@ -16,12 +16,12 @@
(racketgrammar* (racketgrammar*
#:literals lits #:literals lits
form ... form ...
[test-case @#,racket[(check-expect expression expression)] [test-case @#,racket[(check-expect expr expr)]
@#,racket[(check-within expression expression expression)] @#,racket[(check-within expr expr expr)]
@#,racket[(check-member-of expression expression (... ...))] @#,racket[(check-member-of expr expr (... ...))]
@#,racket[(check-range expression expression expression)] @#,racket[(check-range expr expr expr)]
@#,racket[(check-error expression expression)] @#,racket[(check-error expr expr)]
@#,racket[(check-error expression)]] @#,racket[(check-error expr)]]
(... (...
[library-require @#,racket[(require string)] [library-require @#,racket[(require string)]
@#,racket[(require (lib string string ...))] @#,racket[(require (lib string string ...))]
@ -55,8 +55,8 @@
@#,racket[(quasiquoted ...)] @#,racket[(quasiquoted ...)]
@#,elem{@racketvalfont{'}@racket[quasiquoted]} @#,elem{@racketvalfont{'}@racket[quasiquoted]}
@#,elem{@racketvalfont{`}@racket[quasiquoted]} @#,elem{@racketvalfont{`}@racket[quasiquoted]}
@#,elem{@racketfont{,}@racket[expression]} @#,elem{@racketfont{,}@racket[expr]}
@#,elem{@racketfont[",@"]@racket[expression]}]))) @#,elem{@racketfont[",@"]@racket[expr]}])))
(define-syntax-rule (prim-nonterms (section-prefix) define define-struct) (define-syntax-rule (prim-nonterms (section-prefix) define define-struct)