From 17a1322fe5c57681000b2d6b644ed6a8e4c1652d Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 15 Mar 2011 12:25:53 -0600 Subject: [PATCH] `match': document `var' pattern --- collects/scribblings/reference/match-grammar.rkt | 1 + collects/scribblings/reference/match-parse.rkt | 2 +- collects/scribblings/reference/match.scrbl | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/collects/scribblings/reference/match-grammar.rkt b/collects/scribblings/reference/match-grammar.rkt index bd91127d58..871931f260 100644 --- a/collects/scribblings/reference/match-grammar.rkt +++ b/collects/scribblings/reference/match-grammar.rkt @@ -5,6 +5,7 @@ (define grammar " pat ::= id @match anything, bind identifier + | (VAR id) @match anything, bind identifier | _ @match anything | literal @match literal | (QUOTE datum) @match equal% value diff --git a/collects/scribblings/reference/match-parse.rkt b/collects/scribblings/reference/match-parse.rkt index c68f9ca492..c8a93868a7 100644 --- a/collects/scribblings/reference/match-parse.rkt +++ b/collects/scribblings/reference/match-parse.rkt @@ -65,7 +65,7 @@ rx-expr px-expr pred-expr derived-pattern) (match-nonterm (symbol->string s))] - [(QUOTE LIST LIST-REST LIST-NO-ORDER VECTOR HASH-TABLE BOX STRUCT + [(QUOTE VAR LIST LIST-REST LIST-NO-ORDER VECTOR HASH-TABLE BOX STRUCT REGEXP PREGEXP AND OR NOT APP ? QUASIQUOTE CONS MCONS) (make-element symbol-color (list (string-downcase (symbol->string s))))] [(***) diff --git a/collects/scribblings/reference/match.scrbl b/collects/scribblings/reference/match.scrbl index 3e99d3d9db..364fc0edf0 100644 --- a/collects/scribblings/reference/match.scrbl +++ b/collects/scribblings/reference/match.scrbl @@ -46,11 +46,11 @@ In more detail, patterns match as follows: @itemize[ - @item{@racket[_id], excluding the reserved names @racketidfont{_}, + @item{@racket[_id] (excluding the reserved names @racketidfont{_}, @racketidfont{...}, @racketidfont{.._}, @racketidfont{..}@racket[_k], and @racketidfont{..}@racket[_k] for non-negative integers - @racket[_k] --- matches anything, and binds @racket[id] to the + @racket[_k]) or @racket[(var _id)] --- matches anything, and binds @racket[id] to the matching values. If an @racket[_id] is used multiple times within a pattern, the corresponding matches must be the same according to @racket[(match-equality-test)], except that