From 7876c75cbc46addf13f9e372d6953e4bb82c9017 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Fri, 1 Oct 2010 17:22:15 -0400 Subject: [PATCH] Got rid of a broken subtyping rule. original commit: 5a67535a950ba19846151a6f7a3f7a473affea86 --- collects/tests/typed-scheme/fail/log-not-complex.rkt | 5 +++++ .../typed-scheme/optimizer/tests/invalid-log-complex.rkt | 9 +++++++++ collects/typed-scheme/types/subtype.rkt | 1 - 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 collects/tests/typed-scheme/fail/log-not-complex.rkt create mode 100644 collects/tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt diff --git a/collects/tests/typed-scheme/fail/log-not-complex.rkt b/collects/tests/typed-scheme/fail/log-not-complex.rkt new file mode 100644 index 00000000..450a6596 --- /dev/null +++ b/collects/tests/typed-scheme/fail/log-not-complex.rkt @@ -0,0 +1,5 @@ +#; +(exn-pred 1) +#lang typed/scheme + +(ann (log 2.0) Inexact-Complex) diff --git a/collects/tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt new file mode 100644 index 00000000..e397660e --- /dev/null +++ b/collects/tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt @@ -0,0 +1,9 @@ +#; +( +0.6931471805599453 +) + +#lang typed/scheme +#:optimize + +(real-part (log 2.0)) diff --git a/collects/typed-scheme/types/subtype.rkt b/collects/typed-scheme/types/subtype.rkt index 56e151e1..33f0a82e 100644 --- a/collects/typed-scheme/types/subtype.rkt +++ b/collects/typed-scheme/types/subtype.rkt @@ -263,7 +263,6 @@ [((== -Fixnum =t) (Base: 'Integer _)) A0] [((Base: 'Nonnegative-Flonum _) (Base: 'Flonum _)) A0] - [((Base: 'Nonnegative-Flonum _) (Base: 'InexactComplex _)) A0] [((Base: 'Nonnegative-Flonum _) (Base: 'Number _)) A0] [((Base: 'InexactComplex _) (Base: 'Number _)) A0]