From 3e612cbb93de445ee63d4409d19bf22ba791c39e Mon Sep 17 00:00:00 2001 From: Carl Eastlund Date: Wed, 10 Jun 2009 23:38:52 +0000 Subject: [PATCH] Corrected types for source location in lists passed to datum->syntax. Corrected types for peek-* functions (which may return EOF). Added type for read-byte. svn: r15137 original commit: e53b944fb3261c20322965f7671e08df5f7c5608 --- collects/typed-scheme/private/base-env.ss | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/collects/typed-scheme/private/base-env.ss b/collects/typed-scheme/private/base-env.ss index f08805ad..a1ae2671 100644 --- a/collects/typed-scheme/private/base-env.ss +++ b/collects/typed-scheme/private/base-env.ss @@ -484,16 +484,19 @@ (cl->* (-Pattern (Un -Bytes -String) (Un -Bytes -String) . -> . -Bytes) (-Pattern -String -String . -> . -String))] [peek-char - (cl->* [-> -Char] - [-Input-Port . -> . -Char] - [-Input-Port N . -> . -Char])] + (cl->* [-> (Un -Char (-val eof))] + [-Input-Port . -> . (Un -Char (-val eof))] + [-Input-Port N . -> . (Un -Char (-val eof))])] [peek-byte - (cl->* [-> -Byte] - [-Input-Port . -> . -Byte] - [-Input-Port N . -> . -Byte])] + (cl->* [-> (Un -Byte (-val eof))] + [-Input-Port . -> . (Un -Byte (-val eof))] + [-Input-Port N . -> . (Un -Byte (-val eof))])] [read-char (cl->* [-> (Un -Char (-val eof))] [-Input-Port . -> . (Un -Char (-val eof))])] +[read-byte + (cl->* [-> (Un -Byte (-val eof))] + [-Input-Port . -> . (Un -Byte (-val eof))])] [make-pipe (cl->* [-> (-values (list -Input-Port -Output-Port))] [N . -> . (-values (list -Input-Port -Output-Port))])] @@ -544,11 +547,11 @@ [S (-Syntax Univ)] [ctxt (-opt S)] [srclist (-Tuple (list - Univ - (-opt -Number) - (-opt -Number) - (-opt -Number) - (-opt -Number)))] + Univ + (-opt -Integer) + (-opt -Integer) + (-opt -Integer) + (-opt -Integer)))] [srcloc (Un S (-val #f) srclist)] [prop (-opt S)] [cert (-opt S)])