From 5ec2639946d5393dd65e0991a2b2c32f27664711 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Wed, 27 Apr 2011 17:26:40 -0400 Subject: [PATCH 1/3] Fix documented contracts in framework/color. original commit: 836ac18667b2c0f7e235e22a4b80fcc5b122b20e --- collects/scribblings/framework/color.scrbl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/collects/scribblings/framework/color.scrbl b/collects/scribblings/framework/color.scrbl index 35022438..6d09ad48 100644 --- a/collects/scribblings/framework/color.scrbl +++ b/collects/scribblings/framework/color.scrbl @@ -12,17 +12,17 @@ (get-token (or/c (-> input-port? (values any/c symbol? - (or/c false? symbol?) - exact-nonnegative-integer? - exact-nonnegative-integer?)) + (or/c symbol? #f) + (or/c exact-nonnegative-integer? #f) + (or/c exact-nonnegative-integer? #f))) (-> input-port? exact-nonnegative-integer? any/c (values any/c symbol? - (or/c false? symbol?) - exact-nonnegative-integer? - exact-nonnegative-integer? + (or/c symbol? #f) + (or/c exact-nonnegative-integer? #f) + (or/c exact-nonnegative-integer? #f) exact-nonnegative-integer? any/c)))) (pairs (listof (list/c symbol? symbol?)))) void?))]{ @@ -50,9 +50,9 @@ A symbol indicating how the token should be treated by the paren matcher or @scheme[#f]. This symbol should be in the pairs argument.} @item{ - The starting position of the token.} + The starting position of the token (or @scheme[#f] if eof).} @item{ - The ending position of the token.}] + The ending position of the token (or @scheme[#f] if eof).}] When @scheme[get-token] accepts an offset and mode value in addition to an input port, it must also return two extra results, which are a backup From 8a4acb7003773f8919e37c45b438f375fa206a87 Mon Sep 17 00:00:00 2001 From: Eric Dobson Date: Thu, 28 Apr 2011 14:20:55 -0400 Subject: [PATCH 2/3] Added TR keywords to default tabify list original commit: cfab042e549061e62da8f05e7582ee13dc6326ba --- collects/framework/private/main.rkt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/collects/framework/private/main.rkt b/collects/framework/private/main.rkt index a1e5c939..b08e619d 100644 --- a/collects/framework/private/main.rkt +++ b/collects/framework/private/main.rkt @@ -221,6 +221,8 @@ '(struct local + struct: + define: define-type match-define)) (for-each (λ (x) @@ -250,10 +252,18 @@ let/cc let/ec letcc catch let-syntax letrec-syntax fluid-let-syntax letrec-syntaxes+values + let: letrec: let*: + let-values: letrec-values: let*-values: + let/cc: let/ec: + lambda: λ: + for for/list for/hash for/hasheq for/and for/or for/lists for/first for/last for/fold for* for*/list for*/hash for*/hasheq for*/and for*/or for*/lists for*/first for*/last for*/fold + + for: for/list: for/or: for/lists: for/fold: + for*: for*/lists: do: kernel-syntax-case syntax-case syntax-case* syntax-rules syntax-id-rules From 2865956a154fec7b86c4132c032f7683f0eec414 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Thu, 28 Apr 2011 16:10:21 -0400 Subject: [PATCH 3/3] Add more TR keywords to tabify list. original commit: 5592e9b34ba24964d7688c9566f7bda343205ec9 --- collects/framework/private/main.rkt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/collects/framework/private/main.rkt b/collects/framework/private/main.rkt index b08e619d..18572e04 100644 --- a/collects/framework/private/main.rkt +++ b/collects/framework/private/main.rkt @@ -221,13 +221,13 @@ '(struct local - struct: + struct: define-struct: define-struct/exec: define: - define-type + define-type define-predicate match-define)) (for-each (λ (x) (hash-set! hash-table x 'begin)) - '(case-lambda + '(case-lambda case-lambda: pcase-lambda: match-lambda match-lambda* cond delay @@ -256,6 +256,7 @@ let-values: letrec-values: let*-values: let/cc: let/ec: lambda: λ: + plambda: opt-lambda: popt-lambda: for for/list for/hash for/hasheq for/and for/or for/lists for/first for/last for/fold @@ -263,7 +264,7 @@ for*/lists for*/first for*/last for*/fold for: for/list: for/or: for/lists: for/fold: - for*: for*/lists: do: + for*: for*/lists: for*/fold: do: kernel-syntax-case syntax-case syntax-case* syntax-rules syntax-id-rules