From 289457fa2749a4f80aee52a939baac068f9b1d6a Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Thu, 2 Jun 2011 12:35:58 -0400 Subject: [PATCH] Rephrase a missed optimization message. original commit: 484fb029f100562891e50d073826fb38768cb0c1 --- .../optimizer/missed-optimizations/unexpected-complex.rkt | 2 +- .../tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt | 2 +- collects/tests/typed-scheme/optimizer/tests/invalid-sqrt.rkt | 2 +- collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt | 2 +- collects/typed-scheme/optimizer/float-complex.rkt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/collects/tests/typed-scheme/optimizer/missed-optimizations/unexpected-complex.rkt b/collects/tests/typed-scheme/optimizer/missed-optimizations/unexpected-complex.rkt index e3d840a8..ca08a17d 100644 --- a/collects/tests/typed-scheme/optimizer/missed-optimizations/unexpected-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/missed-optimizations/unexpected-complex.rkt @@ -1,6 +1,6 @@ #; ( -unexpected-complex.rkt 16:0 (#%app sqrt (quote 4)) -- unexpected complex value -- caused by: 16:1 sqrt +unexpected-complex.rkt 16:0 (#%app sqrt (quote 4)) -- unexpected complex type -- caused by: 16:1 sqrt unexpected-complex.rkt 17:0 (#%app + (quote 1.2+3.4i) (quote 2.0)) -- unboxed float complex unexpected-complex.rkt 17:1 + -- unboxed binary float complex unexpected-complex.rkt 17:3 1.2+3.4i -- unboxed literal diff --git a/collects/tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt index 00298efd..dbf3e178 100644 --- a/collects/tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/invalid-log-complex.rkt @@ -1,6 +1,6 @@ #; ( -invalid-log-complex.rkt 10:11 (#%app log (quote 2.0)) -- unexpected complex value -- caused by: 10:12 log +invalid-log-complex.rkt 10:11 (#%app log (quote 2.0)) -- unexpected complex type -- caused by: 10:12 log 0.6931471805599453 ) diff --git a/collects/tests/typed-scheme/optimizer/tests/invalid-sqrt.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-sqrt.rkt index 7daf6a59..a41b163e 100644 --- a/collects/tests/typed-scheme/optimizer/tests/invalid-sqrt.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/invalid-sqrt.rkt @@ -1,6 +1,6 @@ #; ( -invalid-sqrt.rkt 9:0 (#%app sqrt (quote -2.0)) -- unexpected complex value -- caused by: 9:1 sqrt +invalid-sqrt.rkt 9:0 (#%app sqrt (quote -2.0)) -- unexpected complex type -- caused by: 9:1 sqrt 0+1.4142135623730951i ) diff --git a/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt b/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt index a740020a..7175e091 100644 --- a/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt +++ b/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt @@ -2,7 +2,7 @@ ( sqrt-segfault.rkt 18:15 - -- binary float sqrt-segfault.rkt 19:15 * -- binary float -sqrt-segfault.rkt 20:31 (#%app sqrt dist2) -- unexpected complex value -- caused by: 20:32 sqrt +sqrt-segfault.rkt 20:31 (#%app sqrt dist2) -- unexpected complex type -- caused by: 20:32 sqrt ) #lang typed/scheme diff --git a/collects/typed-scheme/optimizer/float-complex.rkt b/collects/typed-scheme/optimizer/float-complex.rkt index 2225bb6b..5b0afd43 100644 --- a/collects/typed-scheme/optimizer/float-complex.rkt +++ b/collects/typed-scheme/optimizer/float-complex.rkt @@ -378,7 +378,7 @@ #:when (when (and (in-complex-layer? #'e) (for/and ([subexpr (in-list (syntax->list #'(e.args ...)))]) (subtypeof? subexpr -Real))) - (log-missed-optimization "unexpected complex value" + (log-missed-optimization "unexpected complex type" this-syntax #'e.op)) ;; We don't actually want to match. #:when #f