Improve some framework contracts, and provide scheme/base at phase 1 from typed/scheme.

svn: r18106

original commit: 0920b493c84cf2e8306325bd98f5ae9759acdd51
This commit is contained in:
Sam Tobin-Hochstadt 2010-02-17 00:02:44 +00:00
parent 0d5a01f2a7
commit 03ae8d6f21
3 changed files with 10 additions and 5 deletions

View File

@ -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)

View File

@ -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 ()

View File

@ -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))
(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)))