From 98c9ad4d22d7640b013511dda1b50003f7da6a7b Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Tue, 21 Sep 2010 16:23:33 +0200 Subject: [PATCH] Add `Any' contract to HtDP languages. --- collects/lang/htdp-advanced.rkt | 2 +- collects/lang/htdp-beginner-abbr.rkt | 2 +- collects/lang/htdp-beginner.rkt | 2 +- collects/lang/htdp-intermediate-lambda.rkt | 2 +- collects/lang/htdp-intermediate.rkt | 2 +- collects/lang/private/teach.rkt | 4 +++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/collects/lang/htdp-advanced.rkt b/collects/lang/htdp-advanced.rkt index e706c0cb8d..9856710404 100644 --- a/collects/lang/htdp-advanced.rkt +++ b/collects/lang/htdp-advanced.rkt @@ -62,7 +62,7 @@ empty true false signature : -> mixed one-of predicate combined - Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list + Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any Property check-property for-all ==> expect expect-within expect-member-of expect-range) diff --git a/collects/lang/htdp-beginner-abbr.rkt b/collects/lang/htdp-beginner-abbr.rkt index e0c483093c..8fafa59170 100644 --- a/collects/lang/htdp-beginner-abbr.rkt +++ b/collects/lang/htdp-beginner-abbr.rkt @@ -44,7 +44,7 @@ empty true false signature : -> mixed one-of predicate combined - Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list + Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any Property check-property for-all ==> expect expect-within expect-member-of expect-range) diff --git a/collects/lang/htdp-beginner.rkt b/collects/lang/htdp-beginner.rkt index 7d43783788..8bd26b0b6b 100644 --- a/collects/lang/htdp-beginner.rkt +++ b/collects/lang/htdp-beginner.rkt @@ -45,7 +45,7 @@ empty true false signature : -> mixed one-of predicate combined - Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list + Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any Property check-property for-all ==> expect expect-within expect-member-of expect-range) diff --git a/collects/lang/htdp-intermediate-lambda.rkt b/collects/lang/htdp-intermediate-lambda.rkt index f7a2f047ef..fe3109d9c5 100644 --- a/collects/lang/htdp-intermediate-lambda.rkt +++ b/collects/lang/htdp-intermediate-lambda.rkt @@ -48,7 +48,7 @@ empty true false signature : -> mixed one-of predicate combined - Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list + Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any Property check-property for-all ==> expect expect-within expect-member-of expect-range) diff --git a/collects/lang/htdp-intermediate.rkt b/collects/lang/htdp-intermediate.rkt index c0f4bfa4e6..cf4b499f64 100644 --- a/collects/lang/htdp-intermediate.rkt +++ b/collects/lang/htdp-intermediate.rkt @@ -48,7 +48,7 @@ empty true false signature : -> mixed one-of predicate combined - Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list + Number Real Rational Integer Natural Boolean True False String Symbol Char Empty-list Any Property check-property for-all ==> expect expect-within expect-member-of expect-range) diff --git a/collects/lang/private/teach.rkt b/collects/lang/private/teach.rkt index f2ea1b5ae2..8a868e431b 100644 --- a/collects/lang/private/teach.rkt +++ b/collects/lang/private/teach.rkt @@ -2881,7 +2881,7 @@ (provide Integer Number Rational Real Natural Boolean True False String Char Symbol Empty-list - Unspecific) + Any Unspecific) (define Integer (signature/arbitrary arbitrary-integer (predicate integer?))) (define Number (signature/arbitrary arbitrary-real (predicate number?))) @@ -2904,6 +2904,8 @@ (define Symbol (signature/arbitrary arbitrary-symbol (predicate symbol?))) (define Empty-list (signature (one-of empty))) +(define Any (signature (predicate (lambda (_) #t)))) + (define Unspecific (signature (predicate (lambda (_) #t)))) ; QuickCheck