suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add type for range, and extend in-range's.

Browse Source
This commit is contained in:
Vincent St-Amour 2012-06-20 17:08:16 -04:00
parent 7ec9975736
commit ee142047f8
3 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collects/tests/typed-racket/unit-tests/typecheck-tests.rkt
View File

@ -207,6 +207,10 @@
[tc-e/t #(2 3 #t) (make-HeterogenousVector (list -Integer -Integer -Boolean))] [tc-e/t #(2 3 #t) (make-HeterogenousVector (list -Integer -Integer -Boolean))]
[tc-e (vector 2 "3" #t) (make-HeterogenousVector (list -Integer -String -Boolean))] [tc-e (vector 2 "3" #t) (make-HeterogenousVector (list -Integer -String -Boolean))]
[tc-e (vector-immutable 2 "3" #t) (make-HeterogenousVector (list -Integer -String -Boolean))] [tc-e (vector-immutable 2 "3" #t) (make-HeterogenousVector (list -Integer -String -Boolean))]
[tc-e (range 4) (-lst -Byte)]
[tc-e (range 2 4 1) (-lst -PosByte)]
[tc-e (range 0 4 1) (-lst -Byte)]
[tc-e (range 0.0 4/2 0.5) (-lst -Flonum)]
[tc-e/t '(#t #f) (-lst* (-val #t) (-val #f))] [tc-e/t '(#t #f) (-lst* (-val #t) (-val #f))]
[tc-e/t (plambda: (a) ([l : (Listof a)]) (car l)) [tc-e/t (plambda: (a) ([l : (Listof a)]) (car l))
(make-Poly '(a) (t:-> (make-Listof (-v a)) (-v a)))] (make-Poly '(a) (t:-> (make-Listof (-v a)) (-v a)))]

23
collects/typed-racket/base-env/base-env-indexing-abs.rkt
View File

@ -215,6 +215,29 @@
[range (cl->* (-> (Un -Zero -NegInt) (-val '()))
(-> -One (-pair -One (-val '())))
(-> -Byte (-lst -Byte))
(-> -Index (-lst -Index))
(-> -Fixnum (-lst -Fixnum))
(-> -Real (-lst -Int))
(->opt -PosInt -Byte [-Int] (-lst -PosByte))
(->opt -Nat -Byte [-Int] (-lst -Byte))
(->opt -PosInt -Index [-Int] (-lst -PosIndex))
(->opt -Nat -Index [-Int] (-lst -Index))
(->opt -Nat -NonNegFixnum [-Int] (-lst -NonNegFixnum))
(->opt -PosInt -Fixnum [-Nat] (-lst -PosFixnum))
(->opt -Nat -Fixnum [-Nat] (-lst -NonNegFixnum))
(->opt -Nat -Nat [-Int] (-lst -Nat))
(->opt -PosInt -Int [-Nat] (-lst -PosInt))
(->opt -Nat -Int [-Nat] (-lst -Nat))
;; could add cases that guarantee lists of negatives, etc.
(->opt -Int -Real [-Int] (-lst -Int))
(->opt -Rat -Real [-Rat] (-lst -Rat))
(->opt -Flonum -Real [-Flonum] (-lst -Flonum))
(->opt -SingleFlonum -Real [-SingleFlonum] (-lst -SingleFlonum))
(->opt -InexactReal -Real [-InexactReal] (-lst -InexactReal))
(->opt -Real -Real [-Real] (-lst -Real)))]
[take (-poly (a) ((-lst a) index-type . -> . (-lst a)))] [take (-poly (a) ((-lst a) index-type . -> . (-lst a)))]
[drop (-poly (a) ((-lst a) index-type . -> . (-lst a)))] [drop (-poly (a) ((-lst a) index-type . -> . (-lst a)))]
[take-right (-poly (a) ((-lst a) index-type . -> . (-lst a)))] [take-right (-poly (a) ((-lst a) index-type . -> . (-lst a)))]

28
collects/typed-racket/base-env/base-special-env.rkt
View File

@ -70,13 +70,27 @@
(-> Univ (-seq a b) (seq-vals (list a b))))))] (-> Univ (-seq a b) (seq-vals (list a b))))))]
;; in-range ;; in-range
[(make-template-identifier 'in-range 'racket/private/for) [(make-template-identifier 'in-range 'racket/private/for)
(cl->* (-Byte [-Byte -Byte] . ->opt . (-seq -Byte)) (cl->* (-> -Byte (-seq -Byte))
(-PosFixnum -Fixnum [-Nat] . ->opt . (-seq -PosFixnum)) (-> -Index (-seq -Index))
(-NonNegFixnum [-Fixnum -Nat] . ->opt . (-seq -NonNegFixnum)) (-> -Fixnum (-seq -Fixnum))
(-Fixnum [-Fixnum -Int] . ->opt . (-seq -Fixnum)) (-> -Real (-seq -Int))
(-PosInt -Int [-Nat] . ->opt . (-seq -PosInt)) (->opt -PosInt -Byte [-Int] (-seq -PosByte))
(-Nat [-Int -Nat] . ->opt . (-seq -Nat)) (->opt -Nat -Byte [-Int] (-seq -Byte))
(-Int [-Int -Int] . ->opt . (-seq -Int)))] (->opt -PosInt -Index [-Int] (-seq -PosIndex))
(->opt -Nat -Index [-Int] (-seq -Index))
(->opt -Nat -NonNegFixnum [-Int] (-seq -NonNegFixnum))
(->opt -PosInt -Fixnum [-Nat] (-seq -PosFixnum))
(->opt -Nat -Fixnum [-Nat] (-seq -NonNegFixnum))
(->opt -Nat -Nat [-Int] (-seq -Nat))
(->opt -PosInt -Int [-Nat] (-seq -PosInt))
(->opt -Nat -Int [-Nat] (-seq -Nat))
;; could add cases that guarantee lists of negatives, etc.
(->opt -Int -Real [-Int] (-seq -Int))
(->opt -Rat -Real [-Rat] (-seq -Rat))
(->opt -Flonum -Real [-Flonum] (-seq -Flonum))
(->opt -SingleFlonum -Real [-SingleFlonum] (-seq -SingleFlonum))
(->opt -InexactReal -Real [-InexactReal] (-seq -InexactReal))
(->opt -Real -Real [-Real] (-seq -Real)))]
;; in-naturals ;; in-naturals
[(make-template-identifier 'in-naturals 'racket/private/for) [(make-template-identifier 'in-naturals 'racket/private/for)
(cl->* (-> -PosInt (-seq -PosInt)) (cl->* (-> -PosInt (-seq -PosInt))