From 51ad306af256fe6a1742c99d2caffc062cdfc6e0 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Tue, 4 Jan 2011 09:48:55 -0600 Subject: [PATCH] changed real-in to be an alias for between/c --- collects/racket/contract/private/misc.rkt | 6 +----- collects/scribblings/reference/contracts.scrbl | 6 +----- collects/tests/racket/contract-mzlib-test.rktl | 2 +- collects/tests/racket/contract-test.rktl | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/collects/racket/contract/private/misc.rkt b/collects/racket/contract/private/misc.rkt index ce02d65473..058ab846d6 100644 --- a/collects/racket/contract/private/misc.rkt +++ b/collects/racket/contract/private/misc.rkt @@ -715,11 +715,7 @@ (unless (and (real? start) (real? end)) (error 'real-in "expected two real numbers as arguments, got ~e and ~e" start end)) - (flat-named-contract - `(real-in ,start ,end) - (λ (x) - (and (real? x) - (<= start x end))))) + (between/c start end)) (define/final-prop (not/c f) (let* ([ctc (coerce-flat-contract 'not/c f)] diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl index f5a0afe0b2..e906df1dc3 100644 --- a/collects/scribblings/reference/contracts.scrbl +++ b/collects/scribblings/reference/contracts.scrbl @@ -1,4 +1,3 @@ - #lang scribble/doc @(require "mz.rkt") @(require (for-label syntax/modcollapse)) @@ -183,10 +182,7 @@ input to be a real number between @racket[n] and @racket[m] or equal to one of them.} @defproc[(real-in [n real?] [m real?]) flat-contract?]{ - -Returns a flat contract that requires the input to be a real number -between @racket[n] and @racket[m], inclusive.} - +This is an alias for @racket[between/c].} @defproc[(integer-in [j exact-integer?] [k exact-integer?]) flat-contract?]{ diff --git a/collects/tests/racket/contract-mzlib-test.rktl b/collects/tests/racket/contract-mzlib-test.rktl index 365b32772d..cfa98696cc 100644 --- a/collects/tests/racket/contract-mzlib-test.rktl +++ b/collects/tests/racket/contract-mzlib-test.rktl @@ -4164,7 +4164,7 @@ so that propagation occurs. (test-name '(>/c 5) (>/c 5)) (test-name '(between/c 5 6) (between/c 5 6)) (test-name '(integer-in 0 10) (integer-in 0 10)) - (test-name '(real-in 1 10) (real-in 1 10)) + (test-name '(between/c 1 10) (real-in 1 10)) (test-name '(string-len/c 3) (string/len 3)) (test-name 'natural-number/c natural-number/c) (test-name #f false/c) diff --git a/collects/tests/racket/contract-test.rktl b/collects/tests/racket/contract-test.rktl index 8c0037d1d3..b971c8782f 100644 --- a/collects/tests/racket/contract-test.rktl +++ b/collects/tests/racket/contract-test.rktl @@ -9460,7 +9460,7 @@ so that propagation occurs. (test-name '(between/c 5 6) (between/c 5 6)) (test-name '(between/c -inf.0 +inf.0) (between/c -inf.0 +inf.0)) (test-name '(integer-in 0 10) (integer-in 0 10)) - (test-name '(real-in 1 10) (real-in 1 10)) + (test-name '(between/c 1 10) (real-in 1 10)) (test-name '(string-len/c 3) (string-len/c 3)) (test-name 'natural-number/c natural-number/c) (test-name #f false/c)