From 03ae8d6f2123024aa3ede34667d4deed7bf99982 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Wed, 17 Feb 2010 00:02:44 +0000 Subject: [PATCH] Improve some framework contracts, and provide scheme/base at phase 1 from typed/scheme. svn: r18106 original commit: 0920b493c84cf2e8306325bd98f5ae9759acdd51 --- collects/typed/framework/framework.ss | 2 +- collects/typed/mred/mred.ss | 5 ++++- collects/typed/scheme.ss | 8 +++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/collects/typed/framework/framework.ss b/collects/typed/framework/framework.ss index ab85a779..ee624fbc 100644 --- a/collects/typed/framework/framework.ss +++ b/collects/typed/framework/framework.ss @@ -35,7 +35,7 @@ ((Instance Horizontal-Panel%) ((Instance Button%) (Instance Event%) -> Void) ((Instance Button%) (Instance Event%) -> Void) -> (values Any Any))]) (require/typed/provide "prefs-contract.ss" - [preferences:get-drscheme:large-letters-font (-> (U #f (Pair String Number)))]) + [preferences:get-drscheme:large-letters-font (-> (U #f (Pair String Integer)))]) (require (only-in "prefs-contract.ss" preferences:get)) (provide preferences:get) diff --git a/collects/typed/mred/mred.ss b/collects/typed/mred/mred.ss index 91a19bc0..69cd1bcd 100644 --- a/collects/typed/mred/mred.ss +++ b/collects/typed/mred/mred.ss @@ -6,7 +6,10 @@ () ([get-width (-> Number)] [get-height (-> Number)]))) -(dt Font-List% (Class () () ([find-or-create-font (Any * -> (Instance Font%))]))) +(dt Font-List% (Class () () ([find-or-create-font + (case-lambda + (Integer Symbol Symbol Symbol -> (Instance Font%)) + (Integer String Symbol Symbol Symbol -> (Instance Font%)))]))) (dt Font% (Class () () ([get-face (-> (Option String))] [get-point-size (-> Number)]))) (dt Dialog% (Class () diff --git a/collects/typed/scheme.ss b/collects/typed/scheme.ss index 37e8e2ad..11e4b79b 100644 --- a/collects/typed/scheme.ss +++ b/collects/typed/scheme.ss @@ -1,4 +1,6 @@ -#lang s-exp typed-scheme/minimal +#lang scheme/base -(require typed/scheme/base (subtract-in scheme typed/scheme/base scheme/contract)) -(provide (all-from-out typed/scheme/base scheme)) \ No newline at end of file +(require typed/scheme/base scheme/require (subtract-in scheme typed/scheme/base scheme/contract) + (for-syntax scheme/base)) +(provide (all-from-out typed/scheme/base scheme) + (for-syntax (all-from-out scheme/base))) \ No newline at end of file