diff --git a/collects/typed-scheme/private/base-env.ss b/collects/typed-scheme/private/base-env.ss index e862af4c..2f2de1de 100644 --- a/collects/typed-scheme/private/base-env.ss +++ b/collects/typed-scheme/private/base-env.ss @@ -9,72 +9,66 @@ [raise (Univ . -> . (Un))] -(car (-poly (a b) (cl-> [((-pair a b)) a] - [((make-Listof a)) a]))) +[car (-poly (a b) (cl-> [((-pair a b)) a] + [((make-Listof a)) a]))] [first (-poly (a b) (cl-> [((-pair a b)) a] [((make-Listof a)) a]))] [second (-poly (a b c) - (cl-> - [((-pair a (-pair b c))) b] - [((-lst a)) a]))] + (cl-> [((-pair a (-pair b c))) b] + [((-lst a)) a]))] [third (-poly (a b c d) - (cl-> - [((-pair a (-pair b (-pair c d)))) c] - [((-lst a)) a]))] + (cl-> [((-pair a (-pair b (-pair c d)))) c] + [((-lst a)) a]))] [fourth (-poly (a) ((-lst a) . -> . a))] -[fifth (-poly (a) ((-lst a) . -> . a))] -[sixth (-poly (a) ((-lst a) . -> . a))] +[fifth (-poly (a) ((-lst a) . -> . a))] +[sixth (-poly (a) ((-lst a) . -> . a))] [rest (-poly (a) ((-lst a) . -> . (-lst a)))] -(cadr - (-poly (a b c) - (cl-> - [((-pair a (-pair b c))) b] - [((-lst a)) a]))) -(caddr (-poly (a) (-> (-lst a) a))) -(cadddr (-poly (a) (-> (-lst a) a))) -(cdr (-poly (a b) (cl-> [((-pair a b)) b] - [((make-Listof a)) (make-Listof a)]))) -(cddr (-poly (a) (-> (make-Listof a) (make-Listof a)))) -(cdddr (-poly (a) (-> (make-Listof a) (make-Listof a)))) -(cons (-poly (a b) +[cadr (-poly (a b c) + (cl-> [((-pair a (-pair b c))) b] + [((-lst a)) a]))] +[caddr (-poly (a) (-> (-lst a) a))] +[cadddr (-poly (a) (-> (-lst a) a))] +[cdr (-poly (a b) (cl-> [((-pair a b)) b] + [((make-Listof a)) (make-Listof a)]))] +[cddr (-poly (a) (-> (make-Listof a) (make-Listof a)))] +[cdddr (-poly (a) (-> (make-Listof a) (make-Listof a)))] +[cons (-poly (a b) (cl-> [(a (-lst a)) (-lst a)] - [(a b) (-pair a b)]))) -[*cons (-poly (a b) (cl-> + [(a b) (-pair a b)]))] +[*cons (-poly (a b) (cl-> [(a b) (-pair a b)] [(a (-lst a)) (-lst a)]))] [*list? (make-pred-ty (-lst Univ))] -(null? (make-pred-ty (-val null))) -(eof-object? (make-pred-ty (-val eof))) +[null? (make-pred-ty (-val null))] +[eof-object? (make-pred-ty (-val eof))] [null (-val null)] -(number? (make-pred-ty N)) +[number? (make-pred-ty N)] [char? (make-pred-ty -Char)] -(integer? (make-pred-ty -Integer)) -(boolean? (make-pred-ty B)) -(add1 (cl->* - (-> -Integer -Integer) - (-> N N))) -(sub1 (cl->* - #;(-> -Integer -Integer) - (-> N N))) -(eq? (-> Univ Univ B)) -(eqv? (-> Univ Univ B)) -(equal? (-> Univ Univ B)) -(even? (-> N B)) +[integer? (make-pred-ty -Integer)] +[boolean? (make-pred-ty B)] +[add1 (cl->* (-> -Integer -Integer) + (-> N N))] +[sub1 (cl->* #;(-> -Integer -Integer) + (-> N N))] +[eq? (-> Univ Univ B)] +[eqv? (-> Univ Univ B)] +[equal? (-> Univ Univ B)] +[even? (-> N B)] [assert (-poly (a) (-> (*Un a (-val #f)) a))] [gensym (cl-> [(Sym) Sym] [() Sym])] [string-append (->* null -String -String)] [open-input-string (-> -String -Input-Port)] -[open-output-file +[open-output-file (->key -Pathlike #:mode (one-of/c 'binary 'text) #f - #:exists (one-of/c 'error 'append 'update 'can-update - 'replace 'truncate - 'must-truncate 'truncate/replace) + #:exists (one-of/c 'error 'append 'update 'can-update + 'replace 'truncate + 'must-truncate 'truncate/replace) #f -Output-Port)] -[read (cl-> +[read (cl-> [(-Port) -Sexp] [() -Sexp])] [ormap (-polydots (a c b) (->... (list (->... (list a) (b b) c) (-lst a)) ((-lst b) b) c))] @@ -132,46 +126,39 @@ (cl-> [((-lst a) (-lst a)) (-lst a)] [((-lst a) (-lst b) (a b . -> . B)) (-lst b)]))] -(error - (make-Function (list - (make-arr null (Un)) - (make-arr (list Sym -String) (Un) Univ) - (make-arr (list -String) (Un) Univ) - (make-arr (list Sym) (Un))))) +[error + (make-Function (list (make-arr null (Un)) + (make-arr (list Sym -String) (Un) Univ) + (make-arr (list -String) (Un) Univ) + (make-arr (list Sym) (Un))))] +[namespace-variable-value + (cl-> [(Sym) Univ] + [(Sym B -Namespace (-> Univ)) Univ])] -[namespace-variable-value - (cl-> - [(Sym) Univ] - [(Sym B -Namespace (-> Univ)) Univ])] - -(match:error (Univ . -> . (Un))) -(display - (cl-> - [(Univ) -Void] - [(Univ -Port) -Void])) +[match:error (Univ . -> . (Un))] +[display (cl-> [(Univ) -Void] [(Univ -Port) -Void])] [void (->* '() Univ -Void)] [void? (make-pred-ty -Void)] [printf (->* (list -String) Univ -Void)] [fprintf (->* (list -Output-Port -String) Univ -Void)] -[format (->* (list -String) Univ -String)] -(fst (-poly (a b) (-> (-pair a b) a))) -(snd (-poly (a b) (-> (-pair a b) b))) +[format (->* (list -String) Univ -String)] +[fst (-poly (a b) (-> (-pair a b) a))] +[snd (-poly (a b) (-> (-pair a b) b))] -(= (->* (list N N) N B)) -(>= (->* (list N N) N B)) -(< (->* (list N N) N B)) -(<= (->* (list N N) N B)) +[= (->* (list N N) N B)] +[>= (->* (list N N) N B)] +[< (->* (list N N) N B)] +[<= (->* (list N N) N B)] [> (->* (list N) N B)] -(zero? (N . -> . B)) -(* (cl->* (->* '() -Integer -Integer) (->* '() N N))) -(/ (cl->* (->* (list N) N N))) -(+ (cl->* (->* '() -Integer -Integer) (->* '() N N))) -(- (cl->* (->* (list -Integer) -Integer -Integer) (->* (list N) N N))) -(max (->* (list N) N N)) -(min (->* (list N) N N)) -[vector-ref - (-poly (a) ((-vec a) N . -> . a))] +[zero? (N . -> . B)] +[* (cl->* (->* '() -Integer -Integer) (->* '() N N))] +[/ (cl->* (->* (list N) N N))] +[+ (cl->* (->* '() -Integer -Integer) (->* '() N N))] +[- (cl->* (->* (list -Integer) -Integer -Integer) (->* (list N) N N))] +[max (->* (list N) N N)] +[min (->* (list N) N N)] +[vector-ref (-poly (a) ((-vec a) N . -> . a))] [build-vector (-poly (a) (-Integer (-Integer . -> . a) . -> . (-vec a)))] [build-list (-poly (a) (-Integer (-Integer . -> . a) . -> . (-lst a)))] [reverse (-poly (a) (-> (make-Listof a) (make-Listof a)))] @@ -180,8 +167,7 @@ [memq (-poly (a) (-> a (make-Listof a) (-opt (make-Listof a))))] [memv (-poly (a) (-> a (make-Listof a) (-opt (make-Listof a))))] [memf (-poly (a) ((a . -> . B) (-lst a) . -> . (-opt (-lst a))))] -[member - (-poly (a) (a (-lst a) . -> . (-opt (-lst a))))] +[member (-poly (a) (a (-lst a) . -> . (-opt (-lst a))))] [findf (-poly (a) ((a . -> . B) (-lst a) . -> . (-opt a)))] [string* (list -String -String) -String B)] @@ -227,20 +213,14 @@ [build-path ((list -Pathlike*) -Pathlike* . ->* . -Path)] [string->number (-> -String (-opt N))] -[with-input-from-file - (-poly (a) - (cl-> - [(-Pathlike (-> a)) a] - [(-Pathlike (-> a) Sym) a]))] +[with-input-from-file + (-poly (a) (cl-> [(-Pathlike (-> a)) a] + [(-Pathlike (-> a) Sym) a]))] [with-output-to-file - (-poly (a) - (cl-> - [(-Pathlike (-> a)) a] - [(-Pathlike (-> a) Sym) a]))] + (-poly (a) (cl-> [(-Pathlike (-> a)) a] + [(-Pathlike (-> a) Sym) a]))] -[random (cl-> - [(-Integer) -Integer] - [() -Integer])] +[random (cl-> [(-Integer) -Integer] [() -Integer])] [assoc (-poly (a b) (a (-lst (-pair a b)) . -> . (-opt (-pair a b))))] [assf (-poly (a b) @@ -275,7 +255,7 @@ [current-command-line-arguments (-Param (-vec -String) (-vec -String))] ;; regexp stuff -[regexp-match +[regexp-match (cl-> [((*Un -String -Regexp) -String) (-opt (-lst (-opt -String)))] [(-Pattern -String) (-opt (-lst (-opt (*Un -Bytes -String))))] @@ -324,36 +304,25 @@ [denominator (N . -> . -Integer)] [exact->inexact (N . -> . N)] [inexact->exact (N . -> . N)] -[make-string - (cl-> - [(N) -String] - [(N -Char) -String])] +[make-string (cl-> [(N) -String] [(N -Char) -String])] [arithmetic-shift (-Integer -Integer . -> . -Integer)] [abs (N . -> . N)] [substring (cl-> [(-String N) -String] [(-String N N) -String])] [string-length (-String . -> . N)] [string-set! (-String N -Char . -> . -Void)] -[make-vector - (-poly (a) - (cl-> - [(N) (-vec N)] - [(N a) (-vec a)]))] +[make-vector (-poly (a) (cl-> [(N) (-vec N)] [(N a) (-vec a)]))] [file-exists? (-Pathlike . -> . B)] [string->symbol (-String . -> . Sym)] [symbol->string (Sym . -> . -String)] [vector-length (-poly (a) ((-vec a) . -> . N))] -[call-with-input-file (-poly (a) - (cl-> - [(-String (-Port . -> . a)) a] - [(-String (-Port . -> . a) Sym) a]))] +[call-with-input-file (-poly (a) (cl-> [(-String (-Port . -> . a)) a] + [(-String (-Port . -> . a) Sym) a]))] -[call-with-output-file (-poly (a) - (cl-> - [(-String (-Port . -> . a)) a] - [(-String (-Port . -> . a) Sym) a]))] +[call-with-output-file (-poly (a) (cl-> [(-String (-Port . -> . a)) a] + [(-String (-Port . -> . a) Sym) a]))] [current-output-port (-Param -Output-Port -Output-Port)] [current-error-port (-Param -Output-Port -Output-Port)] [current-input-port (-Param -Input-Port -Input-Port)] @@ -361,7 +330,7 @@ [seconds->date (N . -> . (make-Name #'date))] [current-seconds (-> N)] [sqrt (-> N N)] -[path->string (-> -Path -String)] +[path->string (-> -Path -String)] [link-exists? (-> -Pathlike B)] [directory-exists? (-> -Pathlike B)] @@ -377,63 +346,53 @@ [hash-set! (-poly (a b) ((-HT a b) a b . -> . -Void))] [hash-map (-poly (a b c) ((-HT a b) (a b . -> . c) . -> . (-lst c)))] [hash-ref (-poly (a b c) - (cl-> - (((-HT a b) a) b) - (((-HT a b) a (-> c)) (*Un b c)) - (((-HT a b) a c) (*Un b c))))] + (cl-> [((-HT a b) a) b] + [((-HT a b) a (-> c)) (*Un b c)] + [((-HT a b) a c) (*Un b c)]))] #;[hash-table-index (-poly (a b) ((-HT a b) a b . -> . -Void))] [bytes (->* (list) N -Bytes)] [bytes-ref (-> -Bytes N N)] [bytes-append (->* (list -Bytes) -Bytes -Bytes)] -[subbytes (cl-> - [(-Bytes N) -Bytes] - [(-Bytes N N) -Bytes])] +[subbytes (cl-> [(-Bytes N) -Bytes] [(-Bytes N N) -Bytes])] [bytes-length (-> -Bytes N)] [open-input-file (->key -Pathlike #:mode (Un (-val 'binary) (-val 'text)) #f -Input-Port)] [close-input-port (-> -Input-Port -Void)] -[close-output-port (-> -Output-Port -Void)] -[read-line (cl-> - [() -String] - [(-Input-Port) -String] - [(-Input-Port Sym) -String])] -[copy-file (-> -Pathlike -Pathlike -Void)] +[close-output-port (-> -Output-Port -Void)] +[read-line (cl-> [() -String] + [(-Input-Port) -String] + [(-Input-Port Sym) -String])] +[copy-file (-> -Pathlike -Pathlike -Void)] [bytes->string/utf-8 (-> -Bytes -String)] [force (-poly (a) (-> (-Promise a) a))] [bytes* (list -Bytes) -Bytes B)] -[regexp-replace* - (cl->* - (-Pattern (*Un -Bytes -String) (*Un -Bytes -String) . -> . -Bytes) - (-Pattern -String -String . -> . -String))] +[regexp-replace* + (cl->* (-Pattern (*Un -Bytes -String) (*Un -Bytes -String) . -> . -Bytes) + (-Pattern -String -String . -> . -String))] [peek-char - (cl->* - [-> -Char] - [-Input-Port . -> . -Char] - [-Input-Port N . -> . -Char] - [N . -> . -Char])] + (cl->* [-> -Char] + [-Input-Port . -> . -Char] + [-Input-Port N . -> . -Char] + [N . -> . -Char])] [peek-byte - (cl->* - [-> -Byte] - [-Input-Port . -> . -Byte] - [-Input-Port N . -> . -Byte] - [N . -> . -Byte])] + (cl->* [-> -Byte] + [-Input-Port . -> . -Byte] + [-Input-Port N . -> . -Byte] + [N . -> . -Byte])] [make-pipe - (cl->* - [-> (-values (list -Input-Port -Output-Port))] - [N . -> . (-values (list -Input-Port -Output-Port))])] + (cl->* [-> (-values (list -Input-Port -Output-Port))] + [N . -> . (-values (list -Input-Port -Output-Port))])] [open-output-bytes - (cl->* - [-> -Output-Port] - [Univ . -> . -Output-Port])] + (cl->* [-> -Output-Port] + [Univ . -> . -Output-Port])] [get-output-bytes - (cl->* - [-Output-Port . -> . -Bytes] - [-Output-Port Univ . -> . -Bytes] - [-Output-Port Univ N . -> . -Bytes] - [-Output-Port Univ N N . -> . -Bytes] - [-Output-Port N . -> . -Bytes] - [-Output-Port N N . -> . -Bytes])] + (cl->* [-Output-Port . -> . -Bytes] + [-Output-Port Univ . -> . -Bytes] + [-Output-Port Univ N . -> . -Bytes] + [-Output-Port Univ N N . -> . -Bytes] + [-Output-Port N . -> . -Bytes] + [-Output-Port N N . -> . -Bytes])] #;[exn:fail? (-> Univ B)] #;[exn:fail:read? (-> Univ B)] @@ -465,7 +424,7 @@ [syntax-source (-poly (a) (-> (-Syntax a) Univ))] [syntax-position (-poly (a) (-> (-Syntax a) (-opt N)))] -[datum->syntax (cl->* +[datum->syntax (cl->* (-> (-opt (-Syntax Univ)) Sym (-Syntax Sym)) (-> (-opt (-Syntax Univ)) Univ (-Syntax Univ)))] [syntax->datum (-poly (a) (-> (-Syntax a) Univ))]