diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss index 1fe5599b38..55b232f1af 100644 --- a/collects/mzlib/contract.ss +++ b/collects/mzlib/contract.ss @@ -36,7 +36,9 @@ (except-out (all-from-out scheme/private/contract) check-between/c - check-unary-between/c)) + string-len/c + check-unary-between/c) + (rename-out [string-len/c string/len])) ;; from contract-guts.ss diff --git a/collects/scheme/private/contract.ss b/collects/scheme/private/contract.ss index e385feec5a..a9beb7009d 100644 --- a/collects/scheme/private/contract.ss +++ b/collects/scheme/private/contract.ss @@ -826,7 +826,7 @@ improve method arity mismatch contract violation error messages? integer-in real-in natural-number/c - string/len + string-len/c false/c printable/c symbols one-of/c @@ -1216,11 +1216,11 @@ improve method arity mismatch contract violation error messages? 'false/c (λ (x) (not x)))) -(define (string/len n) +(define (string-len/c n) (unless (number? n) - (error 'string/len "expected a number as argument, got ~e" n)) + (error 'string-len/c "expected a number as argument, got ~e" n)) (flat-named-contract - `(string/len ,n) + `(string-len/c ,n) (λ (x) (and (string? x) ((string-length x) . < . n))))) diff --git a/collects/tests/mzscheme/contract-mzlib-test.ss b/collects/tests/mzscheme/contract-mzlib-test.ss index a0008e5222..78e18a4dcf 100644 --- a/collects/tests/mzscheme/contract-mzlib-test.ss +++ b/collects/tests/mzscheme/contract-mzlib-test.ss @@ -4160,7 +4160,7 @@ so that propagation occurs. (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 '(string/len 3) (string/len 3)) + (test-name '(string-len/c 3) (string/len 3)) (test-name 'natural-number/c natural-number/c) (test-name 'false/c false/c) (test-name 'printable/c printable/c) diff --git a/collects/tests/mzscheme/contract-test.ss b/collects/tests/mzscheme/contract-test.ss index 09d2077653..5c720d8db9 100644 --- a/collects/tests/mzscheme/contract-test.ss +++ b/collects/tests/mzscheme/contract-test.ss @@ -4389,7 +4389,7 @@ so that propagation occurs. (test-flat-contract '(integer-in 0 10) 10 3/2) (test-flat-contract '(integer-in 0 10) 1 1.0) (test-flat-contract '(real-in 1 10) 3/2 20) - (test-flat-contract '(string/len 3) "ab" "abc") + (test-flat-contract '(string-len/c 3) "ab" "abc") (test-flat-contract 'natural-number/c 5 -1) (test-flat-contract 'false/c #f #t) (test/spec-passed 'any/c '(contract any/c 1 'pos 'neg)) @@ -4604,7 +4604,7 @@ so that propagation occurs. (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 '(string/len 3) (string/len 3)) + (test-name '(string-len/c 3) (string-len/c 3)) (test-name 'natural-number/c natural-number/c) (test-name 'false/c false/c) (test-name 'printable/c printable/c)