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)
[program (code:line def-or-expr ...)]
[def-or-expr definition
expression
expr
test-case
library-require]
[definition (define (name variable ...) expression)
(define name expression)
[definition (define (name variable ...) expr)
(define name expr)
(define-struct name (name ...))
(define-datatype name (name name ...) ...)]
[expression (begin expression expression ...)
(begin0 expression expression ...)
(set! variable expression)
(delay expression)
(lambda (variable ...) expression)
(λ (variable ...) expression)
(local [definition ...] expression)
(letrec ([name expression] ...) expression)
(shared ([name expression] ...) expression)
(let ([name expression] ...) expression)
(let name ([name expression] ...) expression)
(let* ([name expression] ...) expression)
(recur name ([name expression] ...) expression)
(code:line (expression expression ...))
(cond [expression expression] ... [expression expression])
(cond [expression expression] ... [else expression])
(case expression [(choice choice ...) expression] ...
[(choice choice ...) expression])
(case expression [(choice choice ...) expression] ...
[else expression])
(match expression [pattern expression] ...)
(if expression expression expression)
(when expression expression)
(unless expression expression)
(and expression expression expression ...)
(or expression expression expression ...)
(time expression)
[expr (begin expr expr ...)
(begin0 expr expr ...)
(set! variable expr)
(delay expr)
(lambda (variable ...) expr)
(λ (variable ...) expr)
(local [definition ...] expr)
(letrec ([name expr] ...) expr)
(shared ([name expr] ...) expr)
(let ([name expr] ...) expr)
(let name ([name expr] ...) expr)
(let* ([name expr] ...) expr)
(recur name ([name expr] ...) expr)
(code:line (expr expr ...))
(cond [expr expr] ... [expr expr])
(cond [expr expr] ... [else expr])
(case expr [(choice choice ...) expr] ...
[(choice choice ...) expr])
(case expr [(choice choice ...) expr] ...
[else expr])
(match expr [pattern expr] ...)
(if expr expr expr)
(when expr expr)
(unless expr expr)
(and expr expr expr ...)
(or expr expr expr ...)
(time expr)
(code:line name)
(code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
(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)
[program (code:line def-or-expr ...)]
[def-or-expr definition
expression
expr
test-case
library-require]
[definition (define (name variable variable ...) expression)
(define name expression)
(define name (lambda (variable variable ...) expression))
[definition (define (name variable variable ...) expr)
(define name expr)
(define name (lambda (variable variable ...) expr))
(define-struct name (name ...))]
[expression (code:line (name expression expression ...))
(code:line (prim-op expression ...))
(cond [expression expression] ... [expression expression])
(cond [expression expression] ... [else expression])
(if expression expression expression)
(and expression expression expression ...)
(or expression expression expression ...)
[expr (code:line (name expr expr ...))
(code:line (prim-op expr ...))
(cond [expr expr] ... [expr expr])
(cond [expr expr] ... [else expr])
(if expr expr expr)
(and expr expr expr ...)
(or expr expr expr ...)
name
(code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
(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)
[program (code:line def-or-expr ...)]
[def-or-expr definition
expression
expr
test-case
library-require]
[definition (define (name variable variable ...) expression)
(define name expression)
(define name (lambda (variable variable ...) expression))
[definition (define (name variable variable ...) expr)
(define name expr)
(define name (lambda (variable variable ...) expr))
(define-struct name (name ...))]
[expression (code:line (name expression expression ...))
(cond [expression expression] ... [expression expression])
(cond [expression expression] ... [else expression])
(if expression expression expression)
(and expression expression expression ...)
(or expression expression expression ...)
[expr (code:line (name expr expr ...))
(cond [expr expr] ... [expr expr])
(cond [expr expr] ... [else expr])
(if expr expr expr)
(and expr expr expr ...)
(or expr expr expr ...)
name
(code:line @#,elem{@racketvalfont{'}@racket[name]})
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)
[program (code:line def-or-expr ...)]
[def-or-expr definition
expression
expr
test-case
library-require]
[definition (define (name variable variable ...) expression)
(define name expression)
[definition (define (name variable variable ...) expr)
(define name expr)
(define-struct name (name ...))]
[expression (lambda (variable variable ...) expression)
(λ (variable variable ...) expression)
(local [definition ...] expression)
(letrec ([name expression] ...) expression)
(let ([name expression] ...) expression)
(let* ([name expression] ...) expression)
(code:line (expression expression expression ...))
(cond [expression expression] ... [expression expression])
(cond [expression expression] ... [else expression])
(if expression expression expression)
(and expression expression expression ...)
(or expression expression expression ...)
(time expression)
[expr (lambda (variable variable ...) expr)
(λ (variable variable ...) expr)
(local [definition ...] expr)
(letrec ([name expr] ...) expr)
(let ([name expr] ...) expr)
(let* ([name expr] ...) expr)
(code:line (expr expr expr ...))
(cond [expr expr] ... [expr expr])
(cond [expr expr] ... [else expr])
(if expr expr expr)
(and expr expr expr ...)
(or expr expr expr ...)
(time expr)
(code:line name)
(code:line prim-op)
(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)
[program (code:line def-or-expr ...)]
[def-or-expr definition
expression
expr
test-case
library-require]
[definition (define (name variable variable ...) expression)
(define name expression)
(define name (lambda (variable variable ...) expression))
[definition (define (name variable variable ...) expr)
(define name expr)
(define name (lambda (variable variable ...) expr))
(define-struct name (name ...))]
[expression (local [definition ...] expression)
(letrec ([name expr-for-let] ...) expression)
(let ([name expr-for-let] ...) expression)
(let* ([name expr-for-let] ...) expression)
(code:line (name expression expression ...) )
(cond [expression expression] ... [expression expression])
(cond [expression expression] ... [else expression])
(if expression expression expression)
(and expression expression expression ...)
(or expression expression expression ...)
(time expression)
[expr (local [definition ...] expr)
(letrec ([name expr-for-let] ...) expr)
(let ([name expr-for-let] ...) expr)
(let* ([name expr-for-let] ...) expr)
(code:line (name expr expr ...) )
(cond [expr expr] ... [expr expr])
(cond [expr expr] ... [else expr])
(if expr expr expr)
(and expr expr expr ...)
(or expr expr expr ...)
(time expr)
(code:line name)
(code:line @#,elem{@racketvalfont{'}@racket[_quoted]})
(code:line @#,elem{@racketvalfont{`}@racket[_quasiquoted]})
number
string
character]
[expr-for-let (lambda (variable variable ...) expression)
expression]
[expr-for-let (lambda (variable variable ...) expr)
expr]
]
@prim-nonterms[("intermediate") define define-struct]

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

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