From 79f4b8ff30fa8e8f90288e6f9dc2cbef3891a15e Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Wed, 20 Feb 2008 21:18:48 +0000 Subject: [PATCH] removed union from scheme/contract svn: r8745 --- collects/mzlib/contract.ss | 3 ++- collects/scheme/contract.ss | 1 - collects/scheme/private/contract.ss | 19 +------------------ 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss index 55b232f1af..f0b0a67800 100644 --- a/collects/mzlib/contract.ss +++ b/collects/mzlib/contract.ss @@ -78,4 +78,5 @@ name-prop name-pred? name-get stronger-prop stronger-pred? stronger-get flat-prop flat-pred? flat-get - first-order-prop first-order-get) + first-order-prop first-order-get + (rename-out [or/c union])) diff --git a/collects/scheme/contract.ss b/collects/scheme/contract.ss index 092969059e..527468db19 100644 --- a/collects/scheme/contract.ss +++ b/collects/scheme/contract.ss @@ -173,7 +173,6 @@ differences from v3: flat-contract flat-contract-predicate object-contract - union listof is-a?/c) diff --git a/collects/scheme/private/contract.ss b/collects/scheme/private/contract.ss index f714155ac5..ac34035a92 100644 --- a/collects/scheme/private/contract.ss +++ b/collects/scheme/private/contract.ss @@ -820,7 +820,7 @@ improve method arity mismatch contract violation error messages? (provide flat-rec-contract flat-murec-contract - or/c union + or/c not/c =/c >=/c <=/c /c between/c integer-in @@ -895,23 +895,6 @@ improve method arity mismatch contract violation error messages? [(_ ([name ctc ...] ...)) (raise-syntax-error 'flat-rec-contract "expected at least one body expression" stx)])) -(define-syntax (union stx) - (begin - #; - (fprintf (current-error-port) - "WARNING: union is deprecated, use or/c (file ~a~a)\n" - (let ([file (syntax-source stx)]) - (if (path? file) - (path->string file) - (format "~s" file))) - (let ([line (syntax-line stx)]) - (if (number? line) - (format ", line ~a" line) - ""))) - (syntax-case stx () - [(_ args ...) (syntax (or/c args ...))] - [id (syntax or/c)]))) - (define or/c (case-lambda [() (make-none/c '(or/c))]